From e2df08eec5891cd5102888c18f52abf4aaf876c1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:19:58 +0000 Subject: import virt-manager-1.1.0-12.el7 --- diff --git a/.gitignore b/.gitignore index 803c8e7..36ba0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/virt-manager-0.10.0.tar.gz +SOURCES/virt-manager-1.1.0.tar.gz diff --git a/.virt-manager.metadata b/.virt-manager.metadata index 0aedefc..e6e1148 100644 --- a/.virt-manager.metadata +++ b/.virt-manager.metadata @@ -1 +1 @@ -f098c4b00172a10acd3514e10f542b6590656f92 SOURCES/virt-manager-0.10.0.tar.gz +01b80584dad46fc79e57ecc3af4096332ab83fce SOURCES/virt-manager-1.1.0.tar.gz diff --git a/SOURCES/virt-manager-Add-support-for-multifunction-address-parameter.patch b/SOURCES/virt-manager-Add-support-for-multifunction-address-parameter.patch deleted file mode 100644 index 9192822..0000000 --- a/SOURCES/virt-manager-Add-support-for-multifunction-address-parameter.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6aa3f0d0c86410ee8428a8ac5683aa5cbd1f2404 Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Mon, 2 Sep 2013 16:56:22 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Add support for multifunction address - parameter - -https://bugzilla.redhat.com/show_bug.cgi?id=956700 -(cherry picked from commit 57aab5de17ecc5ff7000eb07311e4143e37aa73c) - -Conflicts: - virtinst/device.py -- 952708f5 - virtinst/xmlbuilder.py -- e5230e90 (not needed now, the patch is more - re-written then cherry-picked, but - the commit might get useful in the - future) ---- - virtinst/VirtualDevice.py | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/virtinst/VirtualDevice.py b/virtinst/VirtualDevice.py -index cc06eda..fbf1cee 100644 ---- a/virtinst/VirtualDevice.py -+++ b/virtinst/VirtualDevice.py -@@ -167,6 +167,8 @@ class VirtualDeviceAddress(XMLBuilderDomain): - self._slot = None - self._function = None - -+ self._multifunction = None -+ - # Drive address: - #
- self._controller = None -@@ -211,6 +213,7 @@ class VirtualDeviceAddress(XMLBuilderDomain): - self._target = None - self._unit = None - self._port = None -+ self._multifunction = None - - if self._is_parse(): - self._remove_child_xpath("./address") -@@ -271,6 +274,14 @@ class VirtualDeviceAddress(XMLBuilderDomain): - self._port = val - port = _xml_property(_get_port, _set_port, xpath="./address/@port") - -+ def _get_multifunction(self): -+ return self._multifunction -+ def _set_multifunction(self, val): -+ self._multifunction = val -+ multifunction = _xml_property(_get_multifunction, -+ _set_multifunction, -+ xpath="./address/@multifunction") -+ - def _get_xml_config(self): - if not self.type: - return -@@ -280,7 +291,7 @@ class VirtualDeviceAddress(XMLBuilderDomain): - - xml = "
-Date: Mon, 2 Sep 2013 16:56:53 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Automatically add multifunction address - parameter when needed - -https://bugzilla.redhat.com/show_bug.cgi?id=956700 - -Also check for use of duplicate addresses before passing such XML to -libvirt. And fix tests (of course). - -(cherry picked from commit 70fae1463547835746426939b49012b21db278e2) - -Conflicts: - tests/cli-test-xml/compare/many-devices.xml -- f620b317 - virtinst/guest.py -- 952708f5 etc. ---- - tests/cli-test-xml/compare/many-devices.xml | 4 ++-- - virtinst/Guest.py | 24 ++++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/tests/cli-test-xml/compare/many-devices.xml b/tests/cli-test-xml/compare/many-devices.xml -index a78d395..6c59653 100644 ---- a/tests/cli-test-xml/compare/many-devices.xml -+++ b/tests/cli-test-xml/compare/many-devices.xml -@@ -44,7 +44,7 @@ - - - --
-+
- - - -@@ -126,7 +126,7 @@ - - - --
-+
- - - -diff --git a/virtinst/Guest.py b/virtinst/Guest.py -index d47546f..09ee6e1 100644 ---- a/virtinst/Guest.py -+++ b/virtinst/Guest.py -@@ -1447,10 +1447,34 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain): - VirtualCharDevice.CHAR_SPICEVMC) - self.add_device(agentdev) - -+ # Set multifunction="on" if needed -+ self._check_address_multi() -+ - # Generate UUID - if self.uuid is None: - self.uuid = util.generate_uuid(self.conn) - -+ def _check_address_multi(self): -+ addresses = {} -+ for d in self._devices: -+ if d.address.type != d.address.ADDRESS_TYPE_PCI: -+ continue -+ -+ addr = d.address -+ addrstr = "%d%d%d" % (d.address.domain, -+ d.address.bus, -+ d.address.slot) -+ -+ if addrstr not in addresses: -+ addresses[addrstr] = {} -+ if addr.function in addresses[addrstr]: -+ raise ValueError(_("Duplicate address for devices %s and %s") % -+ (str(d), str(addresses[addrstr][addr.function]))) -+ addresses[addrstr][addr.function] = d -+ -+ for devs in addresses.values(): -+ if len(devs) > 1 and 0 in devs: -+ devs[0].address.multifunction = "on" - - ################################### - # Guest Dictionary Helper methods # --- -1.8.3.2 - diff --git a/SOURCES/virt-manager-Centralize-call-to-setup_i18n-in-virtinst-__init__.patch b/SOURCES/virt-manager-Centralize-call-to-setup_i18n-in-virtinst-__init__.patch new file mode 100644 index 0000000..5df23b4 --- /dev/null +++ b/SOURCES/virt-manager-Centralize-call-to-setup_i18n-in-virtinst-__init__.patch @@ -0,0 +1,115 @@ +From 7362797306c3f2e2b7152d8b60472ba57238a0d9 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Mon, 8 Sep 2014 10:40:34 -0400 +Subject: [PATCH 03/12] Centralize call to setup_i18n in virtinst __init__ + +No need to call it twice + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1111986 + +(cherry picked from commit 17f57eaaa7f025b3d5b1dc390fe965feccc9f4f6) +--- + virt-manager | 3 +-- + virtcli/cliutils.py | 35 ----------------------------------- + virtinst/__init__.py | 20 +++++++++++++++++--- + 3 files changed, 18 insertions(+), 40 deletions(-) + delete mode 100644 virtcli/cliutils.py + +diff --git a/virt-manager b/virt-manager +index d352b90..d589f6e 100755 +--- a/virt-manager ++++ b/virt-manager +@@ -31,7 +31,7 @@ from gi.repository import LibvirtGLib + + from virtinst import util as util + from virtinst import cli as virtinstcli +-from virtcli import cliutils, cliconfig ++from virtcli import cliconfig + + + try: +@@ -139,7 +139,6 @@ def launch_specific_window(engine, show, uri, clistr): + + + def main(): +- cliutils.setup_i18n() + (options, leftovers) = parse_commandline() + + virtinstcli.setupLogging("virt-manager", options.debug, False, False) +diff --git a/virtcli/cliutils.py b/virtcli/cliutils.py +deleted file mode 100644 +index 261de55..0000000 +--- a/virtcli/cliutils.py ++++ /dev/null +@@ -1,35 +0,0 @@ +-# +-# Copyright (C) 2011, 2013 Red Hat, Inc. +-# Copyright (C) 2011 Cole Robinson +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +-# MA 02110-1301 USA. +-# +- +-import gettext +-import locale +- +-from virtcli import cliconfig +- +- +-def setup_i18n(): +- try: +- locale.setlocale(locale.LC_ALL, '') +- except: +- # Can happen if user passed a bogus LANG +- pass +- +- gettext.install("virt-manager", cliconfig.gettext_dir) +- gettext.bindtextdomain("virt-manager", cliconfig.gettext_dir) +diff --git a/virtinst/__init__.py b/virtinst/__init__.py +index adb4e70..20fdc91 100644 +--- a/virtinst/__init__.py ++++ b/virtinst/__init__.py +@@ -15,11 +15,25 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301 USA. + +-from virtcli import cliconfig, cliutils +-stable_defaults = cliconfig.stable_defaults +-cliutils.setup_i18n() ++from virtcli import cliconfig as _cliconfig + + ++def _setup_i18n(): ++ import gettext ++ import locale ++ ++ try: ++ locale.setlocale(locale.LC_ALL, '') ++ except: ++ # Can happen if user passed a bogus LANG ++ pass ++ ++ gettext.install("virt-manager", _cliconfig.gettext_dir) ++ gettext.bindtextdomain("virt-manager", _cliconfig.gettext_dir) ++ ++_setup_i18n() ++stable_defaults = _cliconfig.stable_defaults ++ + from virtinst import util + from virtinst import support + +-- +1.9.3 + diff --git a/SOURCES/virt-manager-Don-t-use-SCSI-or-USB-disks-with-stable_defaults.patch b/SOURCES/virt-manager-Don-t-use-SCSI-or-USB-disks-with-stable_defaults.patch deleted file mode 100644 index c28f45d..0000000 --- a/SOURCES/virt-manager-Don-t-use-SCSI-or-USB-disks-with-stable_defaults.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14b8b5826c9e96b1ca46469e8628f323c5350dec Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Tue, 28 Jan 2014 15:50:08 +0100 -Subject: [PATCH] Don't use SCSI or USB disks with stable_defaults - -https://bugzilla.redhat.com/show_bug.cgi?id=1058808 - -One more fix I forgot to ammend into commit dc0b9bb. - -Signed-off-by: Martin Kletzander -(cherry picked from commit 53a57fcdd89205f8859b1217447ed9578cdafb19) - -Conflicts: - virtManager/addhardware.py ---- - virtManager/addhardware.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py -index 38c2bf6..7719f8f 100644 ---- a/virtManager/addhardware.py -+++ b/virtManager/addhardware.py -@@ -547,7 +547,7 @@ class vmmAddHardware(vmmGObjectUI): - add_dev("fdc", virtinst.VirtualDisk.DEVICE_FLOPPY, - _("Floppy disk")) - -- if self.vm.stable_defaults(): -+ if not self.vm.stable_defaults(): - add_dev("scsi", virtinst.VirtualDisk.DEVICE_DISK, - _("SCSI disk")) - add_dev("usb", virtinst.VirtualDisk.DEVICE_DISK, --- -1.8.5.3 - diff --git a/SOURCES/virt-manager-Fix-UUID-generation-according-to-RFC-4122.patch b/SOURCES/virt-manager-Fix-UUID-generation-according-to-RFC-4122.patch deleted file mode 100644 index 7533c2b..0000000 --- a/SOURCES/virt-manager-Fix-UUID-generation-according-to-RFC-4122.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b1a5c37c5b713839a06e6b424126ee610be3a29b Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Fri, 16 Aug 2013 10:02:56 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Fix UUID generation according to RFC - 4122 - -https://bugzilla.redhat.com/show_bug.cgi?id=963161 - -In commit 74aa8c8a, I somehow made an off-by-one error even though -that code was almost copy-paste from libvirt's commit 396c4d34. - -(cherry picked from commit 64b1ca15f22c6636f72a577ec6370a07d6a83d06) ---- - virtinst/util.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/virtinst/util.py b/virtinst/util.py -index 2529ba6..303c389 100644 ---- a/virtinst/util.py -+++ b/virtinst/util.py -@@ -514,8 +514,8 @@ def randomUUID(conn): - return "00000000-1111-2222-3333-444444444444" - - u = [random.randint(0, 255) for ignore in range(0, 16)] -- u[7] = (u[7] & 0x0F) | (4 << 4) -- u[9] = (u[9] & 0x3F) | (2 << 6) -+ u[6] = (u[6] & 0x0F) | (4 << 4) -+ u[8] = (u[8] & 0x3F) | (2 << 6) - return "-".join(["%02x" * 4, "%02x" * 2, "%02x" * 2, "%02x" * 2, - "%02x" * 6]) % tuple(u) - --- -1.8.3.2 - diff --git a/SOURCES/virt-manager-Fix-addresses-in-manual.patch b/SOURCES/virt-manager-Fix-addresses-in-manual.patch deleted file mode 100644 index ad27171..0000000 --- a/SOURCES/virt-manager-Fix-addresses-in-manual.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9ea7f731ae0141f8ced2c3dc06361fb816248104 Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Mon, 2 Sep 2013 16:58:59 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Fix addresses in manual - -https://bugzilla.redhat.com/show_bug.cgi?id=956700 - -Mention multifunction usage in manual, fix double use of PCI address -and also fix the format of PCI the address described (we parse and use -dot everywhere, but there was a colon on one place in man). - -(cherry picked from commit 2dcba19f8c1321fb79c995e125411a5ce72ada37) ---- - man/virt-install.pod | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/man/virt-install.pod b/man/virt-install.pod -index b46638c..f1e5a90 100644 ---- a/man/virt-install.pod -+++ b/man/virt-install.pod -@@ -855,7 +855,7 @@ see C. - - =item B
- --Controller address, current PCI of form 'bus:domain:slot:function'. -+Controller address, current PCI of form 'bus:domain:slot.function'. - - =item B - -@@ -872,15 +872,18 @@ Examples: - - =over 4 - --=item B<--controller usb,model=ich9-ehci1,address=0:0:4.7,index=0> -+=item B<--controller usb,model=ich9-ehci1,address=0:0:4.0,index=0> - --Adds a ICH9 EHCI1 USB controller on PCI address 0:0:4.7 -+Adds a ICH9 EHCI1 USB controller on PCI address 0:0:4.0 - - =item B<--controller usb,model=ich9-uhci2,address=0:0:4.7,index=0,master=2> - - Adds a ICH9 UHCI2 USB companion controller for the previous master - controller, ports start from port number 2. - -+The parameter multifunction='on' will be added automatically to the -+proper device (if needed). This applies to all PCI devices. -+ - =back - - =item --host-device=HOSTDEV --- -1.8.3.2 - diff --git a/SOURCES/virt-manager-Fix-automatic-search-for-multifunction-parameter.patch b/SOURCES/virt-manager-Fix-automatic-search-for-multifunction-parameter.patch deleted file mode 100644 index 881131e..0000000 --- a/SOURCES/virt-manager-Fix-automatic-search-for-multifunction-parameter.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 51ed301cc7e734632b3696fe960f8efb5fd4d3d6 Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Thu, 10 Oct 2013 07:29:26 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Fix automatic search for multifunction - parameter - -https://bugzilla.redhat.com/show_bug.cgi?id=956700 - -In downstream commit 11368d4, the device address formatting was done -with '%d's, but the rework, of XML building and parsing, which changes -device parameters from strings to numbers, done upstream is missing -downstream and thus the code backported can sometimes fail. In order -to mess with the code as little as possible, this patch just goes with -the string representations and fixes the code appropriately. - -RHEL-only ---- - virtinst/Guest.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/virtinst/Guest.py b/virtinst/Guest.py -index 09ee6e1..46e19fe 100644 ---- a/virtinst/Guest.py -+++ b/virtinst/Guest.py -@@ -1461,7 +1461,7 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain): - continue - - addr = d.address -- addrstr = "%d%d%d" % (d.address.domain, -+ addrstr = "%s%s%s" % (d.address.domain, - d.address.bus, - d.address.slot) - -@@ -1473,8 +1473,8 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain): - addresses[addrstr][addr.function] = d - - for devs in addresses.values(): -- if len(devs) > 1 and 0 in devs: -- devs[0].address.multifunction = "on" -+ if len(devs) > 1 and "0" in devs: -+ devs["0"].address.multifunction = "on" - - ################################### - # Guest Dictionary Helper methods # --- -1.8.3.2 - diff --git a/SOURCES/virt-manager-Fix-tests-on-f20-dev-loop0-isn-t-available.patch b/SOURCES/virt-manager-Fix-tests-on-f20-dev-loop0-isn-t-available.patch deleted file mode 100644 index 7a59859..0000000 --- a/SOURCES/virt-manager-Fix-tests-on-f20-dev-loop0-isn-t-available.patch +++ /dev/null @@ -1,1222 +0,0 @@ -From f8e1030e4077db9785475bc75a660afa14651ba2 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 30 Sep 2013 14:11:50 +0200 -Subject: [RHEL-7.0 virt-manager PATCH] Fix tests on f20, /dev/loop0 isn't - available - -(gscrivan: fix other failures) - -(cherry picked from commit 382a24d08db1611787b104d675076ffe7715e4a7) -Signed-off-by: Giuseppe Scrivano - -Conflicts: - tests/image-xml/image2guest/image-format-out.xml - tests/image-xml/image2guest/image-xenfv32.xml - tests/image-xml/image2guest/image-xenpv32-kernel.xml - tests/image-xml/image2guest/image-xenpv32.xml - tests/utils.py - tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml - tests/xmlconfig-xml/boot-many-devices.xml - tests/xmlconfig-xml/boot-many-disks2.xml - tests/xmlconfig-xml/boot-paravirt-disk-block.xml - tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml - tests/xmlconfig-xml/boot-paravirt-many-disks.xml - tests/xmlconfig-xml/install-f10.xml - tests/xmlconfig-xml/install-f11-ac97.xml - tests/xmlconfig-xml/install-f11-noac97.xml - tests/xmlconfig-xml/install-f11-norheldefaults.xml - tests/xmlconfig-xml/install-f11-qemu.xml - tests/xmlconfig-xml/install-f11-rheldefaults.xml - tests/xmlconfig-xml/install-f11-xen.xml - tests/xmlconfig-xml/install-f11.xml - tests/xmlconfig-xml/install-fullyvirt-disk-block.xml - tests/xmlconfig-xml/install-fullyvirt-disk-file.xml - tests/xmlconfig-xml/install-fullyvirt-livecd.xml - tests/xmlconfig-xml/install-paravirt-disk-block.xml - tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml - tests/xmlconfig-xml/install-paravirt-many-disks.xml - tests/xmlconfig-xml/install-windowsxp-xennew.xml - tests/xmlconfig-xml/install-windowsxp-xenold.xml - tests/xmlconfig-xml/misc-qemu-driver-name.xml - tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml - tests/xmlconfig-xml/misc-qemu-driver-type.xml - tests/xmlconfig-xml/misc-qemu-iso-disk.xml - tests/xmlconfig-xml/misc-xml-escaping.xml - tests/xmlconfig-xml/rhel6-kvm-stage1.xml - tests/xmlconfig-xml/rhel6-kvm-stage2.xml - tests/xmlconfig-xml/winxp-kvm-stage1.xml - tests/xmlconfig-xml/winxp-kvm-stage2.xml - tests/xmlconfig-xml/winxp-kvm-stage3.xml - tests/xmlconfig.py ---- - tests/clone-xml/empty-disks-out.xml | 4 ++-- - tests/clone-xml/force-out.xml | 4 ++-- - tests/clone-xml/general-cfg-in.xml | 2 +- - tests/clone-xml/general-cfg-out.xml | 6 +++--- - tests/clone-xml/readonly-disks-out.xml | 4 ++-- - tests/clone-xml/skip-out.xml | 4 ++-- - tests/clonetest.py | 6 +++--- - tests/testdriver.xml | 4 ++-- - tests/utils.py | 6 +++--- - tests/validation.py | 6 +++--- - tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml | 4 ++-- - tests/xmlconfig-xml/boot-many-devices.xml | 8 ++++---- - tests/xmlconfig-xml/boot-many-disks2.xml | 20 ++++++++++---------- - tests/xmlconfig-xml/boot-paravirt-disk-block.xml | 4 ++-- - tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml | 4 ++-- - tests/xmlconfig-xml/boot-paravirt-many-disks.xml | 4 ++-- - tests/xmlconfig-xml/boot-windowsxp-kvm.xml | 4 ++-- - tests/xmlconfig-xml/install-f10.xml | 4 ++-- - tests/xmlconfig-xml/install-f11-ac97.xml | 4 ++-- - tests/xmlconfig-xml/install-f11-noac97.xml | 4 ++-- - tests/xmlconfig-xml/install-f11-qemu.xml | 4 ++-- - tests/xmlconfig-xml/install-f11-xen.xml | 4 ++-- - tests/xmlconfig-xml/install-f11.xml | 4 ++-- - tests/xmlconfig-xml/install-fullyvirt-disk-block.xml | 8 ++++---- - tests/xmlconfig-xml/install-fullyvirt-disk-file.xml | 4 ++-- - tests/xmlconfig-xml/install-fullyvirt-livecd.xml | 4 ++-- - tests/xmlconfig-xml/install-paravirt-disk-block.xml | 4 ++-- - .../xmlconfig-xml/install-paravirt-disk-drv-phy.xml | 4 ++-- - tests/xmlconfig-xml/install-paravirt-many-disks.xml | 4 ++-- - tests/xmlconfig-xml/install-windowsxp-kvm.xml | 4 ++-- - tests/xmlconfig-xml/install-windowsxp-xennew.xml | 8 ++++---- - tests/xmlconfig-xml/install-windowsxp-xenold.xml | 8 ++++---- - tests/xmlconfig-xml/misc-qemu-driver-name.xml | 8 ++++---- - tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml | 4 ++-- - tests/xmlconfig-xml/misc-qemu-driver-type.xml | 4 ++-- - tests/xmlconfig-xml/misc-qemu-iso-disk.xml | 4 ++-- - tests/xmlconfig-xml/misc-xml-escaping.xml | 4 ++-- - tests/xmlconfig-xml/rhel6-kvm-stage1.xml | 4 ++-- - tests/xmlconfig-xml/rhel6-kvm-stage2.xml | 4 ++-- - tests/xmlconfig-xml/winxp-kvm-stage1.xml | 8 ++++---- - tests/xmlconfig-xml/winxp-kvm-stage2.xml | 8 ++++---- - tests/xmlconfig-xml/winxp-kvm-stage3.xml | 8 ++++---- - tests/xmlconfig.py | 12 ++++++------ - tests/xmlparse-xml/add-devices-in.xml | 2 +- - tests/xmlparse-xml/change-boot-kernel-in.xml | 2 +- - tests/xmlparse-xml/change-boot-kernel-out.xml | 2 +- - tests/xmlparse-xml/change-disk-in.xml | 2 +- - tests/xmlparse-xml/change-disk-out.xml | 2 +- - tests/xmlparse-xml/change-filesystems-in.xml | 2 +- - tests/xmlparse-xml/change-filesystems-out.xml | 2 +- - tests/xmlparse-xml/change-graphics-in.xml | 2 +- - tests/xmlparse-xml/change-graphics-out.xml | 2 +- - tests/xmlparse-xml/change-guest-in.xml | 2 +- - tests/xmlparse-xml/change-guest-out.xml | 2 +- - tests/xmlparse-xml/change-smartcard-in.xml | 2 +- - tests/xmlparse-xml/change-smartcard-out.xml | 2 +- - tests/xmlparse-xml/change-sounds-in.xml | 2 +- - tests/xmlparse-xml/change-sounds-out.xml | 2 +- - tests/xmlparse-xml/change-videos-in.xml | 2 +- - tests/xmlparse-xml/change-videos-out.xml | 2 +- - tests/xmlparse-xml/change-watchdogs-in.xml | 2 +- - tests/xmlparse-xml/change-watchdogs-out.xml | 2 +- - tests/xmlparse.py | 2 +- - 63 files changed, 137 insertions(+), 137 deletions(-) - -diff --git a/tests/clone-xml/empty-disks-out.xml b/tests/clone-xml/empty-disks-out.xml -index 2b768a6..8e5c88e 100644 ---- a/tests/clone-xml/empty-disks-out.xml -+++ b/tests/clone-xml/empty-disks-out.xml -@@ -17,9 +17,9 @@ - destroy - - /usr/bin/qemu-kvm -- -+ - -- -+ - - - -diff --git a/tests/clone-xml/force-out.xml b/tests/clone-xml/force-out.xml -index 656ae1c..58eaa9b 100644 ---- a/tests/clone-xml/force-out.xml -+++ b/tests/clone-xml/force-out.xml -@@ -17,9 +17,9 @@ - destroy - - /usr/bin/qemu-kvm -- -+ - -- -+ - - - -diff --git a/tests/clone-xml/general-cfg-in.xml b/tests/clone-xml/general-cfg-in.xml -index b3ab912..c0a554c 100644 ---- a/tests/clone-xml/general-cfg-in.xml -+++ b/tests/clone-xml/general-cfg-in.xml -@@ -22,7 +22,7 @@ - - - -- -+ - - - -diff --git a/tests/clone-xml/general-cfg-out.xml b/tests/clone-xml/general-cfg-out.xml -index 20508dc..cce9a83 100644 ---- a/tests/clone-xml/general-cfg-out.xml -+++ b/tests/clone-xml/general-cfg-out.xml -@@ -17,13 +17,13 @@ - destroy - - /usr/bin/qemu-kvm -- -+ - -- -+ - - -+ - -- - - - -diff --git a/tests/clone-xml/readonly-disks-out.xml b/tests/clone-xml/readonly-disks-out.xml -index f8d3ac4..4cc3fd8 100644 ---- a/tests/clone-xml/readonly-disks-out.xml -+++ b/tests/clone-xml/readonly-disks-out.xml -@@ -17,9 +17,9 @@ - destroy - - /usr/bin/qemu-kvm -- -+ - -- -+ - - - -diff --git a/tests/clone-xml/skip-out.xml b/tests/clone-xml/skip-out.xml -index ac68746..c3064d1 100644 ---- a/tests/clone-xml/skip-out.xml -+++ b/tests/clone-xml/skip-out.xml -@@ -28,9 +28,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/clonetest.py b/tests/clonetest.py -index e58d3c1..ffab910 100644 ---- a/tests/clonetest.py -+++ b/tests/clonetest.py -@@ -97,7 +97,7 @@ class TestClone(unittest.TestCase): - for disk in disks: - cloneobj.clone_devices = disk - else: -- cloneobj.clone_devices = "/dev/loop0" -+ cloneobj.clone_devices = "/dev/null" - cloneobj.clone_devices = "/tmp/clone2.img" - cloneobj.clone_devices = "/tmp/clone3.img" - cloneobj.clone_devices = "/tmp/clone4.img" -@@ -186,13 +186,13 @@ class TestClone(unittest.TestCase): - def testCloneStorageForce(self): - base = "force" - self._clone_helper(base, -- disks=["/dev/loop0", None, "/tmp/clone2.img"], -+ disks=["/dev/null", None, "/tmp/clone2.img"], - force_list=["hda", "fdb", "sdb"]) - - def testCloneStorageSkip(self): - base = "skip" - self._clone_helper(base, -- disks=["/dev/loop0", None, "/tmp/clone2.img"], -+ disks=["/dev/null", None, "/tmp/clone2.img"], - skip_list=["hda", "fdb"]) - - def testCloneFullPool(self): -diff --git a/tests/testdriver.xml b/tests/testdriver.xml -index d085af2..114a756 100644 ---- a/tests/testdriver.xml -+++ b/tests/testdriver.xml -@@ -87,7 +87,7 @@ - - - -- -+ - - - -@@ -104,7 +104,7 @@ - - - -- -+ - - - -diff --git a/tests/utils.py b/tests/utils.py -index 438f291..24a12fd 100644 ---- a/tests/utils.py -+++ b/tests/utils.py -@@ -192,7 +192,7 @@ def get_basic_fullyvirt_guest(typ="xen", installer=None): - g.memory = int(200) - g.maxmemory = int(400) - g.uuid = "12345678-1234-1234-1234-123456789012" -- g.cdrom = "/dev/loop0" -+ g.cdrom = "/dev/null" - g.add_device(VirtualGraphics("sdl")) - g.features['pae'] = 0 - g.vcpus = 5 -@@ -217,7 +217,7 @@ def make_distro_installer(location="/dev/default-pool/default-vol", gtype="xen") - return inst - - --def make_live_installer(location="/dev/loop0", gtype="xen"): -+def make_live_installer(location="/dev/null", gtype="xen"): - inst = virtinst.LiveCDInstaller(type=gtype, os_type="hvm", - conn=_conn, location=location) - return inst -@@ -253,7 +253,7 @@ def get_filedisk(path=None): - return VirtualDisk(path, size=.0001, conn=_conn) - - --def get_blkdisk(path="/dev/loop0"): -+def get_blkdisk(path="/dev/null"): - return VirtualDisk(path, conn=_conn) - - -diff --git a/tests/validation.py b/tests/validation.py -index a384afb..d942be7 100644 ---- a/tests/validation.py -+++ b/tests/validation.py -@@ -87,7 +87,7 @@ args = { - 'valid' : ['sometype']}, - 'cdrom' : { - 'invalid' : ['', 0, '/somepath'], -- 'valid' : ['/dev/loop0'] -+ 'valid' : ['/dev/null'] - }, - 'arch' : { - 'invalid' : [], -@@ -127,7 +127,7 @@ args = { - ], - - 'valid' : [ -- {'path' : '/dev/loop0'}, -+ {'path' : '/dev/null'}, - {'path' : 'nonexist', 'size' : 1}, - {'path' : '/dev/null'}, - {'path' : None, 'device' : VirtualDisk.DEVICE_CDROM}, -@@ -430,7 +430,7 @@ class TestValidation(unittest.TestCase): - self._testArgs(g, virtinst.Guest, 'guest') - - def testDiskValidation(self): -- disk = VirtualDisk("/dev/loop0") -+ disk = VirtualDisk("/dev/null") - self._testArgs(disk, VirtualDisk, 'disk') - - def testNetworkValidation(self): -diff --git a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml -index a9866ae..edb2ce4 100644 ---- a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml -+++ b/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml -@@ -18,8 +18,8 @@ - restart - - /usr/lib/xen/bin/qemu-dm -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/boot-many-devices.xml b/tests/xmlconfig-xml/boot-many-devices.xml -index 4b63570..c5871a3 100644 ---- a/tests/xmlconfig-xml/boot-many-devices.xml -+++ b/tests/xmlconfig-xml/boot-many-devices.xml -@@ -22,12 +22,12 @@ - restart - - /usr/lib/xen/bin/qemu-dm -- -- -+ -+ - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/boot-many-disks2.xml b/tests/xmlconfig-xml/boot-many-disks2.xml -index 54b6c34..c68b460 100644 ---- a/tests/xmlconfig-xml/boot-many-disks2.xml -+++ b/tests/xmlconfig-xml/boot-many-disks2.xml -@@ -22,19 +22,19 @@ - - - -- -- -+ -+ - - -- -+ - -- -+ - - - -- -+ - -- -+ - - - -@@ -44,14 +44,14 @@ - - - -- -+ - -- -+ - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-block.xml b/tests/xmlconfig-xml/boot-paravirt-disk-block.xml -index c2f6827..42974cc 100644 ---- a/tests/xmlconfig-xml/boot-paravirt-disk-block.xml -+++ b/tests/xmlconfig-xml/boot-paravirt-disk-block.xml -@@ -9,8 +9,8 @@ - restart - restart - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml b/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml -index f9213b2..16c4ac0 100644 ---- a/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml -+++ b/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml -@@ -9,9 +9,9 @@ - restart - restart - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/boot-paravirt-many-disks.xml b/tests/xmlconfig-xml/boot-paravirt-many-disks.xml -index b88d1c8..1acbac0 100644 ---- a/tests/xmlconfig-xml/boot-paravirt-many-disks.xml -+++ b/tests/xmlconfig-xml/boot-paravirt-many-disks.xml -@@ -18,8 +18,8 @@ - - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml -index 91cc3d0..2973adf 100644 ---- a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml -+++ b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml -@@ -24,12 +24,12 @@ - - - -- -+ - - - - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-f10.xml b/tests/xmlconfig-xml/install-f10.xml -index 470df8c..0ef7cb0 100644 ---- a/tests/xmlconfig-xml/install-f10.xml -+++ b/tests/xmlconfig-xml/install-f10.xml -@@ -23,9 +23,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-f11-ac97.xml b/tests/xmlconfig-xml/install-f11-ac97.xml -index c017594..9b158d3 100644 ---- a/tests/xmlconfig-xml/install-f11-ac97.xml -+++ b/tests/xmlconfig-xml/install-f11-ac97.xml -@@ -27,9 +27,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-f11-noac97.xml b/tests/xmlconfig-xml/install-f11-noac97.xml -index 24ed598..a6b5a5a 100644 ---- a/tests/xmlconfig-xml/install-f11-noac97.xml -+++ b/tests/xmlconfig-xml/install-f11-noac97.xml -@@ -27,9 +27,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml -index 685ccd4..302e4bd 100644 ---- a/tests/xmlconfig-xml/install-f11-qemu.xml -+++ b/tests/xmlconfig-xml/install-f11-qemu.xml -@@ -27,9 +27,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-f11-xen.xml b/tests/xmlconfig-xml/install-f11-xen.xml -index b902126..67159b8 100644 ---- a/tests/xmlconfig-xml/install-f11-xen.xml -+++ b/tests/xmlconfig-xml/install-f11-xen.xml -@@ -26,8 +26,8 @@ - - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml -index ccf30d6..c132ae9 100644 ---- a/tests/xmlconfig-xml/install-f11.xml -+++ b/tests/xmlconfig-xml/install-f11.xml -@@ -27,9 +27,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml -index f361961..09b02ab 100644 ---- a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml -+++ b/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml -@@ -19,12 +19,12 @@ - destroy - - /usr/lib/xen/bin/qemu-dm -- -- -+ -+ - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml -index 95a80c8..bcea591 100644 ---- a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml -+++ b/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml -@@ -23,8 +23,8 @@ - - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml b/tests/xmlconfig-xml/install-fullyvirt-livecd.xml -index 351fdc5..7f793c0 100644 ---- a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml -+++ b/tests/xmlconfig-xml/install-fullyvirt-livecd.xml -@@ -18,8 +18,8 @@ - restart - - /usr/lib/xen/bin/qemu-dm -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-paravirt-disk-block.xml b/tests/xmlconfig-xml/install-paravirt-disk-block.xml -index c3483c7..cc7da6a 100644 ---- a/tests/xmlconfig-xml/install-paravirt-disk-block.xml -+++ b/tests/xmlconfig-xml/install-paravirt-disk-block.xml -@@ -13,8 +13,8 @@ - destroy - destroy - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml b/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml -index a5a542f..1c0e748 100644 ---- a/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml -+++ b/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml -@@ -13,9 +13,9 @@ - destroy - destroy - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-paravirt-many-disks.xml b/tests/xmlconfig-xml/install-paravirt-many-disks.xml -index 27a522e..9be0350 100644 ---- a/tests/xmlconfig-xml/install-paravirt-many-disks.xml -+++ b/tests/xmlconfig-xml/install-paravirt-many-disks.xml -@@ -22,8 +22,8 @@ - - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-windowsxp-kvm.xml b/tests/xmlconfig-xml/install-windowsxp-kvm.xml -index 21c75fe..7d54eab 100644 ---- a/tests/xmlconfig-xml/install-windowsxp-kvm.xml -+++ b/tests/xmlconfig-xml/install-windowsxp-kvm.xml -@@ -25,12 +25,12 @@ - - - -- -+ - - - - -- -+ - - - -diff --git a/tests/xmlconfig-xml/install-windowsxp-xennew.xml b/tests/xmlconfig-xml/install-windowsxp-xennew.xml -index 3447e89..3037251 100644 ---- a/tests/xmlconfig-xml/install-windowsxp-xennew.xml -+++ b/tests/xmlconfig-xml/install-windowsxp-xennew.xml -@@ -23,12 +23,12 @@ - - - -- -- -+ -+ - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/install-windowsxp-xenold.xml b/tests/xmlconfig-xml/install-windowsxp-xenold.xml -index 3016fdb..e684aa1 100644 ---- a/tests/xmlconfig-xml/install-windowsxp-xenold.xml -+++ b/tests/xmlconfig-xml/install-windowsxp-xenold.xml -@@ -20,12 +20,12 @@ - - - -- -- -+ -+ - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/misc-qemu-driver-name.xml b/tests/xmlconfig-xml/misc-qemu-driver-name.xml -index 5059cc1..8eb2494 100644 ---- a/tests/xmlconfig-xml/misc-qemu-driver-name.xml -+++ b/tests/xmlconfig-xml/misc-qemu-driver-name.xml -@@ -19,14 +19,14 @@ - destroy - - /usr/lib/xen/bin/qemu-dm -- -+ - -- -+ - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml -index 0cf03b5..4fd7b03 100644 ---- a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml -+++ b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml -@@ -24,9 +24,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/misc-qemu-driver-type.xml b/tests/xmlconfig-xml/misc-qemu-driver-type.xml -index 65f00b5..a07a131 100644 ---- a/tests/xmlconfig-xml/misc-qemu-driver-type.xml -+++ b/tests/xmlconfig-xml/misc-qemu-driver-type.xml -@@ -29,9 +29,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml -index 1191320..e55ec35 100644 ---- a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml -+++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml -@@ -24,9 +24,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/misc-xml-escaping.xml b/tests/xmlconfig-xml/misc-xml-escaping.xml -index 7dd9cd0..9ace6b5 100644 ---- a/tests/xmlconfig-xml/misc-xml-escaping.xml -+++ b/tests/xmlconfig-xml/misc-xml-escaping.xml -@@ -26,8 +26,8 @@ - - - -- -- -+ -+ - - - -diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml -index 75afd3d..b80fbf5 100644 ---- a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml -+++ b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml -@@ -29,9 +29,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml -index a679b5a..c436f80 100644 ---- a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml -+++ b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml -@@ -27,9 +27,9 @@ - - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/winxp-kvm-stage1.xml b/tests/xmlconfig-xml/winxp-kvm-stage1.xml -index b4a84ac..e82f100 100644 ---- a/tests/xmlconfig-xml/winxp-kvm-stage1.xml -+++ b/tests/xmlconfig-xml/winxp-kvm-stage1.xml -@@ -23,14 +23,14 @@ - - - -- -+ - -- -+ - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/winxp-kvm-stage2.xml b/tests/xmlconfig-xml/winxp-kvm-stage2.xml -index b858c29..e29f6d4 100644 ---- a/tests/xmlconfig-xml/winxp-kvm-stage2.xml -+++ b/tests/xmlconfig-xml/winxp-kvm-stage2.xml -@@ -22,14 +22,14 @@ - - - -- -+ - -- -+ - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig-xml/winxp-kvm-stage3.xml b/tests/xmlconfig-xml/winxp-kvm-stage3.xml -index a926a0f..ef3d1ce 100644 ---- a/tests/xmlconfig-xml/winxp-kvm-stage3.xml -+++ b/tests/xmlconfig-xml/winxp-kvm-stage3.xml -@@ -22,14 +22,14 @@ - - - -- -+ - -- -+ - - -- -+ - -- -+ - - - -diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py -index e691130..8c0179f 100644 ---- a/tests/xmlconfig.py -+++ b/tests/xmlconfig.py -@@ -546,10 +546,10 @@ class TestXMLConfig(unittest.TestCase): - - g.add_device(utils.get_filedisk()) - g.add_device(utils.get_blkdisk()) -- g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0", -+ g.add_device(VirtualDisk(conn=g.conn, path="/dev/null", - device=VirtualDisk.DEVICE_CDROM, - driverType="raw")) -- g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0", -+ g.add_device(VirtualDisk(conn=g.conn, path="/dev/null", - device=VirtualDisk.DEVICE_DISK, - driverName="qemu", format="qcow2")) - g.add_device(VirtualDisk(conn=g.conn, path=None, -@@ -557,10 +557,10 @@ class TestXMLConfig(unittest.TestCase): - bus="scsi")) - g.add_device(VirtualDisk(conn=g.conn, path=None, - device=VirtualDisk.DEVICE_FLOPPY)) -- g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0", -+ g.add_device(VirtualDisk(conn=g.conn, path="/dev/null", - device=VirtualDisk.DEVICE_FLOPPY, - driverName="phy", driverCache="none")) -- disk = VirtualDisk(conn=g.conn, path="/dev/loop0", -+ disk = VirtualDisk(conn=g.conn, path="/dev/null", - bus="virtio", driverName="qemu", - driverType="qcow2", driverCache="none") - disk.driver_io = "threads" -@@ -694,9 +694,9 @@ class TestXMLConfig(unittest.TestCase): - g.add_device(VirtualAudio("es1370", conn=g.conn)) - - # Disk devices -- g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0", -+ g.add_device(VirtualDisk(conn=g.conn, path="/dev/null", - device=VirtualDisk.DEVICE_FLOPPY)) -- g.add_device(VirtualDisk(conn=g.conn, path="/dev/loop0", -+ g.add_device(VirtualDisk(conn=g.conn, path="/dev/null", - bus="scsi")) - g.add_device(VirtualDisk(conn=g.conn, path="/tmp", device="floppy")) - d3 = VirtualDisk(conn=g.conn, path="/dev/default-pool/testvol1.img", -diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml -index 9e225f0..b84c3bd 100644 ---- a/tests/xmlparse-xml/add-devices-in.xml -+++ b/tests/xmlparse-xml/add-devices-in.xml -@@ -29,7 +29,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-boot-kernel-in.xml b/tests/xmlparse-xml/change-boot-kernel-in.xml -index 7abd3b5..ffbc280 100644 ---- a/tests/xmlparse-xml/change-boot-kernel-in.xml -+++ b/tests/xmlparse-xml/change-boot-kernel-in.xml -@@ -15,7 +15,7 @@ - 5 - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-boot-kernel-out.xml b/tests/xmlparse-xml/change-boot-kernel-out.xml -index 7e8d137..b66c708 100644 ---- a/tests/xmlparse-xml/change-boot-kernel-out.xml -+++ b/tests/xmlparse-xml/change-boot-kernel-out.xml -@@ -15,7 +15,7 @@ - 5 - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/xmlparse-xml/change-disk-in.xml -index b2ebfab..885e296 100644 ---- a/tests/xmlparse-xml/change-disk-in.xml -+++ b/tests/xmlparse-xml/change-disk-in.xml -@@ -29,7 +29,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml -index ebccd57..c59881b 100644 ---- a/tests/xmlparse-xml/change-disk-out.xml -+++ b/tests/xmlparse-xml/change-disk-out.xml -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-filesystems-in.xml b/tests/xmlparse-xml/change-filesystems-in.xml -index f0d5a1a..bd1b5ca 100644 ---- a/tests/xmlparse-xml/change-filesystems-in.xml -+++ b/tests/xmlparse-xml/change-filesystems-in.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-filesystems-out.xml b/tests/xmlparse-xml/change-filesystems-out.xml -index 6d0c00c..2329792 100644 ---- a/tests/xmlparse-xml/change-filesystems-out.xml -+++ b/tests/xmlparse-xml/change-filesystems-out.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/xmlparse-xml/change-graphics-in.xml -index 6d44ec5..7d0bd72 100644 ---- a/tests/xmlparse-xml/change-graphics-in.xml -+++ b/tests/xmlparse-xml/change-graphics-in.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/xmlparse-xml/change-graphics-out.xml -index 3acf093..7975f17 100644 ---- a/tests/xmlparse-xml/change-graphics-out.xml -+++ b/tests/xmlparse-xml/change-graphics-out.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml -index ab56c03..650ee31 100644 ---- a/tests/xmlparse-xml/change-guest-in.xml -+++ b/tests/xmlparse-xml/change-guest-in.xml -@@ -39,7 +39,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml -index c0d3e72..015f811 100644 ---- a/tests/xmlparse-xml/change-guest-out.xml -+++ b/tests/xmlparse-xml/change-guest-out.xml -@@ -42,7 +42,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml -index 5033e8e..c07010c 100644 ---- a/tests/xmlparse-xml/change-smartcard-in.xml -+++ b/tests/xmlparse-xml/change-smartcard-in.xml -@@ -36,7 +36,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml -index 72305af..d733f55 100644 ---- a/tests/xmlparse-xml/change-smartcard-out.xml -+++ b/tests/xmlparse-xml/change-smartcard-out.xml -@@ -36,7 +36,7 @@ - - - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-sounds-in.xml b/tests/xmlparse-xml/change-sounds-in.xml -index 001c50b..dc5365d 100644 ---- a/tests/xmlparse-xml/change-sounds-in.xml -+++ b/tests/xmlparse-xml/change-sounds-in.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-sounds-out.xml b/tests/xmlparse-xml/change-sounds-out.xml -index 9d7dd4b..dfd9ddd 100644 ---- a/tests/xmlparse-xml/change-sounds-out.xml -+++ b/tests/xmlparse-xml/change-sounds-out.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - - -diff --git a/tests/xmlparse-xml/change-videos-in.xml b/tests/xmlparse-xml/change-videos-in.xml -index 76f8806..7dde768 100644 ---- a/tests/xmlparse-xml/change-videos-in.xml -+++ b/tests/xmlparse-xml/change-videos-in.xml -@@ -20,7 +20,7 @@ - - /usr/lib/xen/bin/qemu-dm - -- -+ - - -