[libvirt] [PATCH v2 00/10] Add proper testing of qemu status XML files
Changes to v1: - added tests specifically for testing format probing (also formating of argv) - removed format probing from snapshot tests - added a synthetic test for <lockstate> - added <namespaces> to the 'modern' test (note that allowReboot is tested in one of the old tests which were preserved) This version also saves space by using symlinks in place of the output XML files since they are identical to the input ones in all cases added in this tests. Peter Krempa (10): tests: qemuxml2xml: Rename testInfoFree to testInfoClear tests: qemu: Explicitly add tests with format probing allowed tests: qemuxml2xml: Remove testing with allowed format detection tests: domainsnapshotxml2xml: Remove testing with allowed format detection tests: qemuxml2xml: Add proper domain status XML testing tests: qemuxml2xml: Add synthetic test for <lockstate> in status XML tests: qemuxml2xml: Remove fake status XML testing tests: util: Remove callback from testCompareDomXML2XMLFiles tests: qemuxml2xml: Add modern example of status XML to the test tests: qemuxml2xml: Add status XML with outgoing migration with NBD tests/Makefile.am | 1 + .../disk_snapshot_redefine.xml | 6 + .../external_vm_redefine.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmltest.c | 3 - tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 97 +++++ .../qemustatusxml2xmldata/blockjob-mirror-out.xml | 1 + .../qemustatusxml2xmldata/migration-out-nbd-in.xml | 449 +++++++++++++++++++++ .../migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 448 ++++++++++++++++++++ tests/qemustatusxml2xmldata/modern-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 ++++++++++++++++ tests/qemustatusxml2xmldata/vcpus-multi-out.xml | 1 + .../qemuxml2argvdata/disk-drive-detect-zeroes.xml | 2 +- .../qemuxml2argvdata/disk-many-format-probing.args | 29 ++ .../qemuxml2argvdata/disk-many-format-probing.xml | 48 +++ tests/qemuxml2argvdata/hugepages-memaccess.xml | 1 + tests/qemuxml2argvdata/hugepages-memaccess2.xml | 1 + tests/qemuxml2argvdata/hugepages-pages4.xml | 1 + tests/qemuxml2argvdata/hugepages-pages5.xml | 1 + tests/qemuxml2argvdata/hugepages-pages6.xml | 1 + .../memory-hotplug-nvdimm-access.xml | 1 + .../memory-hotplug-nvdimm-label.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 1 + .../serial-tcp-tlsx509-chardev-notls.xml | 1 + tests/qemuxml2argvtest.c | 6 + .../aarch64-aavmf-virtio-mmio.xml | 1 + .../aarch64-virtio-pci-default.xml | 1 + .../aarch64-virtio-pci-manual-addresses.xml | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-auto.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-period.xml | 1 + .../bios-nvram-os-interleave.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram.xml | 1 + tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 + tests/qemuxml2xmloutdata/blkiotune.xml | 1 + .../boot-menu-disable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-disable.xml | 1 + .../boot-menu-enable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-multi.xml | 1 + tests/qemuxml2xmloutdata/boot-order.xml | 2 + tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 1 + .../channel-virtio-state-active.xml | 1 + .../channel-virtio-state-inactive.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio.xml | 1 + tests/qemuxml2xmloutdata/clock-catchup.xml | 1 + tests/qemuxml2xmloutdata/console-compat-auto.xml | 1 + tests/qemuxml2xmloutdata/console-virtio-many.xml | 1 + tests/qemuxml2xmloutdata/console-virtio.xml | 1 + .../cpu-host-passthrough-features.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreads.xml | 1 + .../cputune-iothreadsched-zeropriority.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 1 + tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 1 + tests/qemuxml2xmloutdata/cputune.xml | 1 + .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 2 +- tests/qemuxml2xmloutdata/disk-drive-discard.xml | 2 +- .../disk-many-format-probing.xml | 52 +++ tests/qemuxml2xmloutdata/disk-mirror-active.xml | 5 + tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/disk-mirror-old.xml | 7 +- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-device.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 + .../disk-scsi-lun-passthrough-sgio.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-megasas.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 2 + tests/qemuxml2xmloutdata/disk-serial.xml | 3 + tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 4 + tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 + tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 + .../disk-virtio-scsi-cmd_per_lun.xml | 1 + .../disk-virtio-scsi-ioeventfd.xml | 1 + .../disk-virtio-scsi-max_sectors.xml | 1 + .../disk-virtio-scsi-num_queues.xml | 1 + .../qemuxml2xmloutdata/graphics-listen-network.xml | 1 + .../graphics-listen-network2.xml | 1 + .../graphics-spice-compression.xml | 1 + .../qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice.xml | 1 + .../hostdev-scsi-autogen-address.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 1 + .../hostdev-scsi-lsi-iscsi-auth.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 1 + .../hostdev-scsi-vhost-scsi-ccw.xml | 1 + .../hostdev-scsi-vhost-scsi-pci.xml | 1 + .../hostdev-scsi-virtio-iscsi-auth.xml | 1 + .../hostdev-scsi-virtio-iscsi.xml | 1 + .../hostdev-scsi-virtio-scsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages2.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages3.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 + tests/qemuxml2xmloutdata/hugepages.xml | 1 + tests/qemuxml2xmloutdata/lease.xml | 2 + .../machine-loadparm-multiple-disks-nets-s390.xml | 2 + tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 1 + tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 + tests/qemuxml2xmloutdata/memtune-unlimited.xml | 1 + tests/qemuxml2xmloutdata/memtune.xml | 1 + tests/qemuxml2xmloutdata/metadata-duplicate.xml | 1 + tests/qemuxml2xmloutdata/metadata.xml | 1 + tests/qemuxml2xmloutdata/minimal.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev.xml | 1 + tests/qemuxml2xmloutdata/net-midonet.xml | 1 + tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 + tests/qemuxml2xmloutdata/net-udp.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-device.xml | 1 + .../net-virtio-disable-offloads.xml | 1 + .../net-virtio-network-portgroup.xml | 1 + .../net-virtio-rxtxqueuesize.xml | 1 + .../numad-auto-memory-vcpu-cpuset.xml | 1 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../numad-auto-vcpu-no-numatune.xml | 1 + .../numad-static-vcpu-no-numatune.xml | 1 + tests/qemuxml2xmloutdata/panic-isa.xml | 1 + tests/qemuxml2xmloutdata/panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/panic.xml | 1 + tests/qemuxml2xmloutdata/pci-rom.xml | 1 + .../qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 1 + tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + .../pcie-switch-downstream-port.xml | 1 + .../pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 1 + .../seclabel-device-multiple.xml | 1 + .../seclabel-dynamic-baselabel.xml | 1 + .../seclabel-dynamic-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 1 + .../seclabel-dynamic-override.xml | 2 + .../seclabel-dynamic-relabel.xml | 1 + tests/qemuxml2xmloutdata/seclabel-none.xml | 1 + .../seclabel-static-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static.xml | 1 + .../serial-spiceport-nospice.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 + .../qemuxml2xmloutdata/serial-target-port-auto.xml | 1 + .../serial-tcp-tlsx509-chardev.xml | 1 + tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 1 + tests/qemuxml2xmloutdata/smbios.xml | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 + tests/qemuxml2xmltest.c | 288 ++++--------- tests/testutils.c | 8 +- tests/testutils.h | 5 - 169 files changed, 1754 insertions(+), 224 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml create mode 100644 tests/qemustatusxml2xmldata/modern-in.xml create mode 120000 tests/qemustatusxml2xmldata/modern-out.xml create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml create mode 120000 tests/qemustatusxml2xmldata/vcpus-multi-out.xml create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml create mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml -- 2.16.2
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2xmltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0eb9e6c77a..2cbe0c82a7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -278,7 +278,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) static void -testInfoFree(struct testInfo *info) +testInfoClear(struct testInfo *info) { VIR_FREE(info->inName); VIR_FREE(info->outActiveName); @@ -345,7 +345,7 @@ testInfoSet(struct testInfo *info, return 0; error: - testInfoFree(info); + testInfoClear(info); return -1; } @@ -404,7 +404,7 @@ mymain(void) testCompareStatusXMLToXMLFiles, &info) < 0) \ ret = -1; \ } \ - testInfoFree(&info); \ + testInfoClear(&info); \ } while (0) # define NONE QEMU_CAPS_LAST -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:27 +0100, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2xmltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
ACK Jirka
Add a single testcase for the case where format probing is allowed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/disk-many-format-probing.args | 29 ++++++++++++ .../qemuxml2argvdata/disk-many-format-probing.xml | 48 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ .../disk-many-format-probing.xml | 52 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 6 +++ 5 files changed, 141 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml create mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml diff --git a/tests/qemuxml2argvdata/disk-many-format-probing.args b/tests/qemuxml2argvdata/disk-many-format-probing.args new file mode 100644 index 0000000000..cbb765a250 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-many-format-probing.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1 \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/tmp/data.img,if=none,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive file=/tmp/logs.img,if=none,id=drive-ide0-1-1 \ +-device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-many-format-probing.xml b/tests/qemuxml2argvdata/disk-many-format-probing.xml new file mode 100644 index 0000000000..5e34eb46e0 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-many-format-probing.xml @@ -0,0 +1,48 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/tmp/data.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/tmp/logs.img'/> + <target dev='hdd' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 688846b9b4..7d6b6fe44a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2966,6 +2966,12 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX); DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); + /* Test disks with format probing enabled for legacy reasons. + * New tests should not go in this section. */ + driver.config->allowDiskFormatProbing = true; + DO_TEST("disk-many-format-probing", QEMU_CAPS_DRIVE_BOOT); + driver.config->allowDiskFormatProbing = false; + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); diff --git a/tests/qemuxml2xmloutdata/disk-many-format-probing.xml b/tests/qemuxml2xmloutdata/disk-many-format-probing.xml new file mode 100644 index 0000000000..914b9b0937 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-many-format-probing.xml @@ -0,0 +1,52 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/tmp/data.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/tmp/logs.img'/> + <target dev='hdd' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2cbe0c82a7..0b9efaad50 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1344,6 +1344,12 @@ mymain(void) DO_TEST("user-aliases", NONE); + /* Test disks with format probing enabled for legacy reasons. + * New tests should not go in this section. */ + driver.config->allowDiskFormatProbing = true; + DO_TEST("disk-many-format-probing", NONE); + driver.config->allowDiskFormatProbing = false; + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:28 +0100, Peter Krempa wrote:
Add a single testcase for the case where format probing is allowed.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/disk-many-format-probing.args | 29 ++++++++++++ .../qemuxml2argvdata/disk-many-format-probing.xml | 48 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ .../disk-many-format-probing.xml | 52 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 6 +++ 5 files changed, 141 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml create mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml
ACK Jirka
Nobody should use format detection due to security implications. The result of the change is that 'raw' format will be printed unless specified explicitly. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.xml | 1 + tests/qemuxml2argvdata/hugepages-memaccess2.xml | 1 + tests/qemuxml2argvdata/hugepages-pages4.xml | 1 + tests/qemuxml2argvdata/hugepages-pages5.xml | 1 + tests/qemuxml2argvdata/hugepages-pages6.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 1 + tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml | 1 + tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml | 1 + tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml | 1 + tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-auto.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-period.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram.xml | 1 + tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 + tests/qemuxml2xmloutdata/blkiotune.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-disable.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-multi.xml | 1 + tests/qemuxml2xmloutdata/boot-order.xml | 2 ++ tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-state-active.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio.xml | 1 + tests/qemuxml2xmloutdata/clock-catchup.xml | 1 + tests/qemuxml2xmloutdata/console-compat-auto.xml | 1 + tests/qemuxml2xmloutdata/console-virtio-many.xml | 1 + tests/qemuxml2xmloutdata/console-virtio.xml | 1 + tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreads.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 1 + tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 1 + tests/qemuxml2xmloutdata/cputune.xml | 1 + tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 2 +- tests/qemuxml2xmloutdata/disk-drive-discard.xml | 2 +- tests/qemuxml2xmloutdata/disk-mirror-active.xml | 5 +++++ tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 ++++ tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml | 4 ++++ tests/qemuxml2xmloutdata/disk-mirror-old.xml | 7 ++++++- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-device.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-megasas.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml | 2 ++ tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 2 ++ tests/qemuxml2xmloutdata/disk-serial.xml | 3 +++ tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 4 ++++ tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 ++ tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 ++ tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml | 1 + tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml | 1 + tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml | 1 + tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml | 1 + tests/qemuxml2xmloutdata/graphics-listen-network.xml | 1 + tests/qemuxml2xmloutdata/graphics-listen-network2.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice-compression.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages2.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages3.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 + tests/qemuxml2xmloutdata/hugepages.xml | 1 + tests/qemuxml2xmloutdata/lease.xml | 2 ++ .../machine-loadparm-multiple-disks-nets-s390.xml | 2 ++ tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 1 + tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 + tests/qemuxml2xmloutdata/memtune-unlimited.xml | 1 + tests/qemuxml2xmloutdata/memtune.xml | 1 + tests/qemuxml2xmloutdata/metadata-duplicate.xml | 1 + tests/qemuxml2xmloutdata/metadata.xml | 1 + tests/qemuxml2xmloutdata/minimal.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev.xml | 1 + tests/qemuxml2xmloutdata/net-midonet.xml | 1 + tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 + tests/qemuxml2xmloutdata/net-udp.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-device.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml | 1 + tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml | 1 + .../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml | 1 + tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml | 1 + tests/qemuxml2xmloutdata/panic-isa.xml | 1 + tests/qemuxml2xmloutdata/panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/panic.xml | 1 + tests/qemuxml2xmloutdata/pci-rom.xml | 1 + tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 1 + tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 1 + tests/qemuxml2xmloutdata/seclabel-device-multiple.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml | 2 ++ tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml | 1 + tests/qemuxml2xmloutdata/seclabel-none.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 + tests/qemuxml2xmloutdata/serial-target-port-auto.xml | 1 + tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml | 1 + tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 1 + tests/qemuxml2xmloutdata/smbios.xml | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 + tests/qemuxml2xmltest.c | 3 --- 147 files changed, 180 insertions(+), 7 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml index 085429d969..0a81ed4489 100644 --- a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml +++ b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml @@ -23,7 +23,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <disk type='file' device='cdrom'> - <driver discard='ignore' detect_zeroes='unmap'/> + <driver name='qemu' type='raw' discard='ignore' detect_zeroes='unmap'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml index db9b9430e1..cd75440254 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml @@ -35,6 +35,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml index c0011285c2..205f9efd92 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml @@ -35,6 +35,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/hugepages-pages4.xml b/tests/qemuxml2argvdata/hugepages-pages4.xml index 13809e52b4..9f79881a59 100644 --- a/tests/qemuxml2argvdata/hugepages-pages4.xml +++ b/tests/qemuxml2argvdata/hugepages-pages4.xml @@ -33,6 +33,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/hugepages-pages5.xml b/tests/qemuxml2argvdata/hugepages-pages5.xml index 1e4ca64f85..f636c186de 100644 --- a/tests/qemuxml2argvdata/hugepages-pages5.xml +++ b/tests/qemuxml2argvdata/hugepages-pages5.xml @@ -20,6 +20,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/hugepages-pages6.xml b/tests/qemuxml2argvdata/hugepages-pages6.xml index ae8de680dd..fc4f57fbc0 100644 --- a/tests/qemuxml2argvdata/hugepages-pages6.xml +++ b/tests/qemuxml2argvdata/hugepages-pages6.xml @@ -20,6 +20,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml index 1617624891..b41484ad2b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml index 4efe556d25..e266147a29 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml index 0e064e6986..751ad27474 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml index 89dc9e6e1d..ddda2c62b9 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml index 9e728300e5..c30690e7bc 100644 --- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml +++ b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml @@ -27,6 +27,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/aarch64.raw'/> <target dev='vda' bus='virtio'/> <address type='virtio-mmio'/> diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml index 9796d7f637..c569a2886d 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml @@ -27,6 +27,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/aarch64.raw'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml index 83d8dcc4a7..b28e644844 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml @@ -27,6 +27,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/aarch64.raw'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/autoindex.xml b/tests/qemuxml2xmloutdata/autoindex.xml index 9ab689eda7..382dc73f1c 100644 --- a/tests/qemuxml2xmloutdata/autoindex.xml +++ b/tests/qemuxml2xmloutdata/autoindex.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml index 33e952d5ce..cc92b7823f 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml index c21f4d747a..45c7a22f39 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-period.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml index b6d7a66361..dfa496a215 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmloutdata/bios-nvram.xml index 8e254925ba..eabbf717f9 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml index 476a732d61..4a3a6b4327 100644 --- a/tests/qemuxml2xmloutdata/blkiotune-device.xml +++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml @@ -34,6 +34,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml index 67fa84c903..79f899d717 100644 --- a/tests/qemuxml2xmloutdata/blkiotune.xml +++ b/tests/qemuxml2xmloutdata/blkiotune.xml @@ -18,6 +18,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml index b42b52ee51..8962ffbdd9 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml @@ -16,6 +16,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml index b42b52ee51..8962ffbdd9 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml @@ -16,6 +16,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml index 981a52090c..90f323a1e2 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml @@ -16,6 +16,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml index dab9041585..390d198f25 100644 --- a/tests/qemuxml2xmloutdata/boot-multi.xml +++ b/tests/qemuxml2xmloutdata/boot-multi.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml index 0e95901b88..1e4ca91d05 100644 --- a/tests/qemuxml2xmloutdata/boot-order.xml +++ b/tests/qemuxml2xmloutdata/boot-order.xml @@ -14,11 +14,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml index 2e1f720838..3eeddda0b4 100644 --- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml +++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml index 6fd0358156..3bed3b6c0d 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml index 7d93fc0c0a..4487ea47dd 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml index 32a2673f4a..0a427ba484 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml index 1fe09a1cff..5400658353 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml index e019895991..e171fae534 100644 --- a/tests/qemuxml2xmloutdata/clock-catchup.xml +++ b/tests/qemuxml2xmloutdata/clock-catchup.xml @@ -25,6 +25,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml index 267b253b15..ec7ca296e3 100644 --- a/tests/qemuxml2xmloutdata/console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml index 1a22b78b8c..4f718dfbd8 100644 --- a/tests/qemuxml2xmloutdata/console-virtio-many.xml +++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml index 0f4469b14a..334cc21c2e 100644 --- a/tests/qemuxml2xmloutdata/console-virtio.xml +++ b/tests/qemuxml2xmloutdata/console-virtio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml index 9a73c2a673..6d47bd84fe 100644 --- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml +++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml @@ -25,6 +25,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml index 6aed4dc4db..e647cf70e7 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml index 87fc71cb02..0ba6b5ae93 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml @@ -29,6 +29,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml index 4efc3b8cca..a496f13e14 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml @@ -29,6 +29,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml index 14205479e5..cea21402dc 100644 --- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml +++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml @@ -23,6 +23,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml index fe8d5d0bbe..612eb76e71 100644 --- a/tests/qemuxml2xmloutdata/cputune.xml +++ b/tests/qemuxml2xmloutdata/cputune.xml @@ -27,6 +27,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml index d1f9834654..69361a453a 100644 --- a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml +++ b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> - <driver copy_on_read='on'/> + <driver name='qemu' type='raw' copy_on_read='on'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-drive-discard.xml b/tests/qemuxml2xmloutdata/disk-drive-discard.xml index 4fe85b1cdc..d51c3a1819 100644 --- a/tests/qemuxml2xmloutdata/disk-drive-discard.xml +++ b/tests/qemuxml2xmloutdata/disk-drive-discard.xml @@ -23,7 +23,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <disk type='file' device='cdrom'> - <driver discard='ignore'/> + <driver name='qemu' type='raw' discard='ignore'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml index c1e8a33ec1..d689eac6b8 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml @@ -15,15 +15,18 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> <mirror type='block' job='copy' ready='yes'> + <format type='raw'/> <source dev='/dev/HostVG/QEMUGuest1Copy'/> </mirror> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <backingStore/> <target dev='hdc' bus='ide'/> @@ -31,6 +34,7 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <backingStore/> <mirror type='file' file='/tmp/copy.img' format='qcow2' job='copy'> @@ -41,6 +45,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <backingStore/> <mirror type='file' file='/tmp/logcopy.img' format='qcow2' job='copy' ready='abort'> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml index b3bba884ee..cc7aed0873 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml @@ -15,22 +15,26 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml index b3bba884ee..cc7aed0873 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml @@ -15,22 +15,26 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old.xml b/tests/qemuxml2xmloutdata/disk-mirror-old.xml index e390bc02f2..f8a885aec8 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old.xml @@ -15,15 +15,18 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> - <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy' job='copy' ready='yes'> + <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy' format='raw' job='copy' ready='yes'> + <format type='raw'/> <source file='/dev/HostVG/QEMUGuest1Copy'/> </mirror> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <backingStore/> <target dev='hdc' bus='ide'/> @@ -31,6 +34,7 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <backingStore/> <mirror type='file' file='/tmp/copy.img' format='qcow2' job='copy'> @@ -41,6 +45,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <backingStore/> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml index a0db32b56f..012b3cc263 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device.xml b/tests/qemuxml2xmloutdata/disk-scsi-device.xml index b46ffb6315..c1b44a54a1 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-device.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-device.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml index 9d62909504..c36f07db1c 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> <readonly/> @@ -23,6 +24,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='sdb' bus='scsi'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml index 80eb3cc21a..604ee8c9e3 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='lun' rawio='no' sgio='unfiltered'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='lun' sgio='filtered'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='1' unit='1'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml index 6e6280bbf7..3453f1f750 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='4' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml index 75e26ae666..e4f4b9e3b1 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <wwn>5000c50015ea71ac</wwn> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml index a7ee28684a..069a35f27c 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='4' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml index ced2b2be9a..5f0cc50674 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='3' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 5a26e549df..9313c699b6 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -15,18 +15,21 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <serial> WD-WMAP9A966149</serial> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/AllSerialChars'/> <target dev='hdb' bus='ide'/> <serial>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+</serial> <address type='drive' controller='0' bus='0' target='0' unit='2'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> <serial>sdserial</serial> diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml index a14ed7b973..29706200db 100644 --- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml +++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='volume' device='cdrom'> + <driver name='qemu'/> <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'> <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:public_content_t:s0</label> @@ -25,6 +26,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='volume' device='cdrom'> + <driver name='qemu'/> <source pool='pool-iscsi' volume='unit:0:0:2' mode='direct'> <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:public_content_t:s0</label> @@ -35,11 +37,13 @@ <address type='drive' controller='0' bus='0' target='0' unit='2'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='3'/> </disk> <disk type='volume' device='cdrom'> + <driver name='qemu'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml index 2379a8ca17..567b22db84 100644 --- a/tests/qemuxml2xmloutdata/disk-source-pool.xml +++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='volume' device='cdrom'> + <driver name='qemu'/> <source pool='pool-disk' volume='block+cdrom'> <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:public_content_t:s0</label> @@ -31,6 +32,7 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/idedisk.img'/> <target dev='hdd' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='2'/> diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml index b5bcca935f..07282c87a0 100644 --- a/tests/qemuxml2xmloutdata/disk-usb-device.xml +++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='/tmp/usbdisk.img'/> <target dev='sda' bus='usb'/> </disk> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml index b5e55ca51f..f50a668625 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml index 4ec0471696..f2c0b47731 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml index afebb413b3..07f4012fd0 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml index 0c14b70082..f0776b6b71 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml index d1f5b82cd8..144d315b57 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml index 6ccf0d10a9..ad44f67443 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml index a387e2b4a0..27854421c5 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml index 1b56f63bab..78af3846df 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml index c6327a9f7f..1822bc35cc 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml index cea212b64d..3b4242e409 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml index b0ed1532c9..1b0da12f60 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml index 3d0efdcafe..beeb3cb11e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml index 28b80a02bb..cff162b4ea 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml index 545ce3ba8f..d8931da38a 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml index 2f2709eafe..df1375d1a5 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml index 57a4efd226..dd252f8524 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml index cff25e7479..05cefc003b 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml index 6731d6dfd8..31aa2dd3b5 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml index 6012d241ce..3723bd0a98 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-s390x</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml index cb97544d30..174096b0d9 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml index 74a93dd5d6..a3886ec750 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml index ddf7801602..d31af322ac 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index c771b1cafa..df87897323 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml index 786d9b81e0..77bd62a129 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-pages.xml index f4c3d9725a..498610a217 100644 --- a/tests/qemuxml2xmloutdata/hugepages-pages.xml +++ b/tests/qemuxml2xmloutdata/hugepages-pages.xml @@ -33,6 +33,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hugepages-pages2.xml b/tests/qemuxml2xmloutdata/hugepages-pages2.xml index 942b5d8c94..cd79960f1b 100644 --- a/tests/qemuxml2xmloutdata/hugepages-pages2.xml +++ b/tests/qemuxml2xmloutdata/hugepages-pages2.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-pages3.xml index 928c4ff61f..be21c3eddd 100644 --- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml +++ b/tests/qemuxml2xmloutdata/hugepages-pages3.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml index bf296a1a78..e56d1ace83 100644 --- a/tests/qemuxml2xmloutdata/hugepages-shared.xml +++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml @@ -33,6 +33,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/hugepages.xml b/tests/qemuxml2xmloutdata/hugepages.xml index 461e862411..f78ca95c1b 100644 --- a/tests/qemuxml2xmloutdata/hugepages.xml +++ b/tests/qemuxml2xmloutdata/hugepages.xml @@ -18,6 +18,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml index 328946d6e3..a6ba5903cc 100644 --- a/tests/qemuxml2xmloutdata/lease.xml +++ b/tests/qemuxml2xmloutdata/lease.xml @@ -15,11 +15,13 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml index 2f0bb83107..c4e08fd440 100644 --- a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml +++ b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml @@ -14,12 +14,14 @@ <devices> <emulator>/usr/bin/qemu-system-s390x</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='virtio'/> <boot order='1' loadparm='SYSTEM1'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdb' bus='virtio'/> <boot order='3' loadparm='3'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml index ed0894ee0e..d26675852f 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml @@ -26,6 +26,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml index e6771b5421..a5d82346be 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml @@ -22,6 +22,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml index 9aec678e2e..1910edab41 100644 --- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml +++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml index 039afafd43..55db8a2daf 100644 --- a/tests/qemuxml2xmloutdata/memtune.xml +++ b/tests/qemuxml2xmloutdata/memtune.xml @@ -20,6 +20,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml index 659eedf85e..2ac9c2aa54 100644 --- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml +++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml index 659eedf85e..2ac9c2aa54 100644 --- a/tests/qemuxml2xmloutdata/metadata.xml +++ b/tests/qemuxml2xmloutdata/metadata.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml index 1bb3b33736..1a0cf56824 100644 --- a/tests/qemuxml2xmloutdata/minimal.xml +++ b/tests/qemuxml2xmloutdata/minimal.xml @@ -20,6 +20,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml index 8b51648d54..0523cd8d3b 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml index ddc6151687..bede4b034f 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml index fe61e33c8d..49fe8f6ec2 100644 --- a/tests/qemuxml2xmloutdata/net-midonet.xml +++ b/tests/qemuxml2xmloutdata/net-midonet.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml index e2483f59d9..13efaca2cb 100644 --- a/tests/qemuxml2xmloutdata/net-openvswitch.xml +++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml index d30e85a2fe..efd74cb36d 100644 --- a/tests/qemuxml2xmloutdata/net-udp.xml +++ b/tests/qemuxml2xmloutdata/net-udp.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml index 73d693b75f..f1238cde2b 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-device.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml index 3ed5d02d35..e5cad4078b 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest7'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml index b70f73cd87..fe8c5657ce 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml index 5c33a58ad5..753c2f247e 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml index ea8cbf9202..6e3aa331c5 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml index c895e42f02..0be69f5b02 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml index 2a4455b9c1..04d9a3ee5e 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml index c3608c0dad..3dae444172 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml @@ -18,6 +18,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml index 6069073891..8f4f330d54 100644 --- a/tests/qemuxml2xmloutdata/panic-isa.xml +++ b/tests/qemuxml2xmloutdata/panic-isa.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml index 9ddafb1626..b05d2209ac 100644 --- a/tests/qemuxml2xmloutdata/panic-no-address.xml +++ b/tests/qemuxml2xmloutdata/panic-no-address.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml index 6069073891..8f4f330d54 100644 --- a/tests/qemuxml2xmloutdata/panic.xml +++ b/tests/qemuxml2xmloutdata/panic.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml index ee893fdd53..982231fefe 100644 --- a/tests/qemuxml2xmloutdata/pci-rom.xml +++ b/tests/qemuxml2xmloutdata/pci-rom.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml index 8f77ef043a..5308d4d253 100644 --- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml +++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml index aaac423cac..008d01e5f8 100644 --- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml +++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml @@ -22,6 +22,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.xml b/tests/qemuxml2xmloutdata/pcie-root-port.xml index 9f6e120405..1424b9e22e 100644 --- a/tests/qemuxml2xmloutdata/pcie-root-port.xml +++ b/tests/qemuxml2xmloutdata/pcie-root-port.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml index 9970a83e25..ca49d04a76 100644 --- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml +++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml index 1453fffd74..f994957c32 100644 --- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml +++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.xml b/tests/qemuxml2xmloutdata/pcihole64-q35.xml index 6818094436..b3f591c451 100644 --- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml +++ b/tests/qemuxml2xmloutdata/pcihole64-q35.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml index 2e5f2e241c..9ce1c317b2 100644 --- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml +++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/q35-pcie.xml b/tests/qemuxml2xmloutdata/q35-pcie.xml index 4d08c9627e..75ca42a20e 100644 --- a/tests/qemuxml2xmloutdata/q35-pcie.xml +++ b/tests/qemuxml2xmloutdata/q35-pcie.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x09' slot='0x00' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml index 5ca50223b4..2ad1ddec21 100644 --- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml +++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml index 7081d9cc98..912ae8a890 100644 --- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml +++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/q35-usb2.xml b/tests/qemuxml2xmloutdata/q35-usb2.xml index da3989914b..3d5407609e 100644 --- a/tests/qemuxml2xmloutdata/q35-usb2.xml +++ b/tests/qemuxml2xmloutdata/q35-usb2.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml index ea204194d4..f534a54c0f 100644 --- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml +++ b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x02' slot='0x05' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/q35.xml b/tests/qemuxml2xmloutdata/q35.xml index c57f178e41..fa230ce9b5 100644 --- a/tests/qemuxml2xmloutdata/q35.xml +++ b/tests/qemuxml2xmloutdata/q35.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml index cb32458f80..04418be906 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml index 4e83ac390b..46b6b210b5 100644 --- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml +++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml index 3f4ff0aadf..7163015192 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml index 3f4ff0aadf..7163015192 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml index 9d58317a0d..067889262c 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml index 91fa637aef..9e21c054b0 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='no'/> </source> @@ -22,6 +23,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'> <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:public_content_t:s0</label> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml index 9d58317a0d..067889262c 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml index 9d58317a0d..067889262c 100644 --- a/tests/qemuxml2xmloutdata/seclabel-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-none.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml index d37b950cbf..7c448675e2 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' labelskip='yes'/> </source> diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml index cecc9ad487..2197104d57 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml index e1d5cb9d72..560f4d2b77 100644 --- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml +++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml index ff92435afe..287f3817e1 100644 --- a/tests/qemuxml2xmloutdata/serial-spiceport.xml +++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml index fded758eac..cc10a55bcf 100644 --- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml +++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml index 76d8948204..44a5be35b4 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml index 2a1b85851d..d3dd152aed 100644 --- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml +++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml @@ -46,6 +46,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml index d5f1d29610..931c291d21 100644 --- a/tests/qemuxml2xmloutdata/smbios.xml +++ b/tests/qemuxml2xmloutdata/smbios.xml @@ -51,6 +51,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml index 281dd1e105..62336a8c2d 100644 --- a/tests/qemuxml2xmloutdata/sound-device.xml +++ b/tests/qemuxml2xmloutdata/sound-device.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml index 204366f181..69c625bddc 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml index be8008454b..6ba2817002 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml index a3922d6304..d0cd2f2ce9 100644 --- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml +++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml @@ -18,6 +18,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0b9efaad50..b1fc6a2d28 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -378,9 +378,6 @@ mymain(void) cfg = virQEMUDriverGetConfig(&driver); - /* TODO: test with format probing disabled too */ - driver.config->allowDiskFormatProbing = true; - # define DO_TEST_FULL(name, when, gic, ...) \ do { \ if (testInfoSet(&info, name, when, gic) < 0) { \ -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:29 +0100, Peter Krempa wrote:
Nobody should use format detection due to security implications. The result of the change is that 'raw' format will be printed unless specified explicitly.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> ---
ACK Jirka
We have a test of the domain XML that allows format detection, so there's no need to do it for snapshot XMLs where the parameter would influence the domain XML portion. --- tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml | 6 ++++++ tests/domainsnapshotxml2xmlout/external_vm_redefine.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmltest.c | 3 --- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml index a6eb5df987..a9adbdc2a3 100644 --- a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -41,31 +41,37 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdb' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest3'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='2' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest4'/> <target dev='hdd' bus='ide'/> <address type='drive' controller='0' bus='3' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest5'/> <target dev='hde' bus='ide'/> <address type='drive' controller='0' bus='4' target='0' unit='0'/> </disk> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest6'/> <target dev='hdf' bus='ide'/> <address type='drive' controller='0' bus='5' target='0' unit='0'/> diff --git a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml index d620c3b116..415fa0aed3 100644 --- a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml +++ b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml @@ -31,6 +31,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk' snapshot='no'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml index a943d174f8..ff3f08950b 100644 --- a/tests/domainsnapshotxml2xmlout/full_domain.xml +++ b/tests/domainsnapshotxml2xmlout/full_domain.xml @@ -24,6 +24,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml index d09444a76d..1e50494cb5 100644 --- a/tests/domainsnapshotxml2xmlout/metadata.xml +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -28,6 +28,7 @@ <devices> <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index 9ddd1eca7f..5ea0f325de 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -156,9 +156,6 @@ mymain(void) if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; - /* TODO: test with format probing disabled too */ - driver.config->allowDiskFormatProbing = true; - if (VIR_ALLOC(testSnapshotXMLVariableLineRegex) < 0) goto cleanup; -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:30 +0100, Peter Krempa wrote:
We have a test of the domain XML that allows format detection, so there's no need to do it for snapshot XMLs where the parameter would influence the domain XML portion. --- tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml | 6 ++++++ tests/domainsnapshotxml2xmlout/external_vm_redefine.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmltest.c | 3 --- 5 files changed, 9 insertions(+), 3 deletions(-)
ACK Jirka
Add new approach to properly test status XML files by supplying a full XML file rather than generating synthetic test cases by prepending the status header. The two tests introduced here are copies of existing cases using the synthetic header so that current level of testing is kept. The files are chosen to excercising the vcpu and blockjob quirks present in the current testing. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/Makefile.am | 1 + tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 96 ++++++ .../qemustatusxml2xmldata/blockjob-mirror-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 +++++++++++++++++++++ tests/qemustatusxml2xmldata/vcpus-multi-out.xml | 1 + tests/qemuxml2xmltest.c | 108 ++++++- 6 files changed, 543 insertions(+), 7 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml create mode 120000 tests/qemustatusxml2xmldata/vcpus-multi-out.xml diff --git a/tests/Makefile.am b/tests/Makefile.am index d794df3e5c..1f60ee0393 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -128,6 +128,7 @@ EXTRA_DIST = \ qemumonitorjsondata \ qemuxml2argvdata \ qemuxml2xmloutdata \ + qemustatusxml2xmloutdata \ qemumemlockdata \ secretxml2xmlin \ securityselinuxhelperdata \ diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml new file mode 100644 index 0000000000..a22d2173e7 --- /dev/null +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -0,0 +1,96 @@ +<domstatus state='running' reason='booted' pid='3803518'> + <taint flag='high-privileges'/> + <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/> + <vcpus> + <vcpu id='0' pid='3803519'/> + </vcpus> + <qemuCaps> + <flag name='vnet-hdr'/> + <flag name='qxl.vgamem_mb'/> + <flag name='qxl-vga.vgamem_mb'/> + <flag name='pc-dimm'/> + </qemuCaps> + <devices> + <device alias='balloon0'/> + <device alias='video0'/> + <device alias='serial0'/> + <device alias='net0'/> + <device alias='usb'/> + </devices> + <numad nodeset='0-2' cpuset='1,3'/> + <libDir path='/tmp'/> + <channelTargetDir path='/tmp/channel'/> + <allowReboot value='yes'/> + <blockjobs active='yes'/> + <domain type='qemu' id='1'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <backingStore/> + <mirror type='block' job='copy' ready='yes'> + <format type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1Copy'/> + </mirror> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <backingStore/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/data.img'/> + <backingStore/> + <mirror type='file' file='/tmp/copy.img' format='qcow2' job='copy'> + <format type='qcow2'/> + <source file='/tmp/copy.img'/> + </mirror> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/logs.img'/> + <backingStore/> + <mirror type='file' file='/tmp/logcopy.img' format='qcow2' job='copy' ready='abort'> + <format type='qcow2'/> + <source file='/tmp/logcopy.img'/> + </mirror> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </memballoon> + </devices> + </domain> +</domstatus> diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml new file mode 120000 index 0000000000..056c443c18 --- /dev/null +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-out.xml @@ -0,0 +1 @@ +blockjob-mirror-in.xml \ No newline at end of file diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml new file mode 100644 index 0000000000..c99046ce8d --- /dev/null +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -0,0 +1,343 @@ +<domstatus state='running' reason='booted' pid='3803518'> + <taint flag='high-privileges'/> + <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/> + <vcpus> + <vcpu id='0' pid='3803519'/> + <vcpu id='1' pid='3803520'/> + <vcpu id='2' pid='3803521'/> + <vcpu id='3' pid='3803522'/> + <vcpu id='4' pid='3803523'/> + <vcpu id='5' pid='3803524'/> + <vcpu id='6' pid='3803525'/> + <vcpu id='7' pid='3803526'/> + <vcpu id='8' pid='3803527'/> + <vcpu id='9' pid='3803528'/> + <vcpu id='10' pid='3803529'/> + <vcpu id='11' pid='3803530'/> + <vcpu id='12' pid='3803531'/> + <vcpu id='13' pid='3803532'/> + <vcpu id='14' pid='3803533'/> + <vcpu id='15' pid='3803534'/> + <vcpu id='16' pid='3803535'/> + <vcpu id='17' pid='3803536'/> + <vcpu id='18' pid='3803537'/> + <vcpu id='19' pid='3803538'/> + <vcpu id='20' pid='3803539'/> + <vcpu id='21' pid='3803540'/> + <vcpu id='22' pid='3803541'/> + <vcpu id='23' pid='3803542'/> + <vcpu id='24' pid='3803543'/> + <vcpu id='25' pid='3803544'/> + <vcpu id='26' pid='3803545'/> + <vcpu id='27' pid='3803546'/> + <vcpu id='28' pid='3803547'/> + <vcpu id='29' pid='3803548'/> + <vcpu id='30' pid='3803549'/> + <vcpu id='31' pid='3803550'/> + <vcpu id='32' pid='3803551'/> + <vcpu id='33' pid='3803552'/> + <vcpu id='34' pid='3803553'/> + <vcpu id='35' pid='3803554'/> + <vcpu id='36' pid='3803555'/> + <vcpu id='37' pid='3803556'/> + <vcpu id='38' pid='3803557'/> + <vcpu id='39' pid='3803558'/> + <vcpu id='40' pid='3803559'/> + <vcpu id='41' pid='3803560'/> + <vcpu id='42' pid='3803561'/> + <vcpu id='43' pid='3803562'/> + <vcpu id='44' pid='3803563'/> + <vcpu id='45' pid='3803564'/> + <vcpu id='46' pid='3803565'/> + <vcpu id='47' pid='3803566'/> + <vcpu id='48' pid='3803567'/> + <vcpu id='49' pid='3803568'/> + <vcpu id='50' pid='3803569'/> + <vcpu id='51' pid='3803570'/> + <vcpu id='52' pid='3803571'/> + <vcpu id='53' pid='3803572'/> + <vcpu id='54' pid='3803573'/> + <vcpu id='55' pid='3803574'/> + <vcpu id='56' pid='3803575'/> + <vcpu id='57' pid='3803576'/> + <vcpu id='58' pid='3803577'/> + <vcpu id='59' pid='3803578'/> + <vcpu id='60' pid='3803579'/> + <vcpu id='61' pid='3803580'/> + <vcpu id='62' pid='3803581'/> + <vcpu id='63' pid='3803582'/> + <vcpu id='64' pid='3803583'/> + <vcpu id='65' pid='3803584'/> + <vcpu id='66' pid='3803585'/> + <vcpu id='67' pid='3803586'/> + <vcpu id='68' pid='3803587'/> + <vcpu id='69' pid='3803588'/> + <vcpu id='70' pid='3803589'/> + <vcpu id='71' pid='3803590'/> + <vcpu id='72' pid='3803591'/> + <vcpu id='73' pid='3803592'/> + <vcpu id='74' pid='3803593'/> + <vcpu id='75' pid='3803594'/> + <vcpu id='76' pid='3803595'/> + <vcpu id='77' pid='3803596'/> + <vcpu id='78' pid='3803597'/> + <vcpu id='79' pid='3803598'/> + <vcpu id='80' pid='3803599'/> + <vcpu id='81' pid='3803600'/> + <vcpu id='82' pid='3803601'/> + <vcpu id='83' pid='3803602'/> + <vcpu id='84' pid='3803603'/> + <vcpu id='85' pid='3803604'/> + <vcpu id='86' pid='3803605'/> + <vcpu id='87' pid='3803606'/> + <vcpu id='88' pid='3803607'/> + <vcpu id='89' pid='3803608'/> + <vcpu id='90' pid='3803609'/> + <vcpu id='91' pid='3803610'/> + <vcpu id='92' pid='3803611'/> + <vcpu id='93' pid='3803612'/> + <vcpu id='94' pid='3803613'/> + <vcpu id='95' pid='3803614'/> + <vcpu id='96' pid='3803615'/> + <vcpu id='97' pid='3803616'/> + <vcpu id='98' pid='3803617'/> + <vcpu id='99' pid='3803618'/> + <vcpu id='100' pid='3803619'/> + <vcpu id='101' pid='3803620'/> + <vcpu id='102' pid='3803621'/> + <vcpu id='103' pid='3803622'/> + <vcpu id='104' pid='3803623'/> + <vcpu id='105' pid='3803624'/> + <vcpu id='106' pid='3803625'/> + <vcpu id='107' pid='3803626'/> + <vcpu id='108' pid='3803627'/> + <vcpu id='109' pid='3803628'/> + <vcpu id='110' pid='3803629'/> + <vcpu id='111' pid='3803630'/> + <vcpu id='112' pid='3803631'/> + <vcpu id='113' pid='3803632'/> + <vcpu id='114' pid='3803633'/> + <vcpu id='115' pid='3803634'/> + <vcpu id='116' pid='3803635'/> + <vcpu id='117' pid='3803636'/> + <vcpu id='118' pid='3803637'/> + <vcpu id='119' pid='3803638'/> + <vcpu id='120' pid='3803639'/> + <vcpu id='121' pid='3803640'/> + <vcpu id='122' pid='3803641'/> + <vcpu id='123' pid='3803642'/> + <vcpu id='124' pid='3803643'/> + <vcpu id='125' pid='3803644'/> + <vcpu id='126' pid='3803645'/> + <vcpu id='127' pid='3803646'/> + <vcpu id='128' pid='3803647'/> + <vcpu id='129' pid='3803648'/> + <vcpu id='130' pid='3803649'/> + <vcpu id='131' pid='3803650'/> + <vcpu id='132' pid='3803651'/> + <vcpu id='133' pid='3803652'/> + <vcpu id='134' pid='3803653'/> + <vcpu id='135' pid='3803654'/> + <vcpu id='136' pid='3803655'/> + <vcpu id='137' pid='3803656'/> + <vcpu id='138' pid='3803657'/> + <vcpu id='139' pid='3803658'/> + <vcpu id='140' pid='3803659'/> + <vcpu id='141' pid='3803660'/> + <vcpu id='142' pid='3803661'/> + <vcpu id='143' pid='3803662'/> + <vcpu id='144' pid='3803663'/> + <vcpu id='145' pid='3803664'/> + <vcpu id='146' pid='3803665'/> + <vcpu id='147' pid='3803666'/> + <vcpu id='148' pid='3803667'/> + <vcpu id='149' pid='3803668'/> + <vcpu id='150' pid='3803669'/> + <vcpu id='151' pid='3803670'/> + <vcpu id='152' pid='3803671'/> + <vcpu id='153' pid='3803672'/> + <vcpu id='154' pid='3803673'/> + <vcpu id='155' pid='3803674'/> + <vcpu id='156' pid='3803675'/> + <vcpu id='157' pid='3803676'/> + <vcpu id='158' pid='3803677'/> + <vcpu id='159' pid='3803678'/> + <vcpu id='160' pid='3803679'/> + <vcpu id='161' pid='3803680'/> + <vcpu id='162' pid='3803681'/> + <vcpu id='163' pid='3803682'/> + <vcpu id='164' pid='3803683'/> + <vcpu id='165' pid='3803684'/> + <vcpu id='166' pid='3803685'/> + <vcpu id='167' pid='3803686'/> + <vcpu id='168' pid='3803687'/> + <vcpu id='169' pid='3803688'/> + <vcpu id='170' pid='3803689'/> + <vcpu id='171' pid='3803690'/> + <vcpu id='172' pid='3803691'/> + <vcpu id='173' pid='3803692'/> + <vcpu id='174' pid='3803693'/> + <vcpu id='175' pid='3803694'/> + <vcpu id='176' pid='3803695'/> + <vcpu id='177' pid='3803696'/> + <vcpu id='178' pid='3803697'/> + <vcpu id='179' pid='3803698'/> + <vcpu id='180' pid='3803699'/> + <vcpu id='181' pid='3803700'/> + <vcpu id='182' pid='3803701'/> + <vcpu id='183' pid='3803702'/> + <vcpu id='184' pid='3803703'/> + <vcpu id='185' pid='3803704'/> + <vcpu id='186' pid='3803705'/> + <vcpu id='187' pid='3803706'/> + <vcpu id='188' pid='3803707'/> + <vcpu id='189' pid='3803708'/> + <vcpu id='190' pid='3803709'/> + <vcpu id='191' pid='3803710'/> + <vcpu id='192' pid='3803711'/> + <vcpu id='193' pid='3803712'/> + <vcpu id='194' pid='3803713'/> + <vcpu id='195' pid='3803714'/> + <vcpu id='196' pid='3803715'/> + <vcpu id='197' pid='3803716'/> + <vcpu id='198' pid='3803717'/> + <vcpu id='199' pid='3803718'/> + <vcpu id='200' pid='3803719'/> + <vcpu id='201' pid='3803720'/> + <vcpu id='202' pid='3803721'/> + <vcpu id='203' pid='3803722'/> + <vcpu id='204' pid='3803723'/> + <vcpu id='205' pid='3803724'/> + <vcpu id='206' pid='3803725'/> + <vcpu id='207' pid='3803726'/> + <vcpu id='208' pid='3803727'/> + <vcpu id='209' pid='3803728'/> + <vcpu id='210' pid='3803729'/> + <vcpu id='211' pid='3803730'/> + <vcpu id='212' pid='3803731'/> + <vcpu id='213' pid='3803732'/> + <vcpu id='214' pid='3803733'/> + <vcpu id='215' pid='3803734'/> + <vcpu id='216' pid='3803735'/> + <vcpu id='217' pid='3803736'/> + <vcpu id='218' pid='3803737'/> + <vcpu id='219' pid='3803738'/> + <vcpu id='220' pid='3803739'/> + <vcpu id='221' pid='3803740'/> + <vcpu id='222' pid='3803741'/> + <vcpu id='223' pid='3803742'/> + <vcpu id='224' pid='3803743'/> + <vcpu id='225' pid='3803744'/> + <vcpu id='226' pid='3803745'/> + <vcpu id='227' pid='3803746'/> + <vcpu id='228' pid='3803747'/> + <vcpu id='229' pid='3803748'/> + <vcpu id='230' pid='3803749'/> + <vcpu id='231' pid='3803750'/> + <vcpu id='232' pid='3803751'/> + <vcpu id='233' pid='3803752'/> + <vcpu id='234' pid='3803753'/> + <vcpu id='235' pid='3803754'/> + <vcpu id='236' pid='3803755'/> + <vcpu id='237' pid='3803756'/> + <vcpu id='238' pid='3803757'/> + <vcpu id='239' pid='3803758'/> + <vcpu id='240' pid='3803759'/> + <vcpu id='241' pid='3803760'/> + <vcpu id='242' pid='3803761'/> + <vcpu id='243' pid='3803762'/> + <vcpu id='244' pid='3803763'/> + <vcpu id='245' pid='3803764'/> + <vcpu id='246' pid='3803765'/> + <vcpu id='247' pid='3803766'/> + <vcpu id='248' pid='3803767'/> + <vcpu id='249' pid='3803768'/> + <vcpu id='250' pid='3803769'/> + <vcpu id='251' pid='3803770'/> + <vcpu id='252' pid='3803771'/> + <vcpu id='253' pid='3803772'/> + <vcpu id='254' pid='3803773'/> + <vcpu id='255' pid='3803774'/> + <vcpu id='256' pid='3803775'/> + <vcpu id='257' pid='3803776'/> + <vcpu id='258' pid='3803777'/> + <vcpu id='259' pid='3803778'/> + <vcpu id='260' pid='3803779'/> + <vcpu id='261' pid='3803780'/> + <vcpu id='262' pid='3803781'/> + <vcpu id='263' pid='3803782'/> + <vcpu id='264' pid='3803783'/> + <vcpu id='265' pid='3803784'/> + <vcpu id='266' pid='3803785'/> + <vcpu id='267' pid='3803786'/> + <vcpu id='268' pid='3803787'/> + <vcpu id='269' pid='3803788'/> + <vcpu id='270' pid='3803789'/> + <vcpu id='271' pid='3803790'/> + <vcpu id='272' pid='3803791'/> + <vcpu id='273' pid='3803792'/> + <vcpu id='274' pid='3803793'/> + <vcpu id='275' pid='3803794'/> + <vcpu id='276' pid='3803795'/> + <vcpu id='277' pid='3803796'/> + <vcpu id='278' pid='3803797'/> + <vcpu id='279' pid='3803798'/> + <vcpu id='280' pid='3803799'/> + <vcpu id='281' pid='3803800'/> + <vcpu id='282' pid='3803801'/> + <vcpu id='283' pid='3803802'/> + <vcpu id='284' pid='3803803'/> + <vcpu id='285' pid='3803804'/> + <vcpu id='286' pid='3803805'/> + <vcpu id='287' pid='3803806'/> + </vcpus> + <qemuCaps> + <flag name='vnet-hdr'/> + <flag name='qxl.vgamem_mb'/> + <flag name='qxl-vga.vgamem_mb'/> + <flag name='pc-dimm'/> + </qemuCaps> + <devices> + <device alias='balloon0'/> + <device alias='video0'/> + <device alias='serial0'/> + <device alias='net0'/> + <device alias='usb'/> + </devices> + <numad nodeset='0-2' cpuset='1,3'/> + <libDir path='/tmp'/> + <channelTargetDir path='/tmp/channel'/> + <allowReboot value='yes'/> + <blockjobs active='no'/> + <domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>288</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <ioapic driver='qemu'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + <iommu model='intel'> + <driver intremap='on' eim='on'/> + </iommu> + </devices> + </domain> +</domstatus> diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-out.xml b/tests/qemustatusxml2xmldata/vcpus-multi-out.xml new file mode 120000 index 0000000000..688f8566f2 --- /dev/null +++ b/tests/qemustatusxml2xmldata/vcpus-multi-out.xml @@ -0,0 +1 @@ +vcpus-multi-in.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b1fc6a2d28..2c1fa58bce 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -184,7 +184,7 @@ testProcessStatusXML(virDomainObjPtr vm) static int -testCompareStatusXMLToXMLFiles(const void *opaque) +testCompareStatusXMLToXMLOldFiles(const void *opaque) { const struct testInfo *data = opaque; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -277,6 +277,44 @@ testCompareStatusXMLToXMLFiles(const void *opaque) } +static int +testCompareStatusXMLToXMLFiles(const void *opaque) +{ + const struct testInfo *data = opaque; + virDomainObjPtr obj = NULL; + char *actual = NULL; + int ret = -1; + + if (!(obj = virDomainObjParseFile(data->inName, driver.caps, driver.xmlopt, + VIR_DOMAIN_DEF_PARSE_STATUS | + VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | + VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE | + VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARSE_FAIL))) + goto cleanup; + + if (!(actual = virDomainObjFormat(driver.xmlopt, obj, NULL, + VIR_DOMAIN_DEF_FORMAT_SECURE | + VIR_DOMAIN_DEF_FORMAT_STATUS | + VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET | + VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES | + VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST))) + + goto cleanup; + + if (virTestCompareToFile(actual, data->outActiveName) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virObjectUnref(obj); + VIR_FREE(actual); + return ret; +} + + static void testInfoClear(struct testInfo *info) { @@ -292,10 +330,8 @@ testInfoClear(struct testInfo *info) static int -testInfoSet(struct testInfo *info, - const char *name, - int when, - int gic) +testInfoSetCommon(struct testInfo *info, + int gic) { if (!(info->qemuCaps = virQEMUCapsNew())) goto error; @@ -306,6 +342,23 @@ testInfoSet(struct testInfo *info, if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) goto error; + return 0; + + error: + testInfoClear(info); + return -1; +} + + +static int +testInfoSet(struct testInfo *info, + const char *name, + int when, + int gic) +{ + if (testInfoSetCommon(info, gic) < 0) + return -1; + if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, name) < 0) goto error; @@ -349,6 +402,29 @@ testInfoSet(struct testInfo *info, return -1; } + +static const char *statusPath = abs_srcdir "/qemustatusxml2xmldata/"; + +static int +testInfoSetStatus(struct testInfo *info, + const char *name, + int gic) +{ + if (testInfoSetCommon(info, gic) < 0) + return -1; + + if (virAsprintf(&info->inName, "%s%s-in.xml", statusPath, name) < 0 || + virAsprintf(&info->outActiveName, "%s%s-out.xml", statusPath, name) < 0) + goto error; + + return 0; + + error: + testInfoClear(info); + return -1; +} + + # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" static int @@ -397,8 +473,8 @@ mymain(void) testXML2XMLActive, &info) < 0) \ ret = -1; \ \ - if (virTestRun("QEMU XML-2-XML-status " name, \ - testCompareStatusXMLToXMLFiles, &info) < 0) \ + if (virTestRun("QEMU XML-2-XML-status (old)" name, \ + testCompareStatusXMLToXMLOldFiles, &info) < 0) \ ret = -1; \ } \ testInfoClear(&info); \ @@ -1347,6 +1423,24 @@ mymain(void) DO_TEST("disk-many-format-probing", NONE); driver.config->allowDiskFormatProbing = false; +# define DO_TEST_STATUS(name) \ + do { \ + if (testInfoSetStatus(&info, name, GIC_NONE) < 0) { \ + VIR_TEST_DEBUG("Failed to generate status test data for '%s'", name); \ + return -1; \ + } \ + \ + if (virTestRun("QEMU status XML-2-XML " name, \ + testCompareStatusXMLToXMLFiles, &info) < 0) \ + ret = -1; \ +\ + testInfoClear(&info); \ + } while (0) + + + DO_TEST_STATUS("blockjob-mirror"); + DO_TEST_STATUS("vcpus-multi"); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:31 +0100, Peter Krempa wrote:
Add new approach to properly test status XML files by supplying a full XML file rather than generating synthetic test cases by prepending the status header. The two tests introduced here are copies of existing cases using the synthetic header so that current level of testing is kept. The files are chosen to excercising the vcpu and blockjob quirks present in the current testing.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/Makefile.am | 1 + tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 96 ++++++ .../qemustatusxml2xmldata/blockjob-mirror-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 +++++++++++++++++++++ tests/qemustatusxml2xmldata/vcpus-multi-out.xml | 1 + tests/qemuxml2xmltest.c | 108 ++++++- 6 files changed, 543 insertions(+), 7 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml create mode 120000 tests/qemustatusxml2xmldata/vcpus-multi-out.xml
:set nitpicking=on ...
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b1fc6a2d28..2c1fa58bce 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c ... @@ -397,8 +473,8 @@ mymain(void) testXML2XMLActive, &info) < 0) \ ret = -1; \ \ - if (virTestRun("QEMU XML-2-XML-status " name, \ - testCompareStatusXMLToXMLFiles, &info) < 0) \ + if (virTestRun("QEMU XML-2-XML-status (old)" name, \ + testCompareStatusXMLToXMLOldFiles, &info) < 0) \
You could have fixed the indentation too: s/ t/t/
ret = -1; \ } \ testInfoClear(&info); \ @@ -1347,6 +1423,24 @@ mymain(void) DO_TEST("disk-many-format-probing", NONE); driver.config->allowDiskFormatProbing = false;
+# define DO_TEST_STATUS(name) \ + do { \ + if (testInfoSetStatus(&info, name, GIC_NONE) < 0) { \ + VIR_TEST_DEBUG("Failed to generate status test data for '%s'", name); \ + return -1; \ + } \ + \ + if (virTestRun("QEMU status XML-2-XML " name, \ + testCompareStatusXMLToXMLFiles, &info) < 0) \
Dtto.
+ ret = -1; \
Looks like a copy-pasta remnant :-) s/ // ACK Jirka
Add a random lockstate string to the status XML2XML test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml index a22d2173e7..32bde1ba66 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -10,6 +10,7 @@ <flag name='qxl-vga.vgamem_mb'/> <flag name='pc-dimm'/> </qemuCaps> + <lockstate>testtest</lockstate> <devices> <device alias='balloon0'/> <device alias='video0'/> -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:32 +0100, Peter Krempa wrote:
Add a random lockstate string to the status XML2XML test.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 1 + 1 file changed, 1 insertion(+)
ACK Jirka
Now that the better approach is in place we can remove the old functions doing the fake formatting. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2xmltest.c | 218 +----------------------------------------------- 1 file changed, 1 insertion(+), 217 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2c1fa58bce..e855d4feca 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -39,29 +39,6 @@ struct testInfo { virQEMUCapsPtr qemuCaps; }; -static int -qemuXML2XMLActivePreFormatCallback(virDomainDefPtr def, - const void *opaque) -{ - struct testInfo *info = (struct testInfo *) opaque; - size_t i; - - /* store vCPU bitmap so that the status XML can be created faithfully */ - if (!info->activeVcpus) - info->activeVcpus = virDomainDefGetOnlineVcpumap(def); - - info->blockjobs = false; - - /* remember whether we have mirror jobs */ - for (i = 0; i < def->ndisks; i++) { - if (def->disks[i]->mirror) { - info->blockjobs = true; - break; - } - } - - return 0; -} static int testXML2XMLActive(const void *opaque) @@ -70,7 +47,7 @@ testXML2XMLActive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outActiveName, true, - qemuXML2XMLActivePreFormatCallback, + NULL, opaque, 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); } @@ -88,195 +65,6 @@ testXML2XMLInactive(const void *opaque) } -static const char testStatusXMLPrefixHeader[] = -"<domstatus state='running' reason='booted' pid='3803518'>\n" -" <taint flag='high-privileges'/>\n" -" <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/>\n"; - -static const char testStatusXMLPrefixBodyStatic[] = -"<qemuCaps>\n" -" <flag name='vnet-hdr'/>\n" -" <flag name='qxl.vgamem_mb'/>\n" -" <flag name='qxl-vga.vgamem_mb'/>\n" -" <flag name='pc-dimm'/>\n" -"</qemuCaps>\n" -"<devices>\n" -" <device alias='balloon0'/>\n" -" <device alias='video0'/>\n" -" <device alias='serial0'/>\n" -" <device alias='net0'/>\n" -" <device alias='usb'/>\n" -"</devices>\n" -"<numad nodeset='0-2' cpuset='1,3'/>\n" -"<libDir path='/tmp'/>\n" -"<channelTargetDir path='/tmp/channel'/>\n" -"<allowReboot value='yes'/>\n"; - -static const char testStatusXMLSuffix[] = -"</domstatus>\n"; - - -static void -testGetStatuXMLPrefixVcpus(virBufferPtr buf, - const struct testInfo *data) -{ - ssize_t vcpuid = -1; - - virBufferAddLit(buf, "<vcpus>\n"); - virBufferAdjustIndent(buf, 2); - - /* Make sure we can format the fake vcpu list. The test will fail regardles. */ - if (data->activeVcpus) { - while ((vcpuid = virBitmapNextSetBit(data->activeVcpus, vcpuid)) >= 0) - virBufferAsprintf(buf, "<vcpu id='%zd' pid='%zd'/>\n", - vcpuid, vcpuid + 3803519); - } - - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</vcpus>\n"); -} - - -static void -testGetStatusXMLAddBlockjobs(virBufferPtr buf, - const struct testInfo *data) -{ - virBufferAsprintf(buf, "<blockjobs active='%s'/>\n", - virTristateBoolTypeToString(virTristateBoolFromBool(data->blockjobs))); -} - - -static char * -testGetStatusXMLPrefix(const struct testInfo *data) -{ - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAdd(&buf, testStatusXMLPrefixHeader, -1); - virBufferAdjustIndent(&buf, 2); - - testGetStatuXMLPrefixVcpus(&buf, data); - - virBufferAddStr(&buf, testStatusXMLPrefixBodyStatic); - - testGetStatusXMLAddBlockjobs(&buf, data); - - virBufferAdjustIndent(&buf, -2); - - return virBufferContentAndReset(&buf); -} - - -static int -testProcessStatusXML(virDomainObjPtr vm) -{ - size_t i; - - /* fix the private 'blockjob' flag for disks */ - for (i = 0; i < vm->def->ndisks; i++) { - virDomainDiskDefPtr disk = vm->def->disks[i]; - qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - - diskPriv->blockjob = !!disk->mirror; - } - - return 0; -} - - -static int -testCompareStatusXMLToXMLOldFiles(const void *opaque) -{ - const struct testInfo *data = opaque; - virBuffer buf = VIR_BUFFER_INITIALIZER; - xmlDocPtr xml = NULL; - virDomainObjPtr obj = NULL; - char *expect = NULL; - char *actual = NULL; - char *source = NULL; - char *header = NULL; - char *inFile = NULL, *outActiveFile = NULL; - int ret = -1; - int keepBlanksDefault = xmlKeepBlanksDefault(0); - - if (virTestLoadFile(data->inName, &inFile) < 0) - goto cleanup; - if (virTestLoadFile(data->outActiveName, &outActiveFile) < 0) - goto cleanup; - - if (!(header = testGetStatusXMLPrefix(data))) - goto cleanup; - - /* construct faked source status XML */ - virBufferAdd(&buf, header, -1); - virBufferAdjustIndent(&buf, 2); - virBufferAddStr(&buf, inFile); - virBufferAdjustIndent(&buf, -2); - virBufferAdd(&buf, testStatusXMLSuffix, -1); - - if (!(source = virBufferContentAndReset(&buf))) { - VIR_TEST_DEBUG("Failed to create the source XML"); - goto cleanup; - } - - /* construct the expect string */ - virBufferAdd(&buf, header, -1); - virBufferAdjustIndent(&buf, 2); - virBufferAddStr(&buf, outActiveFile); - virBufferAdjustIndent(&buf, -2); - virBufferAdd(&buf, testStatusXMLSuffix, -1); - - if (!(expect = virBufferContentAndReset(&buf))) { - VIR_TEST_DEBUG("Failed to create the expect XML"); - goto cleanup; - } - - /* parse the fake source status XML */ - if (!(xml = virXMLParseString(source, "(domain_status_test_XML)")) || - !(obj = virDomainObjParseNode(xml, xmlDocGetRootElement(xml), - driver.caps, driver.xmlopt, - VIR_DOMAIN_DEF_PARSE_STATUS | - VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | - VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES))) { - VIR_TEST_DEBUG("Failed to parse domain status XML:\n%s", source); - goto cleanup; - } - - /* process the definition if necessary */ - if (testProcessStatusXML(obj) < 0) - goto cleanup; - - /* format it back */ - if (!(actual = virDomainObjFormat(driver.xmlopt, obj, NULL, - VIR_DOMAIN_DEF_FORMAT_SECURE))) { - VIR_TEST_DEBUG("Failed to format domain status XML"); - goto cleanup; - } - - if (STRNEQ(actual, expect)) { - /* For status test we don't want to regenerate output to not - * add the status data.*/ - virTestDifferenceFullNoRegenerate(stderr, - expect, data->outActiveName, - actual, data->inName); - goto cleanup; - } - - ret = 0; - - cleanup: - xmlKeepBlanksDefault(keepBlanksDefault); - xmlFreeDoc(xml); - virObjectUnref(obj); - VIR_FREE(expect); - VIR_FREE(actual); - VIR_FREE(source); - VIR_FREE(inFile); - VIR_FREE(header); - VIR_FREE(outActiveFile); - return ret; -} - - static int testCompareStatusXMLToXMLFiles(const void *opaque) { @@ -472,10 +260,6 @@ mymain(void) if (virTestRun("QEMU XML-2-XML-active " name, \ testXML2XMLActive, &info) < 0) \ ret = -1; \ - \ - if (virTestRun("QEMU XML-2-XML-status (old)" name, \ - testCompareStatusXMLToXMLOldFiles, &info) < 0) \ - ret = -1; \ } \ testInfoClear(&info); \ } while (0) -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:33 +0100, Peter Krempa wrote:
Now that the better approach is in place we can remove the old functions doing the fake formatting.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2xmltest.c | 218 +----------------------------------------------- 1 file changed, 1 insertion(+), 217 deletions(-)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2c1fa58bce..e855d4feca 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c ... @@ -472,10 +260,6 @@ mymain(void) if (virTestRun("QEMU XML-2-XML-active " name, \ testXML2XMLActive, &info) < 0) \ ret = -1; \ - \ - if (virTestRun("QEMU XML-2-XML-status (old)" name, \ - testCompareStatusXMLToXMLOldFiles, &info) < 0) \
OK, don't bother fixing the indentation here in the previous patch.
- ret = -1; \ } \ testInfoClear(&info); \ } while (0)
ACK Jirka
The testCompareDomXML2XMLPreFormatCallback is no longer used and thus can be removed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemuxml2xmltest.c | 5 ++--- tests/testutils.c | 8 +------- tests/testutils.h | 5 ----- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index c33fce1922..d8270a6cae 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -40,7 +40,7 @@ testCompareXMLToXMLHelper(const void *data) ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, - !info->inactive_only, NULL, NULL, 0, + !info->inactive_only, 0, info->expectResult); cleanup: VIR_FREE(xml_in); diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 57751a5773..3b96862c62 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -46,7 +46,7 @@ testCompareXMLToXMLHelper(const void *data) ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, - NULL, NULL, info->parse_flags, + info->parse_flags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); cleanup: VIR_FREE(xml_in); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e855d4feca..c3035d5f08 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -47,8 +47,7 @@ testXML2XMLActive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outActiveName, true, - NULL, - opaque, 0, + 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); } @@ -60,7 +59,7 @@ testXML2XMLInactive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outInactiveName, false, - NULL, opaque, 0, + 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); } diff --git a/tests/testutils.c b/tests/testutils.c index 17959aaf4f..040ef1d2f7 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1241,8 +1241,7 @@ virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void) int testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *infile, const char *outfile, bool live, - testCompareDomXML2XMLPreFormatCallback cb, - const void *opaque, unsigned int parseFlags, + unsigned int parseFlags, testCompareDomXML2XMLResult expectResult) { char *actual = NULL; @@ -1273,11 +1272,6 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, goto out; } - if (cb && cb(def, opaque) < 0) { - result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_CB; - goto out; - } - if (!(actual = virDomainDefFormat(def, caps, format_flags))) { result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_FORMAT; goto out; diff --git a/tests/testutils.h b/tests/testutils.h index 668a79d95c..d840875bc1 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -153,20 +153,15 @@ typedef enum { TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_STABILITY, - TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_CB, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_FORMAT, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_COMPARE, } testCompareDomXML2XMLResult; -typedef int (*testCompareDomXML2XMLPreFormatCallback)(virDomainDefPtr def, - const void *opaque); int testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *inxml, const char *outfile, bool live, - testCompareDomXML2XMLPreFormatCallback cb, - const void *opaque, unsigned int parseFlags, testCompareDomXML2XMLResult expectResult); -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:34 +0100, Peter Krempa wrote:
The testCompareDomXML2XMLPreFormatCallback is no longer used and thus can be removed.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemuxml2xmltest.c | 5 ++--- tests/testutils.c | 8 +------- tests/testutils.h | 5 ----- 5 files changed, 5 insertions(+), 17 deletions(-)
ACK Jirka
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemustatusxml2xmldata/modern-in.xml | 448 +++++++++++++++++++++++++++++ tests/qemustatusxml2xmldata/modern-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 3 files changed, 450 insertions(+) create mode 100644 tests/qemustatusxml2xmldata/modern-in.xml create mode 120000 tests/qemustatusxml2xmldata/modern-out.xml diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml new file mode 100644 index 0000000000..2e166e6e67 --- /dev/null +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -0,0 +1,448 @@ +<domstatus state='running' reason='booted' pid='195139'> + <taint flag='high-privileges'/> + <monitor path='/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' json='1' type='unix'/> + <namespaces> + <mount/> + </namespaces> + <vcpus> + <vcpu id='0' pid='195156'/> + <vcpu id='1' pid='195157'/> + </vcpus> + <qemuCaps> + <flag name='kvm'/> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='monitor-json'/> + <flag name='sdl'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='smbios-type'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='ccid-emulated'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='drive-copy-on-read'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='tpm-passthrough'/> + <flag name='tpm-tis'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='active-commit'/> + <flag name='change-backing-file'/> + <flag name='memory-backend-ram'/> + <flag name='numa'/> + <flag name='memory-backend-file'/> + <flag name='usb-audio'/> + <flag name='rtc-reset-reinjection'/> + <flag name='splash-timeout'/> + <flag name='iothread'/> + <flag name='migrate-rdma'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='pc-dimm'/> + <flag name='machine-vmport-opt'/> + <flag name='aes-key-wrap'/> + <flag name='dea-key-wrap'/> + <flag name='pci-serial'/> + <flag name='vhost-user-multiqueue'/> + <flag name='migration-event'/> + <flag name='ioh3420'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + <flag name='gic-version'/> + <flag name='incoming-defer'/> + <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> + <flag name='virtio-keyboard'/> + <flag name='virtio-mouse'/> + <flag name='virtio-tablet'/> + <flag name='virtio-input-host'/> + <flag name='chardev-file-append'/> + <flag name='ich9-disable-s3'/> + <flag name='ich9-disable-s4'/> + <flag name='vserport-change-event'/> + <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='mptsas1068'/> + <flag name='qxl.vram64_size_mb'/> + <flag name='chardev-logfile'/> + <flag name='debug-threads'/> + <flag name='secret'/> + <flag name='pxb'/> + <flag name='pxb-pcie'/> + <flag name='device-tray-moved-event'/> + <flag name='nec-usb-xhci-ports'/> + <flag name='virtio-scsi-pci.iothread'/> + <flag name='name-guest'/> + <flag name='qxl.max_outputs'/> + <flag name='spice-unix'/> + <flag name='drive-detect-zeroes'/> + <flag name='tls-creds-x509'/> + <flag name='display'/> + <flag name='intel-iommu'/> + <flag name='smm'/> + <flag name='virtio-pci-disable-legacy'/> + <flag name='query-hotpluggable-cpus'/> + <flag name='virtio-net.rx_queue_size'/> + <flag name='virtio-vga'/> + <flag name='drive-iotune-max-length'/> + <flag name='ivshmem-plain'/> + <flag name='ivshmem-doorbell'/> + <flag name='query-qmp-schema'/> + <flag name='gluster.debug_level'/> + <flag name='vhost-scsi'/> + <flag name='drive-iotune-group'/> + <flag name='query-cpu-model-expansion'/> + <flag name='virtio-net.host_mtu'/> + <flag name='nvdimm'/> + <flag name='pcie-root-port'/> + <flag name='query-cpu-definitions'/> + <flag name='block-write-threshold'/> + <flag name='query-named-block-nodes'/> + <flag name='cpu-cache'/> + <flag name='qemu-xhci'/> + <flag name='kernel-irqchip'/> + <flag name='kernel-irqchip.split'/> + <flag name='intel-iommu.intremap'/> + <flag name='intel-iommu.caching-mode'/> + <flag name='intel-iommu.eim'/> + <flag name='intel-iommu.device-iotlb'/> + <flag name='virtio.iommu_platform'/> + <flag name='virtio.ats'/> + <flag name='loadparm'/> + <flag name='vnc-multi-servers'/> + <flag name='virtio-net.tx_queue_size'/> + <flag name='chardev-reconnect'/> + <flag name='virtio-gpu.max_outputs'/> + <flag name='vxhs'/> + <flag name='virtio-blk.num-queues'/> + <flag name='vmcoreinfo'/> + <flag name='numa.dist'/> + <flag name='disk-share-rw'/> + <flag name='iscsi.password-secret'/> + <flag name='isa-serial'/> + <flag name='dump-completed'/> + </qemuCaps> + <devices> + <device alias='rng0'/> + <device alias='sound0-codec0'/> + <device alias='virtio-disk1'/> + <device alias='virtio-serial0'/> + <device alias='video0'/> + <device alias='serial0'/> + <device alias='sound0'/> + <device alias='balloon0'/> + <device alias='channel1'/> + <device alias='channel0'/> + <device alias='net0'/> + <device alias='input0'/> + <device alias='redir0'/> + <device alias='redir1'/> + <device alias='scsi0'/> + <device alias='usb'/> + <device alias='ide0-0-0'/> + </devices> + <numad nodeset='0' cpuset='0-7'/> + <libDir path='/var/lib/libvirt/qemu/domain-1-upstream'/> + <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-1-upstream'/> + <chardevStdioLogd/> + <allowReboot value='yes'/> + <blockjobs active='no'/> + <domain type='kvm' id='1'> + <name>upstream</name> + <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> + <memory unit='KiB'>1024000</memory> + <currentMemory unit='KiB'>1024000</currentMemory> + <memoryBacking> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='auto' current='2'>8</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <cpu> + <numa> + <cell id='0' cpus='0,2,4,6' memory='512000' unit='KiB'/> + <cell id='1' cpus='1,3,5,7' memory='512000' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='unmap' detect_zeroes='on'/> + <source file='/var/lib/libvirt/images/a.qcow2'/> + <backingStore type='file' index='1'> + <format type='qcow2'/> + <source file='/var/lib/libvirt/images/base.qcow2'> + <privateData> + <relPath>base.qcow2</relPath> + </privateData> + </source> + <backingStore/> + </backingStore> + <target dev='vdb' bus='virtio'/> + <alias name='virtio-disk1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/systemrescuecd-x86-4.9.5.iso'/> + <backingStore/> + <target dev='hda' bus='ide'/> + <readonly/> + <boot order='1'/> + <alias name='ide0-0-0'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <alias name='usb'/> + <master startport='0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <alias name='usb'/> + <master startport='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <alias name='usb'/> + <master startport='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci.0'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsilogic'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </controller> + <controller type='fdc' index='0'> + <alias name='fdc0'/> + </controller> + <interface type='network'> + <mac address='52:54:00:36:bd:3b'/> + <source network='default'/> + <actual type='network'> + <source bridge='virbr0'/> + </actual> + <target dev='vnet0'/> + <model type='virtio'/> + <alias name='net0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <serial type='pty'> + <source path='/dev/pts/67'/> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + <alias name='serial0'/> + </serial> + <console type='pty' tty='/dev/pts/67'> + <source path='/dev/pts/67'/> + <target type='serial' port='0'/> + <alias name='serial0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/domain-1-upstream/org.qemu.guest_agent.0'/> + <target type='virtio' name='org.qemu.guest_agent.0' state='disconnected'/> + <alias name='channel0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0' state='disconnected'/> + <alias name='channel1'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <input type='tablet' bus='usb'> + <alias name='input0'/> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'> + <alias name='input1'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input2'/> + </input> + <graphics type='spice' port='5900' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1' fromConfig='1' autoGenerated='no'/> + <image compression='off'/> + </graphics> + <sound model='ich6'> + <alias name='sound0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </sound> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <alias name='video0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir0'/> + <address type='usb' bus='0' port='2'/> + </redirdev> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir1'/> + <address type='usb' bus='0' port='3'/> + </redirdev> + <memballoon model='virtio'> + <alias name='balloon0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + <alias name='rng0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </rng> + </devices> + <seclabel type='dynamic' model='dac' relabel='yes'> + <label>+0:+0</label> + <imagelabel>+0:+0</imagelabel> + </seclabel> + </domain> +</domstatus> diff --git a/tests/qemustatusxml2xmldata/modern-out.xml b/tests/qemustatusxml2xmldata/modern-out.xml new file mode 120000 index 0000000000..2fc3943a17 --- /dev/null +++ b/tests/qemustatusxml2xmldata/modern-out.xml @@ -0,0 +1 @@ +modern-in.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c3035d5f08..ccaa6453b6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1223,6 +1223,7 @@ mymain(void) DO_TEST_STATUS("blockjob-mirror"); DO_TEST_STATUS("vcpus-multi"); + DO_TEST_STATUS("modern"); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:35 +0100, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemustatusxml2xmldata/modern-in.xml | 448 +++++++++++++++++++++++++++++ tests/qemustatusxml2xmldata/modern-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 3 files changed, 450 insertions(+) create mode 100644 tests/qemustatusxml2xmldata/modern-in.xml create mode 120000 tests/qemustatusxml2xmldata/modern-out.xml
ACK Jirka
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemustatusxml2xmldata/migration-out-nbd-in.xml | 449 +++++++++++++++++++++ .../migration-out-nbd-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 3 files changed, 451 insertions(+) create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml new file mode 100644 index 0000000000..6d87c1ec5c --- /dev/null +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml @@ -0,0 +1,449 @@ +<domstatus state='running' reason='booted' pid='15433'> + <taint flag='high-privileges'/> + <monitor path='/var/lib/libvirt/qemu/domain-4-upstream/monitor.sock' json='1' type='unix'/> + <vcpus> + <vcpu id='0' pid='15449'/> + <vcpu id='1' pid='15450'/> + </vcpus> + <qemuCaps> + <flag name='kvm'/> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='monitor-json'/> + <flag name='sdl'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='smbios-type'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='ccid-emulated'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='drive-copy-on-read'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='tpm-passthrough'/> + <flag name='tpm-tis'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='active-commit'/> + <flag name='change-backing-file'/> + <flag name='memory-backend-ram'/> + <flag name='numa'/> + <flag name='memory-backend-file'/> + <flag name='usb-audio'/> + <flag name='rtc-reset-reinjection'/> + <flag name='splash-timeout'/> + <flag name='iothread'/> + <flag name='migrate-rdma'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='pc-dimm'/> + <flag name='machine-vmport-opt'/> + <flag name='aes-key-wrap'/> + <flag name='dea-key-wrap'/> + <flag name='pci-serial'/> + <flag name='vhost-user-multiqueue'/> + <flag name='migration-event'/> + <flag name='ioh3420'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + <flag name='gic-version'/> + <flag name='incoming-defer'/> + <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> + <flag name='virtio-keyboard'/> + <flag name='virtio-mouse'/> + <flag name='virtio-tablet'/> + <flag name='virtio-input-host'/> + <flag name='chardev-file-append'/> + <flag name='ich9-disable-s3'/> + <flag name='ich9-disable-s4'/> + <flag name='vserport-change-event'/> + <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='mptsas1068'/> + <flag name='qxl.vram64_size_mb'/> + <flag name='chardev-logfile'/> + <flag name='debug-threads'/> + <flag name='secret'/> + <flag name='pxb'/> + <flag name='pxb-pcie'/> + <flag name='device-tray-moved-event'/> + <flag name='nec-usb-xhci-ports'/> + <flag name='virtio-scsi-pci.iothread'/> + <flag name='name-guest'/> + <flag name='qxl.max_outputs'/> + <flag name='spice-unix'/> + <flag name='drive-detect-zeroes'/> + <flag name='tls-creds-x509'/> + <flag name='display'/> + <flag name='intel-iommu'/> + <flag name='smm'/> + <flag name='virtio-pci-disable-legacy'/> + <flag name='query-hotpluggable-cpus'/> + <flag name='virtio-net.rx_queue_size'/> + <flag name='virtio-vga'/> + <flag name='drive-iotune-max-length'/> + <flag name='ivshmem-plain'/> + <flag name='ivshmem-doorbell'/> + <flag name='query-qmp-schema'/> + <flag name='gluster.debug_level'/> + <flag name='vhost-scsi'/> + <flag name='drive-iotune-group'/> + <flag name='query-cpu-model-expansion'/> + <flag name='virtio-net.host_mtu'/> + <flag name='nvdimm'/> + <flag name='pcie-root-port'/> + <flag name='query-cpu-definitions'/> + <flag name='block-write-threshold'/> + <flag name='query-named-block-nodes'/> + <flag name='cpu-cache'/> + <flag name='qemu-xhci'/> + <flag name='kernel-irqchip'/> + <flag name='kernel-irqchip.split'/> + <flag name='intel-iommu.intremap'/> + <flag name='intel-iommu.caching-mode'/> + <flag name='intel-iommu.eim'/> + <flag name='intel-iommu.device-iotlb'/> + <flag name='virtio.iommu_platform'/> + <flag name='virtio.ats'/> + <flag name='loadparm'/> + <flag name='vnc-multi-servers'/> + <flag name='virtio-net.tx_queue_size'/> + <flag name='chardev-reconnect'/> + <flag name='virtio-gpu.max_outputs'/> + <flag name='vxhs'/> + <flag name='virtio-blk.num-queues'/> + <flag name='vmcoreinfo'/> + <flag name='numa.dist'/> + <flag name='disk-share-rw'/> + <flag name='iscsi.password-secret'/> + <flag name='isa-serial'/> + <flag name='dump-completed'/> + </qemuCaps> + <job type='none' async='migration out' phase='perform3'> + <disk dev='vdb' migrating='yes'/> + <disk dev='hda' migrating='no'/> + </job> + <devices> + <device alias='rng0'/> + <device alias='sound0-codec0'/> + <device alias='virtio-disk1'/> + <device alias='virtio-serial0'/> + <device alias='video0'/> + <device alias='serial0'/> + <device alias='sound0'/> + <device alias='balloon0'/> + <device alias='channel1'/> + <device alias='channel0'/> + <device alias='net0'/> + <device alias='input0'/> + <device alias='redir0'/> + <device alias='redir1'/> + <device alias='scsi0'/> + <device alias='usb'/> + <device alias='ide0-0-0'/> + </devices> + <numad nodeset='0' cpuset='0-7'/> + <libDir path='/var/lib/libvirt/qemu/domain-4-upstream'/> + <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-4-upstream'/> + <chardevStdioLogd/> + <allowReboot value='yes'/> + <blockjobs active='no'/> + <domain type='kvm' id='4'> + <name>upstream</name> + <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> + <memory unit='KiB'>1024000</memory> + <currentMemory unit='KiB'>1024000</currentMemory> + <memoryBacking> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='auto' current='2'>8</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <cpu> + <numa> + <cell id='0' cpus='0,2,4,6' memory='512000' unit='KiB'/> + <cell id='1' cpus='1,3,5,7' memory='512000' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='unmap' detect_zeroes='on'/> + <source file='/var/lib/libvirt/images/a.qcow2'/> + <backingStore type='file' index='1'> + <format type='qcow2'/> + <source file='/var/lib/libvirt/images/base.qcow2'> + <privateData> + <relPath>base.qcow2</relPath> + </privateData> + </source> + <backingStore/> + </backingStore> + <target dev='vdb' bus='virtio'/> + <alias name='virtio-disk1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/systemrescuecd-x86-4.9.5.iso'/> + <backingStore/> + <target dev='hda' bus='ide'/> + <readonly/> + <boot order='1'/> + <alias name='ide0-0-0'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <alias name='usb'/> + <master startport='0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <alias name='usb'/> + <master startport='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <alias name='usb'/> + <master startport='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci.0'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsilogic'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </controller> + <controller type='fdc' index='0'> + <alias name='fdc0'/> + </controller> + <interface type='network'> + <mac address='52:54:00:36:bd:3b'/> + <source network='default'/> + <actual type='network'> + <source bridge='virbr0'/> + </actual> + <target dev='vnet0'/> + <model type='virtio'/> + <alias name='net0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <serial type='pty'> + <source path='/dev/pts/49'/> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + <alias name='serial0'/> + </serial> + <console type='pty' tty='/dev/pts/49'> + <source path='/dev/pts/49'/> + <target type='serial' port='0'/> + <alias name='serial0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/domain-4-upstream/org.qemu.guest_agent.0'/> + <target type='virtio' name='org.qemu.guest_agent.0' state='disconnected'/> + <alias name='channel0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0' state='disconnected'/> + <alias name='channel1'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <input type='tablet' bus='usb'> + <alias name='input0'/> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'> + <alias name='input1'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input2'/> + </input> + <graphics type='spice' port='5900' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1' fromConfig='1' autoGenerated='no'/> + <image compression='off'/> + </graphics> + <sound model='ich6'> + <alias name='sound0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </sound> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <alias name='video0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir0'/> + <address type='usb' bus='0' port='2'/> + </redirdev> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir1'/> + <address type='usb' bus='0' port='3'/> + </redirdev> + <memballoon model='virtio'> + <alias name='balloon0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + <alias name='rng0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </rng> + </devices> + <seclabel type='dynamic' model='dac' relabel='yes'> + <label>+0:+0</label> + <imagelabel>+0:+0</imagelabel> + </seclabel> + </domain> +</domstatus> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml new file mode 120000 index 0000000000..a4830f04a8 --- /dev/null +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -0,0 +1 @@ +migration-out-nbd-in.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ccaa6453b6..b9df2f8df4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1224,6 +1224,7 @@ mymain(void) DO_TEST_STATUS("blockjob-mirror"); DO_TEST_STATUS("vcpus-multi"); DO_TEST_STATUS("modern"); + DO_TEST_STATUS("migration-out-nbd"); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.2
On Wed, Mar 07, 2018 at 15:42:36 +0100, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemustatusxml2xmldata/migration-out-nbd-in.xml | 449 +++++++++++++++++++++ .../migration-out-nbd-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 3 files changed, 451 insertions(+) create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
ACK Jirka
participants (2)
-
Jiri Denemark -
Peter Krempa