qemu: assume -drive format is always available

As of QEMU 0.10.0 the -drive format= parameter was added,
so the QEMU driver can assume it is always available.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f2bbd52efcf554b2d55728f612cbe4b8d5dcdcaf..df2d4db23ce51494925e075bc2070bb52051cba8 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1102,8 +1102,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
         if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
     }
-    if (strstr(help, "format="))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT);
     if (strstr(help, "readonly="))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
     if (strstr(help, "aio=threads|native"))
@@ -3170,7 +3168,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
@@ -3880,9 +3877,8 @@ virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps,
     VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type,
                              VIR_DOMAIN_LOADER_TYPE_ROM);
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT))
-        VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type,
-                                 VIR_DOMAIN_LOADER_TYPE_PFLASH);
+    VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type,
+                             VIR_DOMAIN_LOADER_TYPE_PFLASH);
 
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_READONLY))

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b0ecc0e1960b78bd0ae5c5291135a5eda5626b39..ac44a98e9e606593bba0f2a9eb468e63660fdfff 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -64,7 +64,7 @@ typedef enum {
     X_QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */
     X_QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */
     QEMU_CAPS_KVM, /* Whether KVM is enabled by default */
-    QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */
+    X_QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */
 
     /* 15 */
     QEMU_CAPS_VGA, /* Is -vga avail */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 95e20d2ba7abadefc0f25c2cb66ca6f8263b45cc..d09fb90fb08018ebc3385be1b73b0f3812bfdf86 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3857,8 +3857,7 @@ qemuBuildDriveStr(virConnectPtr conn,
         goto error;
     }
     if (disk->src->format > 0 &&
-        disk->src->type != VIR_STORAGE_TYPE_DIR &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT))
+        disk->src->type != VIR_STORAGE_TYPE_DIR)
         virBufferAsprintf(&opt, ",format=%s",
                           virStorageFileFormatTypeToString(disk->src->format));
 
@@ -9048,12 +9047,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd,
         break;
 
     case VIR_DOMAIN_LOADER_TYPE_PFLASH:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("this QEMU binary doesn't support passing "
-                             "drive format"));
-            goto cleanup;
-        }
         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI) &&
             def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
index 87a2ca18eb09b87e4219b21795dff5349296d79c..54646f920b9355aa59a5f4bb3dddf4b9fee4393d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index aa2200aa46f2086be2ecb106223184e77308d727..4dbd15f295a91d5b8f199baccc17ed60e307688b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index 9d503a08e6e9f820bfd9acc1cd35c9d5d14b3534..36c1f41d70131cb973f847cc1aaff4942b590efd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index bb5d0d61fdd8feb203639985e149ba8fba8fbd25..cffa02a28a3d06ea3bf795c6cf9fc4c0e83b4eee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index e8dcc8d6ec0718ccbfa4544d46385bce9001ea37..abbc52b43919900fdcaa9804696d48b86d7ee68d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index 7627aee8b8d84c2d9838a78657fe014dfb674000..025a8c19c787115f50b124aac97c6b45fa1cf216 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index dce0870d8089126b9df00aea60a31856ea7b17fb..fdd630993a7eb99bbeac02a587b8368da3fd4b85 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps
index c699a651dcaa42a415dc107f08fb0ce988152322..f9f97fd1175715f2d02ff3a3c419d21c43ac2d65 100644 (file)
--- a/tests/qemucaps2xmldata/all_1.6.0-1.caps
+++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
index 2f89a72e1bf72ad4eef536bebcdb2fceac84a7cb..495ef5f7ad8cb6badd74c37c6083584be15fbff6 100644 (file)
--- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
+++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive-format'/>
     <flag name='vga'/>
     <flag name='0.10'/>
     <flag name='mem-path'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index a458ff0633ac4fbd0fc878cd96717004ac46b5a3..28f066290648442b0a3dd90e067ee55f6866b501 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -152,7 +152,6 @@ mymain(void)
     DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__)
 
     DO_TEST("qemu-0.12.1", 12001, 0, 0,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -179,7 +178,6 @@ mymain(void)
     DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -231,7 +229,6 @@ mymain(void)
     DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -264,7 +261,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -326,7 +322,6 @@ mymain(void)
     DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -385,7 +380,6 @@ mymain(void)
     DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -451,7 +445,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-1.0", 1000000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
@@ -533,7 +526,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
-            QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
index 09dac0c744968c87d8f18398ef5a9bf4ab99cfc2..ec5b9a5b0fbe790e54a4f9167367c5eb1bce669f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -dtb /aarch64.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
index 3ded3e950aa23b67f2d5c0613892d2401e00febf..3feb754b851e8c12c9c3d46ebb10e2a819abd015 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
@@ -18,5 +18,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
index 3397c33c32f2fc823251e006598948bb4c7537c0..489cf13b430a2cc515deb24cd5e986f46f87cc2a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -initrd /arm.initrd \
 -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
 -usb \
--drive file=/arm.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
index 8fa0dd0593b1eeec97232b9834ada7ed0fadbf9b..8968da21a38df055373f0fd444ed3c052694a5f5 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
index fbd9234768ba7c42aa191b940aed848c15f78a02..b4863fc3cffd68febcbf78279c998f8d4883a46a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -dtb /aarch64.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
index 053a6d8952a060f0dbd61d7b6b26e33720bfe308..a803ebd42b7502a530c9fe2e5277a9042f2ab533 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
 -device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \
 -usb \
--drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
index 892654ae28306690d6bfe40ebf3bebc2fd15c257..5f26d16b5955681b8b36578563988d80cfbe8b6f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \
 -dtb /arm.dtb \
 -usb \
--drive file=/arm.raw,if=sd,index=0 \
+-drive file=/arm.raw,if=sd,index=0,format=raw \
 -net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \
 -net user,vlan=0,name=hostnet0 \
 -serial pty

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
index c19a8084982c244fc6654310d677fc861da90b7d..fbff07db1ccac5ed2e6dd74cd8d1e49f9e73bfd8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 -dtb /arm.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/arm.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
index b3f9ab322b94797742ba5b6512aa800a5e406cca..9c9844416612160718cddb81a43d21f42d062086 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 -dtb /arm.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/arm.raw,if=none,id=drive-virtio-disk0 \
+-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
 -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
index 4deb0ecc4763bd6d1bfd22afeb2307ebe204661c..9f6e0d3a02e28685e3fbc7a6661ed48d065a7d6b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
@@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
index bfe81a38d174b674b4aba38f13f0fe8fb6c23ad2..8789386bb9820dda801454725a59434390503959 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
@@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
index bfe81a38d174b674b4aba38f13f0fe8fb6c23ad2..8789386bb9820dda801454725a59434390503959 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
@@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
index aba184e2b3e373ad2ea716e5147608fe5736687e..0f0f73cf97ab0eb339cd39a19aadf17bf9228d0b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -serial pty \
 -device usb-tablet,id=input0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
index a7f75b6f817844cb4b4a2104a38af26fa0509cfd..597615346dc8bc2bda3962674c7aa7969e446716 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
@@ -17,11 +17,11 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=none,bps=5000,\
-iops=6000,bps_max=10000,iops_max=11000 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\
+cache=none,bps=5000,iops=6000,bps_max=10000,iops_max=11000 \
 -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,cache=none,\
-bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\
+cache=none,bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\
 bps_wr_max=6500,iops_rd_max=7000,iops_wr_max=7500,iops_size=2000 \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
index 81f7f1fcf04664cf627458019d69d61c7e1fb777..4a4e156027b5af461f5f412bcb024f742269e385 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
@@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=none,bps=5000,\
-iops=6000 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\
+cache=none,bps=5000,iops=6000 \
 -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,cache=none,\
-bps_rd=5000,bps_wr=5000,iops=7000 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\
+cache=none,bps_rd=5000,bps_wr=5000,iops=7000 \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
index 176791e98b77973343b641a68dec3d2106f667fd..71f9ac5620c46c81027e79f2288237947dbd7b89 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot d \
 -usb \
--drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
index 186a44d1c5ad55eccf7976ba5a68eddb02dcaaa5..18a0b8c40247c9ea0d40fa61a41c1da93d4cecd1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
@@ -16,22 +16,22 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -usb \
--drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \
+-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=3 \
--drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
+-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
--drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \
+-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=4 \
--drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \
+-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\
 bootindex=2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
index d7d4a5371706edcc08bdea7bd5d831250d499296..5215d2793fb678e01fb382f061b7eac84e514eb3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
@@ -17,21 +17,21 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot dnca \
 -usb \
--drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on \
+-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
+-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
--drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \
+-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
--drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \
+-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
index d60bcf6d4dda0631b48f4180e26b601d49d588ef..90c97c9c58b8157f22446bcf303a158824d3fcd7 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
@@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
 -boot a \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
--drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0 \
+-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \
 -device isa-fdc,driveA=drive-fdc0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
index 4b55b6b8146e58a6be62c1c87ceade76b0ff1a1b..8cde686839e319e266eab5c44602eb706e5ca561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot a \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/tmp/firmware.img,if=floppy,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/tmp/firmware.img,if=floppy,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
index 61d72bc0371ce621a59f347e6f3e4e2c73c2a152..62dabe184227085e2e58eb3c2cf74bf27fae4660 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot menu=off \
 -usb \
--drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
index 81155455c4fd5b1b8679a4de29ecdb413ce210e3..441f8fdcd0815c4b3a0d1abfa8ca5d09cfebb654 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=d,menu=off \
 -usb \
--drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
index 58648594be380631b8d0cd6c71530908a00da7d7..8d3aece27477071853f454d70e92b7d0d6b6aa68 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=d,menu=off \
 -usb \
--drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
index 1f3727f6f0689ed96b32f3a0616f42274d2b3acc..15b188fc5d1ad3e8866037e81c03c40bb8723ec8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=d,menu=on,splash-time=3000 \
 -usb \
--drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
index 1b4f3d0e5cc67bd56bb246dd43d82ecb9a86e817..d640b182fd0b7cf84dd471d3f89fa8f85bdca686 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=d,menu=on \
 -usb \
--drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
index 9a2a178b2fc53e2db3a6ad9e3c43a2b17981ab39..710249d3ea702d60b8c4ad6aa7c0a6427c77ef2b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=dcna,menu=on \
 -usb \
--drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
index 108bea6e118f99f1bcab88ef4c8633b46b117982..692d1e25f359a0164b5d80c5e80db2e0963b2a72 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot n \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
index 629316f1de161251dfed07666b453b258e499321..49c427f20aa9208b1984ee624f2bfde82f96dd23 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
@@ -16,14 +16,15 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0 \
+-drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0,\
+format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=3 \
--drive file=/dev/null,if=none,id=drive-fdc0-0-1 \
+-drive file=/dev/null,if=none,id=drive-fdc0-0-1,format=raw \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -global isa-fdc.bootindexB=4 \
 -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
index 2dc0c7931fa50fbd6ca6165f5f4ce2b9e6323a1b..a8f54bc72b61fcece5bbb4690f72ac99ad33d251 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
@@ -17,22 +17,22 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \
+-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=3 \
--drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
+-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
--drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \
+-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=4 \
--drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \
+-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\
 bootindex=2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
index be7763c08b65ecc3d5d8a74529624b342df3e500..797db093de28508e4ff9ea17db96704ebf34139e 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
--drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0 \
+-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \
 -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
index 31b3242e09429b57e727cb4ebdb231acd3eb42b2..f0a6e3b0545770982fb273bd50243a558bc50771 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
index 896c69ead9db7c08a429e2af18720484691d154c..4bb811cdf2dd7898f626957578093c9f893e31b8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
index e75b5102c18413a01be690269406996ed0839ec1..7ec0ed829bcb6aa1185f46dc8dc6aaf1592aba20 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
index 55a082662d1214f809c0f10bdf46fc0e2c797dd5..caf8cf9bae86c78442669bb2c939379341c4b43b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
@@ -23,7 +23,7 @@ addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
index dcad80b1ce014b1d9216e150c8b8846077aff7b0..7e1c1436ea73cc0e451228edd5877874c7961484 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
index 6b139cff2c9334a93632c3379bc85cd966acdd7d..c65dd4a0a73a8535c5bf4044b41cdd6e1e8fa143 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
index b73d0c585efbafe0a0de6d4b34d618af3a52126b..e4d440801cf9b6ec25b851650be2ef8c6ce55f41 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
index 32362bcab1a0290caa2083c0720db24966e3c1f2..76a5deb5fbd1734b99f7236c2c0f4ab4acbb7589 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
index 99c5f4cdfb38949215f6c97dbe882266c828434f..86a9e4a571d5d023ef01834bcbc49303a682bc9f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charchannel0,\
 path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
index 26b112dc6b89ec36d0525e9e27145309fbad177d..fe7e19fd53904f7de55ff7c1ecf7e119aeb1fd35 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
index f1779c8dbac60c94b2d05ec9346f9c7eb61b4a14..26532205025fda876d443dd38ba3a0b7be26eeb7 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
index cd19362a2c86c753e80f34e4b8af26dd30d99fcc..78198b6519af73b21d066900a0eb9fa6ab1dc006 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
@@ -18,7 +18,7 @@ TZ=Europe/Paris \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
index f10cbb6eebfb2d56b98daa238e2a1042cb1d1a66..df8345fed1cd0eeb324aff043e4b1f587150ee6b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
index a41563f8f91ca8e5db750b751ed0d70a0ff5b29b..c89850e53bceeda89ae04020aa7cec82d9120be0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
index 562ef76844ea611f51514a285d938edc248cfbc5..0ba4e2cdb2bbfb2aa961c53a90baeafee2e16cb2 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
index da130d1c4284ef6de63146604a69bce1b6e73a69..077c67ed50b177efb9d994b5aca1b23ed480cb0a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
index 8dab65cf7021953fb64e8910615049ec8f8f2d3b..a4e4df7543bd7dee2ae52e47a3ce9fde6522ed95 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial pty \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
index 1e071636ae8a89b6246b62c237315e4bf6698977..38b140cb0ccf1e22592de46097eb633eff1f9668 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
index 8dab65cf7021953fb64e8910615049ec8f8f2d3b..a4e4df7543bd7dee2ae52e47a3ce9fde6522ed95 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial pty \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
index f2feb0a86d75189186675158ede3254270b83b26..53c8af9fd32547eac3e35587bbfde6f5d2a03b18 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \
 -chardev pty,id=charconsole0 \
 -device sclpconsole,chardev=charconsole0,id=console0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
index 97adfe3418734e7d396a592405444bc6c2661176..9567f5a305be41599a67a28dd5151f5cc666d87d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\
 bootindex=1 \
 -chardev pty,id=charconsole0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
index 09dd2b520037f9602a69d529aa281d66c0b794de..bd9196a4ca5a278f3a2963fc2a411bd410b13ab7 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
index 0d18fe7358fff6781abecab92a02735c7eee0e42..2f6473555119bea95af136d6c7bb4dbfba77c937 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -device virtio-serial-s390,id=virtio-serial0 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
index c0b2f892c9249273eb0964c39d708494fa36da70..47d58faea5b4d43f7cfc0f9c0b14f6e563e6925b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
index 142471ea37f154e2e298a947a7045f03ffc58acc..932d1278bb847a10bbf645702c0b361ce76d5fbd 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
@@ -19,11 +19,12 @@ QEMU_AUDIO_DRV=spice \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
 -device usb-ccid,id=ccid0 \
--drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,cache=none,aio=native \
+-drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,format=raw,cache=none,\
+aio=native \
 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:4d:4b:19,bus=pci.0,addr=0x3 \
 -net user,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
index 42132e80505d71cba6b4babbeb53ddb255c81799..3c3017734c4ec9a02f13ce820cf53854bc066aae 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
index a1f63272a0599800c384bada4e925d39538401d6..e04a5cbab50f66174424623379690fc8921144f4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
@@ -18,9 +18,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw \
 -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \
+-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \
 -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\
 logical_block_size=512,physical_block_size=512 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
index e1fcf99e4f47648a07dc688b5ee9cc85cb2b329d..faacb54b2c4f713e82849c8624a7ec4fd95d7e3b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
index 6b6b33cba9f6fc8f33f74c95db547d8abe358242..34b5f419cc4f121facd321892be058fd5bfc3e65 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -boot d \
 -usb \
 -drive file=ftp://host.name:21/url/path/file.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
index c5ea7b80ae7d10da2e82f024a8a58716850154f9..85a1b555c6fdd1b9e13962aa88cdb27c654a3730 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -boot d \
 -usb \
 -drive file=ftps://host.name:990/url/path/file.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
index 84fca84e2bdd6a1729368a67fc9c758ce2f7cf9f..317db01c42a51736e3959de7e6e3f6dbf5e6599f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -boot d \
 -usb \
 -drive file=http://host.name:80/url/path/file.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
index 2eb64fbf56dd1fc0ad3530ea6fa158506c33df3e..384699b5206bb8389b6f6469ceeebfed2c61b446 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -boot d \
 -usb \
 -drive file=https://host.name:443/url/path/file.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
index 367745e779e1c47e09e385a75f5b798445db7ad8..8c14592cf1ae0cdac9f1ed543b86897e718ed091 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
@@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
 -boot d \
 -usb \
 -drive file=tftp://host.name:69/url/path/file.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
index e1fcf99e4f47648a07dc688b5ee9cc85cb2b329d..faacb54b2c4f713e82849c8624a7ec4fd95d7e3b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
index 5fe6440e652443eeef032735a12987657ed46c2a..dea3f70b8f0933191fb82489ad25a71fd3c7402d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
@@ -17,12 +17,13 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot dc \
 -usb \
--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
+format=qcow2 \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive if=none,media=cdrom,id=drive-ide0-1-1 \
+-drive if=none,media=cdrom,id=drive-ide0-1-1,format=raw \
 -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
index 39d98f7ed4188d8dbf5b00c999e191349c7eec7d..9421754eb75f47192b635383f67cda4ea4343614 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
index c48f939f8cc5b10c059610c6350aed0cfeacea58..45a75a0060336d2f385aad68aa7625afa95946cf 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
@@ -19,11 +19,11 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
-copy-on-read=on \
+format=qcow2,copy-on-read=on \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\
 addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
index ae9780a39cc81149371531316b8732da7f0d424d..1bf5dd688a588a06548e99c9e119113d661522e1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot d \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
index 2ae53ed9a31c39117e05bb90426e4b7d14c38f68..75ba4c25acb008c1ec448bc0077c4861d9d99c57 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
index 7549f91d24e433e0789d6deb6bc24239c180b2a7..ca3a182e629d1e18b7e45359c428c0d507fe9506 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
@@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \
 -boot dc \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
-discard=unmap \
+format=qcow2,discard=unmap \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0,discard=ignore \
+id=drive-ide0-1-0,format=raw,discard=ignore \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
index f8761c980089072d810b499a3ada6fc2ead8cd39..8dd19928e77eb64e686608c99c5fd74190c0b994 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
@@ -18,7 +18,7 @@ mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -drive file=rbd:pool/image,if=virtio,format=raw \
 -net none \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
index 589bbcd57957f436ab0b08a77a93545f6b61850f..6ed9ea3f59caf9caa053bd22dcb5d5c165fb1273 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
@@ -16,10 +16,11 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0,\
+format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
index 11e2e2d1c9f77206989a06e6a73059c501e1b343..1da7f9a1e1bc9e3f5400f9d1a6d2e210aee477cc 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
@@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/sr0,if=none,media=cdrom,id=drive-ide0-1-0,readonly=on \
+-drive file=/dev/sr0,if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,\
+format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
index bbe917f48fff3896cbecb88c5bc672d1602d6ad5..16975083334e14aa1113caf29ff9a488e82197fb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
index 799f11aae1e88e0a61c3a807e60c050c58b41e0a..3c8ab262c13a188e01a023a7fc1a6ed2273227da 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
@@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/fd0,if=floppy,unit=0 \
--drive file=/tmp/firmware.img,if=floppy,unit=1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/fd0,if=floppy,unit=0,format=raw \
+-drive file=/tmp/firmware.img,if=floppy,unit=1,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
index 437d79111bba99c570765e7401d3e162a39eb614..e06b010b726d36bcd055aa85851b1688275dc09b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
@@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/fd0,if=floppy,unit=0 \
--drive if=floppy,unit=1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/fd0,if=floppy,unit=0,format=raw \
+-drive if=floppy,unit=1,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
index 3b6d00dd25a2335166eb379128eac08c0ac2436d..1400aec9f3ec916c3c1d2ac3db81b71311812328 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
@@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
--drive if=none,id=drive-fdc0-0-1 \
+-drive if=none,id=drive-fdc0-0-1,format=raw \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
index 0c4003f12c45a54c435d06bdc2697c7dda62ddc3..f920e6734305e049ed9e9d8514aab6f45afe461a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
@@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/fd0,if=floppy,unit=0 \
--drive file=/tmp/firmware.img,if=floppy,unit=1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/fd0,if=floppy,unit=0,format=raw \
+-drive file=/tmp/firmware.img,if=floppy,unit=1,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
index 2f94b3f6261aefa9de8de0ee6f93f4870abbc9df..719023ac8f95fbecd77d627a2e95a7ac3ab87f43 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,cyls=16383,heads=16,\
-secs=63,trans=lba \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw,cyls=16383,\
+heads=16,secs=63,trans=lba \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
index 45c6dd32c4add9a976d9310e39bdfb1fdd522414..d27bf5f48a43e6d671308c90fc56c12ff106b0aa 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw \
 -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \
+-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \
 -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
index 606ea51fe137345229e44c94fd2fef7753291ef4..2a0b8840409538fe202bfbae96da9b2df2da4093 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,\
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw,\
 serial=WD-WMAP9A966149 \
 -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\
 wwn=0x5000c50015ea71ad \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
index b65770c42f8d75d1e7fb65f9ab340748e823080e..d2537da58b0b8f9e96fc0e66a50a00e72a72cb00 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
@@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=none \
 -boot dc \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
+format=qcow2 \
 -device virtio-blk-pci,ioeventfd=on,scsi=off,bus=pci.0,addr=0x4,\
 drive=drive-virtio-disk0,id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\
 bus=pci.0,addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
index 79bbe29dff8d14e75e58c41900fd1f98227ac468..73c1e665fd7d263ed0cca53b29bdc1a09db5cd7c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/disk/by-path/ip-192.168.44.1:\
 3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,if=ide,bus=0,\
-unit=0 \
+unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
index abc162676b8de457c9b8c3f35abcb268a243e9d5..ad4ae62dce2b9b64b4e2a85e902ddba8e0cb0d30 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
@@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=1 \
--drive file=/tmp/data.img,if=ide,bus=1,unit=0 \
--drive file=/tmp/logs.img,if=ide,bus=1,unit=1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=1,format=raw \
+-drive file=/tmp/data.img,if=ide,bus=1,unit=0,format=raw \
+-drive file=/tmp/logs.img,if=ide,bus=1,unit=1,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
index 7c8641b08ca7e65883c67a663cf76a3bbf79a4f0..2e71c2abf4edc2db0d5d2d71a33be12b2416840a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
@@ -17,14 +17,15 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0,\
+format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive file=/tmp/data.img,if=none,id=drive-virtio-disk0 \
+-drive file=/tmp/data.img,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive file=/tmp/logs.img,if=none,id=drive-virtio-disk1 \
+-drive file=/tmp/logs.img,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
index 00b3103b853b9a81d4ad24333371ad61fcc89859..8d9ce2183a62dc00613dbbe56011475624244533 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
@@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device ahci,id=sata0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
index 21774b71335bc6538615b84f228eeda801cba97f..ad9ea82de4afd1d570178148e08d09824c5bb16a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device lsi,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
index 21774b71335bc6538615b84f228eeda801cba97f..ad9ea82de4afd1d570178148e08d09824c5bb16a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device lsi,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
index c5d35bf3c000586f36ba887a3f98fc2ec22ca525..048a221f658c461e104f0f180bb0aba76f564d4f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
@@ -22,16 +22,16 @@ QEMU_AUDIO_DRV=none \
 -device lsi,id=scsi2,bus=pci.0,addr=0x5 \
 -device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x6 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0,format=raw \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\
 id=scsi0-0-1-0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0-1 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0-1,format=raw \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,\
 id=scsi0-0-0-1 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-1-1 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-1-1,format=raw \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,\
 id=scsi0-0-1-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
index 9b169568a82c71f4eceba9381006eb971c8a660d..f6cc3b27e5391c1d059a2ed71b966fd2387546c9 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
@@ -20,10 +20,10 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0,format=raw \
 -device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\
 vendor=SEAGATE,product=ST3567807GD \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
index 0babb37e939f1960e1107dbfb1185d049b5d958b..5a5bcf6d1e4b34e412d0eb0fd769abe38ca24623 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
@@ -20,10 +20,10 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0,format=raw \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\
 id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
index f99f4f22f0e75c53d6bf73a77f5a4a1963458799..d95eebc8bdfba43c68e6e1940ba0de45925e3673 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
@@ -19,10 +19,10 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-1-1 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-1-1,format=raw \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,\
 id=scsi0-0-1-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
index 4f1caa7837bfa6f03597cb3e80540bdfa5f841f7..6c4e73fc0bee8cb8e7876ec2d2be50158981466d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
@@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device megasas,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\
 id=scsi0-0-4-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
index 8e5cbd9bb2e4d534b5a0b615682cde94190ecd6c..a3c79c223731dddc6b3b7af902f33d00f421cdb9 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
@@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\
 id=scsi0-0-4-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
index 3159a268b97fab5ee4b277e9e19f26da8d6717c1..1dad9cf6aeb4a570a65a8bef564e04d235d41fe7 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
@@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device spapr-vscsi,id=scsi0,reg=0x2000 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-3-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-3-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,\
 id=scsi0-0-3-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
index 86b78ebc84fa60b91569c7c5823f589fc702f50f..6525fbfa0ac63edceca2275137134f1f6479d084 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive 'file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,\
+-drive 'file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw,\
 serial=\ \ WD-WMAP9A966149' \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
index e1d65122609fd74990a815ffced88819f7b37e38..7a39cf5fb3dca902d82bdb0a04bb8ea5cdc90d88 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
 -drive file=iscsi://iscsi.example.com:3260/demo-target/2,if=none,media=cdrom,\
 id=drive-ide0-0-2 \
 -device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
--drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3 \
+-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3,format=raw \
 -device ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
index 26f0137ee1bee4981fb3c88ce280057d85eded6b..4f2d1d113d27e95fc4166009660916cae247a212 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
@@ -20,8 +20,8 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/some/block/device/cdrom,if=none,media=cdrom,id=drive-ide0-0-1 \
 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \
+-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \
 -device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
index b89e9bbbc0e0296443a23235960d2b47d52e56de..62fbd61ee4a0a1d5532f0cafd5245dda20ba4745 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0 \
+-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0,format=raw \
 -device usb-storage,drive=drive-usb-disk0,id=usb-disk0,removable=on \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
index 338107372ed31cc03c1a82b6bdd741f784acf7c4..e6fafc6ca9c46f4a7e6620f4b8fc52f639cf8d0f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0 \
+-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0,format=raw \
 -device usb-storage,drive=drive-usb-disk0,id=usb-disk0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
index dfc7b9f33c61f9c39dc110bc6eaf285bfb6b6f73..ae740e61e2f3c94e2b7da66f26fc5b72a00e5eeb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -usbdevice disk:/tmp/usbdisk.img \
 -net none \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
index 889d635e92e9f4b73cad641d0835c8149dd039a2..15344fd883f2d8b0edd2f59238b7b5ddc7d5d1be 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
@@ -16,12 +16,12 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/dev/HostVG/QEMUGuest4,if=none,id=drive-virtio-disk1 \
+-drive file=/dev/HostVG/QEMUGuest4,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk2 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk2,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0001,drive=drive-virtio-disk2,id=virtio-disk2 \
--drive file=/dev/HostVG/QEMUGuest3,if=none,id=drive-virtio-disk3 \
+-drive file=/dev/HostVG/QEMUGuest3,if=none,id=drive-virtio-disk3,format=raw \
 -device virtio-blk-ccw,devno=fe.2.f00f,drive=drive-virtio-disk3,id=virtio-disk3 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
index 430df81eefb5a49613bca882d02ea03163fcf413..d868187eb73e73e47b5760253dff3ab8564b0494 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
index b97090b29db6f1136b510789b2afe4b0af5585cf..cfcb916b6bd004016f1a981bd6b8a7bf86170a19 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
index 179e725725a26826f148e7e49b3d906124d81d02..98106f4a3491fbd7014447d2c22c63412ee7d354 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
@@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-4-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-4-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\
 id=scsi0-0-4-0 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
index f127f92911d73a61ca85fac4a6af3712fd4630d0..74be9f1c81cf2bd642a6ac49003faa75a87bb4b4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
index 4eb1c7ee40deac19e4cc95eb9f7aca3339f42a51..7a1f0b2f5b9664304a44061a1ac568ec445165e9 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
index d17e2c3850d1b372a1fc9511717cbf6372ca2b8d..108abb0bc0d796d3abb248a63cd70cd104a2d501 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
index 5c36f27bca3d1466dcbdcd88e512318219e028e6..f9bc22b9578ba73fdc57cd9b94a98e80938421e3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
 id=scsi0-0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
index d6cb697b39c2b1742daf81ba88e8658f9e9a618a..99cc0567e5c44554ed4da57a188aa7b9627bcace 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
@@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \
--drive file=/tmp/data.img,if=virtio \
--drive file=/tmp/logs.img,if=virtio \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \
+-drive file=/tmp/data.img,if=virtio,format=raw \
+-drive file=/tmp/logs.img,if=virtio,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
index 8f20b3b9be3e81fbc3871644a6c9d24994c59747..ab3ef10c1837d35e16fcc8044d64d5e393cd31b6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
@@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \
--drive file=/tmp/data.img,if=xen,index=0 \
--drive file=/tmp/logs.img,if=xen,index=6 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \
+-drive file=/tmp/data.img,if=xen,index=0,format=raw \
+-drive file=/tmp/logs.img,if=xen,index=6,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
index 87e1d2ecf9f6d2d85828cd9d1bf66677f3800af2..1d4897e86efc35962c64a1a06ae1fa5d9b8fdf02 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
@@ -22,7 +22,7 @@ server,nowait \
 -boot c \
 -usb \
 -drive file=/storage/guest_disks/encryptdisk,if=none,id=drive-virtio-disk0,\
-boot=on,format=qcow2 \
+format=raw,boot=on,format=qcow2 \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
index 768cc9d3a3f1c998f847e339eb59a0c42679c482..df5cd8db20d38fce5b18f333c9e7526d53ef9318 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
@@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=none \
 -boot dc \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
+format=qcow2 \
 -device virtio-blk-pci,event_idx=on,scsi=off,bus=pci.0,addr=0x4,\
 drive=drive-virtio-disk0,id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\
 bus=pci.0,addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
index 01563f4a285cc59dd8a391b5b49b8752d77b3193..6840535902be0409bfe60cb1f6c8381877c60662 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
index 8ccb593e071f0acc959802ed0b59753a76edeb23..3afcc6533a43d380d857109115721ea711863ea0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
 -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
index 165a1537655a7d45792118e29dd8ee970d99628e..b50fd85ac59c14a4e7066d3bd06ca36e4df1ad54 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
 -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
index acfb6b41757bcdcb438b250829e9a1b63d740ee5..5be91a5d2ea6317d61abdbc1071d0cf9a201ab10 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
@@ -16,7 +16,7 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
index fec0a5ecc4a40b57d18596887c7648616376e929..3affb4224e029e81f103d9566587293b5d18ccab 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
@@ -16,7 +16,7 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
index 3010767fd88a99541d8aad9cd3d953368f59054d..48e892c461f6bf5dca50822ba032459afc21177d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
 tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
index 4a1c3ac96596446be80161df57783f616952c6ff..cff95989ba0879b0d959e748d04cbf6552a1e5f6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
index 4cce624f8252984db7b2295a7e6cd4e4ff601991..2e52369c323c543cacd2eb836fd2dbed50aa7fb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
 image-compression=auto_glz,jpeg-wan-compression=auto,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
index c3ba5655c53cce8903c6d09607f1ee826cac2662..5cfdb060e52734a03552e85851c5ed189f10873f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
 tls-channel=main,plaintext-channel=inputs \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
index 7786553a8a141899f6ad39246497f837b12f04f1..945924f9e2570feff8cb83a12a52fef0ed0b9631 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\
 x509-dir=/etc/pki/libvirt-spice,tls-channel=default \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
index 662445a96dabf3c1fead0b821bc5ad3a26744904..defd8e29ff8dc33b236d70574f13aa6162aaa638 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
@@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=spice \
 -boot dc \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
+format=qcow2 \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-id=drive-ide0-1-0 \
+id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
 -net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
index 1ee5da0d6cfb074b696c5eb15bc6b1607f69dd39..3ffd722eccb2eea4ff0c0ca9f322d4287a33c058 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
 tls-channel=default,tls-channel=main,plaintext-channel=inputs,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
index fcb796a747020e3a3804d6240207d961a61aac80..4fdc09999343c77e06e16186db1697fde60ada89 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
index 1cc36b58aecf7e9853194d5b13041d8d2236afd0..88f77bd5d98f5d314bcc90703a94a0038886613b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
index 93c3ef3e81b6eded30612e4d4069a3f78ca14585..e92c6312cfeb9246e74d2db81b7965a1e07e52cb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
index d586af845fed16877fe43b075f777c25ce1b6f51..ce8322121c0b7319e2d93cdc9759671ca6449dd3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
index 5be901f20d24e8402296a0ab2171f6315c1269af..c91b469c5fba6b6463d91d0e0120d0032d025099 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
index 100721af0d8ec4bd54efd78a846394a12579fc77..93f592f2a2b4f0830aeb927f84c5ca0ff87f8baa 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
index 69f641aff917acaebe20c3dd3189a487712bfe7a..390cede40ee2a1c44e3e0267b08c4ce95303188b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
index 8537a9d34050c1feb683eb787c984c27560e9106..5417f6697f3ff81c31da76f78c4e5c6f6c88089c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/sg0,if=none,id=drive-hostdev0 \
 -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
index 39d397c0e4a21a33046f170f40604b047d6d5a78..f2e7dcd2bdda7593c8f43056bbddf906089823a8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device lsi,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
 3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
index d8387f05f80654a7a7c4d359c5372ecdd4345897..63f5a783fec49727523d7faedf9ebd9c223d8f07 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device lsi,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\
 id=drive-hostdev0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
index 252b25550bf8fa54ed79865e148a05c904b22f8b..eb2a6fcc48549f350a603b801743f87d6a979a34 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device lsi,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/sg0,if=none,id=drive-hostdev0 \
 -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
index 81b18eaef08d9afe398f1d663dfc567aef1679eb..816d3c232adcb8c6064858f984bd4743ebfda3ba 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/sg0,if=none,id=drive-hostdev0,readonly=on \
 -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
index 15dfd37ab89bc6a1a8570c194e2390b9610f69e6..2b3d87ddef4ab94ce55c40a931ef7e6310a9a2f3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
 3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
index cb87a7acbb252d513c607db82b2da3ba6dd51b77..eab55d99843ec46d6dc162153a72859114a77807 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\
 id=drive-hostdev0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
index 716b18ca127fc9628b45d799f65bd9bc0149cda2..745921c9775d595877a70f65bfdfca457158f08c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/sg0,if=none,id=drive-hostdev0 \
 -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
index 0714d53669a91a6e9a91a8befa67125120b554b0..c1f8a131e5c38e49f022273e149cc663ae69063f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
index 9d6730a66835cde53618e414454010a75c56aa03..a48eb210843f6afa6e1008153ce7cec1f4e3abf0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
index fd30c1f7034cc4e1b7c7692d46926c6ee46c2956..74aebd335e8b2eea5858f7957add320a588afee8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
index b8a76ae675cb83be540775272869a835c5990f9e..d5048a8676a1b00ff4e45861664123e9db2d8289 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device vfio-pci,host=55aa:20:0f.3,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
index 879e69a6617f2fe37bb53d4fd564a1f552307ad8..3003e89a6c05d488b22228e0db64036b25b746bd 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
index 3dec91f04977a0ee7b047c0c8cbe38daf4ca881c..77c1b91d4853770b8a06d80d4570876c1e1d0f2d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
@@ -31,10 +31,11 @@ addr=0x6 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \
--drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0,\
+format=qcow2 \
 -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive if=none,media=cdrom,id=drive-ide0-0-0 \
+-drive if=none,media=cdrom,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -serial pty \
 -chardev socket,id=charchannel0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
index d99579016a762f1c6e7b93a841d125cbcac8cb3f..01951e90622e04aff03ee73d4512f14b4325c729 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
@@ -31,7 +31,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
index 9e78a54e753e3176962d4007be176334c533698e..c2c2ca49a223c92087c95be43477943a9ae7e434 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
@@ -22,7 +22,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
index 1e69158826f7ee0c89017b2ac98e1c849da9b474..ac7cd0abdffd51bc63cf67cab65fbe51df9cdff5 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
@@ -21,7 +21,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
index 5e51e237648b1d62b5cb02e0665f5bbcfae50d34..04bfbeee8bce78f34c0c809daad3ee6742e1198b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
index 9ed7eed04a0eca931a0da5e834dadf3c677d7149..4c96d5ec1facef855b3d05e74b23ae14f5d0781f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
index f79c32e96c2f255870da1872a12208a5fc608566..dd5e79e1758adbfd704127d5b8ac372df46c07ff 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
@@ -31,7 +31,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
index b66a50edab6b827e708981b738fd85ec7b7b8b34..044b9fa69980d0533b7871ab7bf924221c26c529 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
index c6e9b79febf95c32ce8da1e8c6178d4f562816b1..611eb2be8a636646e92f578601cd2dd6e21db93e 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device usb-mouse,id=input0,bus=usb.0,port=4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
index c1e3acee2a64e82c3736a7e84e9554ae996eca80..7a539aff8911a575c1f6315ec1bee81e5e62b1a4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
index 4c9575310a38f25ef75e28f60166475718ada2ff..33f0edca45eeb80f1486dcff7fc116d79311a1b2 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
index 6cc77d6fffcb1b573898a109caaa6a9e4a9b01ef..f26b4a890d76741dbc8ea710d4387894607be70a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
@@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\
 drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1,format=raw \
 -device virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,\
 drive=drive-virtio-disk1,id=virtio-disk1 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
index 80c0f8a9b12dbf3a5e781b11354b04b21e4c7e2a..687b816ec0b7a5f39890f32779367c9714af49aa 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
@@ -19,11 +19,13 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,id=drive-virtio-disk1 \
+-drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,id=drive-virtio-disk1,\
+format=raw \
 -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\
 drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,id=drive-virtio-disk2 \
+-drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,id=drive-virtio-disk2,\
+format=raw \
 -device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x3,\
 drive=drive-virtio-disk2,id=virtio-disk2

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
index c5b11fb21922b7ae3dc80fd6b3e0e479c9ad4e67..7e91ba92382023cc81872ca4c4c009aba2792563 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
index 6863944f5269620ad299e14b5d865c858d10e6ff..4f5d3a0e4be14c4a343866022a60e17850b17297 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
index ba797879f7e9c5898412dc79f488eae46aa6f4bf..604ae6fa339cc118593938894595dceaccfa3c13 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
index 2b6f4fe0109c1c7fe40510584ea7ae247edc7d4d..dc53e77de66d0d3037c295e5f82f7dbc15b95ee9 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
index 95359ace39b1f7d1231cf78a4f1e9816b9ea6223..bf660a4d6cb28339a961c097dc32e6c185d2e164 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args
index 4eb7326dbdffa4a11a324a3e042cda92f138a46c..720ed171d1f0eb87d274f1ce8d6faef9c40b5372 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -cdrom /root/boot.iso \
 -net none \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
index 98ec167ff8a6dc0e8bbfaae73c94ef93382149cb..9fee98f904191fc95430668dcaeadedef726cb0c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
@@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\
+format=raw

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
index 72a88f474e80170b87ae3c65225f10b415bcfad7..2796d9b33ff7fa944cc154902f8afad20205d832 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
index 72a88f474e80170b87ae3c65225f10b415bcfad7..2796d9b33ff7fa944cc154902f8afad20205d832 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
index 739a453ec3f64de7df62f877350fea218e6e499c..f44b98ac6a02aa27d732d28ffa7d6f137d53ef3b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
@@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\
+format=raw

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
index 55cd4cd808be19b4035510c6234d4d1285143f5c..bdf028ded525d981018d1496f24055c819d47277 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
index 55cd4cd808be19b4035510c6234d4d1285143f5c..bdf028ded525d981018d1496f24055c819d47277 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
index 3122fb1031e0bd29c4d2016b38e2cefbedbb81f7..a507bd012e7fea4a01feaf5f377c6e2a466c88d4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
index 36ba617d74e0c6507bba5e1a664a1a0dfbc6f57f..ba93e171d4ec8bc83cf0a36a93604bd2e58ee027 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
index 469a2b5a57a71bf42292c9a0b5fc324117f8a8fb..75ddc81dc2eb4cda2af599bb1471f731e2c5b753 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
index de95c95f8738fe72a6e44a3e4bcac87fd7ebe210..d01e8e59f548e7ed5a97eadf00dbde11037bed14 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
index fcc82e99517da6885a70f492eb4045947479bbb8..dcbdd5bca60ce9178dfb96ee27d73ef523e33feb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
@@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\
+format=raw

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
index 3bc02df550d30faf70853094d050f78ef96f0ca3..4d696b12d86e112d1b0648efc182df7ccb157f8c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
index 3bc02df550d30faf70853094d050f78ef96f0ca3..4d696b12d86e112d1b0648efc182df7ccb157f8c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
index 0e2a7195a271e113080017ebdef311969f468edf..77f983795b9fe05a6397a249a2549f7916458f3f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
@@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\
+format=raw

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
index 74e5ce0d028b01fe267a2b1336131f817f3d1f8c..1963b84713568d9438d08bd4a31f28189d43a9be 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
index 74e5ce0d028b01fe267a2b1336131f817f3d1f8c..1963b84713568d9438d08bd4a31f28189d43a9be 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
index 8183e90a50efb89d8ec1dc9f4d5279365420421b..aa8dae01be1c8f2272b620e68a2747ed58703a66 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
@@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\
+format=raw

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
index 809509e1dae623152999ca33aea5efdb8828fbe4..f241a1911afcd2dd3dd60f4bbcdb1efc315f16ea 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
index 809509e1dae623152999ca33aea5efdb8828fbe4..f241a1911afcd2dd3dd60f4bbcdb1efc315f16ea 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
@@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
index 5a7f586b54df470c48d872993b33b221669eed86..5d0efcac5ad28637afd469226d1acf03a055752c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
index b0c6492bdf6fbe67943f10d7454bc51435dcd8ba..cbc1c3846dd6bc6fac04896bf2bfb7919e5c8469 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
index 7d83966d8d469b7d265b7d0fcfe581c1af93348f..22245f27f2185a23599f98b1d82b71859b15a3ba 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
@@ -21,6 +21,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
index f27cb75e66bd2060fb29b79bbac2d82811caae52..8382755a276beadd4fb488a1b299854dfb2096bf 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
@@ -23,6 +23,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
index 08f653fa4c65cb5144daaf61e029f9d3f8544856..0ee40590b96b4b24d464512c014e36e82ad3563f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
index 2d502af6f184a33e69c7d8aec6fbfc8e7c928e8a..709a25b95b672cd90c4261a0abd204ee6e9bde81 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
index 5bba25c609e34423c8509df80eb9364524209ba1..5ba146555a96230a520df4fba1ba4691cf8781e4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
index ac459538606d5bea443547adce51a7727c031b47..50828122d755f4d3f6128bfb4cadf4f848f953a7 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--drive file=/dev/HostVG/QEMUGuest1,if=virtio \
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
index 079923a50db9222284f53defe472b56732492a43..32e09ba3a4a44b43b249abbfeed7856f19677c8d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
index 2e2ddca820b9b2617343bcda1979cd250529c955..d21775b6f04ffac37cf26b372cd8cd14550a691d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s3=1 \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
index 4063afbefcf5e010b84987f0128638dd8894c32e..07bf7685e7bcda7bb288924b7f00658fb9990547 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s4=1 \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
index 0cec38c41fe4d828a04596a87877f1383566e87f..f5c90b35f0a3de42e83e244ca1aff1883f569221 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s4=0 \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
index 8178ad39058238d89f47d05029e44aa3dc0b36db..766a71c0e9139ae229921aa8c42669101ebde414 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
index 079923a50db9222284f53defe472b56732492a43..32e09ba3a4a44b43b249abbfeed7856f19677c8d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
index 50eee8102148eefd2991ce4d9ad0199abe13481a..9f85fc0a72a110b2eecdf26cb33519b850ed249f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
@@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/hda1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/hda1,if=none,id=drive-ide0-0-0,format=qcow2 \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
index 457230461a3ed7cce8c518a4b5d0deb4173ec7c7..c27887a61845c219567cf47fcb4b1cfded446273 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
@@ -27,6 +27,6 @@ QEMU_AUDIO_DRV=none \
 -device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \
 -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \
 -usb \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \
 -device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
index 53e8f4c91632f25853ae5fe2b405ab23bc60ccea..d2d4ac58876925f3c2470a1d060a5e980c589eed 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,connect=192.168.0.1:5558,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
index e0af6d30429cd654fd9ec7efc092cb91387e8d4b..02679aa2ba67b579553f1d55769651b4b698160f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
index 07f350ba6500b0d320eda9cd87da7a260041b386..78de72d0e550a5ff451c7a1c7425ea5910111527 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \
 -net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \
 -net nic,macaddr=00:11:22:33:44:56,vlan=1,model=e1000,name=net1 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
index 8d457dbea43502a22bb62e0b3454df7dccdc3709..d4db71cbca5bac85ba3d65c7c25c39bae9b6aefb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net tap,script=/etc/qemu-ifup,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
index 7bc8b3f9b9c6fcfaff5464038f1c3092daf27c20..4ac69441e0dd754eca74c43e131ac25a768f40c1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device pci-assign,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
index 594018dcd3c5cf9e0e9ef29b02d97d4eb5fa1dae..2ae29d28d61b5b8081dbcd4ab712cd5ba08f3e76 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
index 8aebdf78c7aa5353d920f75da22047e846a0cca4..3730bf84234056e19310f5c04c624c4ad61dd0c1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device vfio-pci,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
index af75d4346d87965aa9a462462d7b086950b48a88..4f0cb3d47c97b949ac5c93b2818df8bde6bf64dd 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device pci-assign,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
index c99b264cc11591553494a3509436a89c125ebd20..77bb7068e11daf82055af39426ea5ae5428bbd1b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,mcast=192.0.0.1:5558,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
index f7008c8311590fb3bf0899e88ea199cc9420c087..ddbc0daac9f0864ae5c77e8ee7b65db4e1a9b59c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,listen=192.168.0.1:5558,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
index 000617a4211acc73c369cc409bb1571c00a31834..650fe6b3c2839fe79bbcf611cf3415a5fbc8c5cc 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
index a141c9368c5aa02ef41f9ba168ed07e3e484a3e0..7fc1ec9474727cdca276bca88b8f31bf1c2baea5 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net user,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
index a6a80c9e66ba6acdc7716b55b4387efe2d4eff82..999dede86a92884a74ce7e58afd5526f2363f21c 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
 -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
index beabbb234fcff28ab289edf6541e7d25a45c6a6a..c12f09d0b90887a9c55936dca127914aaacfe40b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
 -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
index c4389c6ee9f3f066a440492b56d98d0bdb4a3d9c..b85ac1d7e82c2e02473d0f02a22ea7df5169c375 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
 addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
index 3a6edb4fe309c19f0acfcc03e2ad6d261f848b9c..6df16be855b5c00e5d7001aece8e1eae1c4f9825 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest7,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest7,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,\
 host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
index 6cf6fb73d74b96c77b7c8c51a63a031254588ff9..1760a37489dc0f85d25bd08d88e4ab37f27fb809 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
index a6ea8ba2d75ff3bcc3290a1f4bd49bc847126f37..a4f2175164baaedcbc5b39adbe05d339db15107d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio \
 -net user,vlan=0 \
 -serial none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
index 5ca99e9c5e6083b853eccbb29ebdd59aec810222..bbb895a7f623c5435c3a829e75fa9d957ae7759f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
@@ -20,6 +20,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/hda1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/hda1,if=none,id=drive-ide0-0-0,format=qcow2 \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
index 1dc0eb81194a8d9a8dcb947094d31546b78fe9a7..1ef677c6c4c57037cc366fa1647684d803c8a9ec 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
index 52dd271a3a23cabf871199dd8dd38f91397bf480..8019c00f46a2a6168c1dfe230d7648256667e578 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
index 02b6a5514848977ce66d46d99ea675a20f537741..4afff1937cbbdfc7262ed104b72059b526286a28 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
index dcec4a0d2d3b4b4905fa3e1a84bf2a460fef9b01..e06d59f74127319d64c4771b769129b5e3c76a7d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -device pvpanic

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args
index a181e18ad6fca3a43e2fba8a1e564424b97a67c8..46ad1a02fcfb11e7ab960153174b7d42f1ea1f80 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -device pvpanic,ioport=1285

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
index 74059ecc7aefdb51ea3b862e61ab8dcfdb12a2af..5096d7f373fc075cb20be169c7a396b00192ef86 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev parport,id=charparallel0,path=/dev/parport0 \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
index c240702848bb6a8ccc063e81061c55d0634240fe..2945394f00d753034c8939042b1e0e439c5f6405 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
index 3201d735e4e84857b6a5339fcb1f765a61a15ccf..63f9f1eb7be565ced5568b8190398ad1821a4eaf 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel tcp:127.0.0.1:9999,server,nowait

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
index a5852b1ea35e2db0a54bb5bdabd092a4356e2913..7ee7388487e6acf6d55343bc1ab82686067bd429 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \
 -usb \
--drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
index 0175856d067bb9aa49a0891640f30928533f0bfc..8f70c4747a9fbd1cfd1968e63e6df6355daca99d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \
 -usb \
--drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
index 618c25afca3ed4fe7d45a24470b20d61ef2fe856..3ba99974a0952d92649ff52888ac679bd9e96f71 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
@@ -21,318 +21,423 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
 -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \
 -usb \
--drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \
+-drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,\
 id=virtio-disk26 \
--drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \
+-drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,\
 id=virtio-disk27 \
--drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \
+-drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,\
 id=virtio-disk28 \
--drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \
+-drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,\
 id=virtio-disk29 \
--drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \
+-drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,\
 id=virtio-disk52 \
--drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \
+-drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,\
 id=virtio-disk53 \
--drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \
+-drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,\
 id=virtio-disk54 \
--drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \
+-drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,\
 id=virtio-disk55 \
--drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \
+-drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,\
 id=virtio-disk78 \
--drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \
+-drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,\
 id=virtio-disk79 \
--drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \
+-drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,\
 id=virtio-disk80 \
--drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \
+-drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,\
 id=virtio-disk81 \
--drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \
+-drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,\
 id=virtio-disk104 \
--drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \
+-drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,\
 id=virtio-disk105 \
--drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \
+-drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,\
 id=virtio-disk106 \
--drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \
+-drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,\
 id=virtio-disk107 \
--drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \
+-drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,\
 id=virtio-disk130 \
--drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \
+-drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,\
 id=virtio-disk131 \
--drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \
+-drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,\
 id=virtio-disk132 \
--drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \
+-drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,\
 id=virtio-disk133 \
--drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \
+-drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,\
 id=virtio-disk156 \
--drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \
+-drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,\
 id=virtio-disk157 \
--drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \
+-drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,\
 id=virtio-disk158 \
--drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \
+-drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,\
 id=virtio-disk159 \
--drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \
+-drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,\
 id=virtio-disk182 \
--drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \
+-drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,\
 id=virtio-disk183 \
--drive file=/var/lib/libvirt/images/disk-g-c.img,if=none,id=drive-virtio-disk184 \
+-drive file=/var/lib/libvirt/images/disk-g-c.img,if=none,id=drive-virtio-disk184,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,\
 id=virtio-disk184 \
--drive file=/var/lib/libvirt/images/disk-g-d.img,if=none,id=drive-virtio-disk185 \
+-drive file=/var/lib/libvirt/images/disk-g-d.img,if=none,id=drive-virtio-disk185,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,\
 id=virtio-disk185 \
--drive file=/var/lib/libvirt/images/disk-h-a.img,if=none,id=drive-virtio-disk208 \
+-drive file=/var/lib/libvirt/images/disk-h-a.img,if=none,id=drive-virtio-disk208,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,\
 id=virtio-disk208 \
--drive file=/var/lib/libvirt/images/disk-h-b.img,if=none,id=drive-virtio-disk209 \
+-drive file=/var/lib/libvirt/images/disk-h-b.img,if=none,id=drive-virtio-disk209,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,\
 id=virtio-disk209 \
--drive file=/var/lib/libvirt/images/disk-h-c.img,if=none,id=drive-virtio-disk210 \
+-drive file=/var/lib/libvirt/images/disk-h-c.img,if=none,id=drive-virtio-disk210,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,\
 id=virtio-disk210 \
--drive file=/var/lib/libvirt/images/disk-h-d.img,if=none,id=drive-virtio-disk211 \
+-drive file=/var/lib/libvirt/images/disk-h-d.img,if=none,id=drive-virtio-disk211,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,\
 id=virtio-disk211 \
--drive file=/var/lib/libvirt/images/disk-i-a.img,if=none,id=drive-virtio-disk234 \
+-drive file=/var/lib/libvirt/images/disk-i-a.img,if=none,id=drive-virtio-disk234,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,\
 id=virtio-disk234 \
--drive file=/var/lib/libvirt/images/disk-i-b.img,if=none,id=drive-virtio-disk235 \
+-drive file=/var/lib/libvirt/images/disk-i-b.img,if=none,id=drive-virtio-disk235,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,\
 id=virtio-disk235 \
--drive file=/var/lib/libvirt/images/disk-i-c.img,if=none,id=drive-virtio-disk236 \
+-drive file=/var/lib/libvirt/images/disk-i-c.img,if=none,id=drive-virtio-disk236,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,\
 id=virtio-disk236 \
--drive file=/var/lib/libvirt/images/disk-i-d.img,if=none,id=drive-virtio-disk237 \
+-drive file=/var/lib/libvirt/images/disk-i-d.img,if=none,id=drive-virtio-disk237,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,\
 id=virtio-disk237 \
--drive file=/var/lib/libvirt/images/disk-j-a.img,if=none,id=drive-virtio-disk260 \
+-drive file=/var/lib/libvirt/images/disk-j-a.img,if=none,id=drive-virtio-disk260,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,\
 id=virtio-disk260 \
--drive file=/var/lib/libvirt/images/disk-j-b.img,if=none,id=drive-virtio-disk261 \
+-drive file=/var/lib/libvirt/images/disk-j-b.img,if=none,id=drive-virtio-disk261,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,\
 id=virtio-disk261 \
--drive file=/var/lib/libvirt/images/disk-j-c.img,if=none,id=drive-virtio-disk262 \
+-drive file=/var/lib/libvirt/images/disk-j-c.img,if=none,id=drive-virtio-disk262,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,\
 id=virtio-disk262 \
--drive file=/var/lib/libvirt/images/disk-j-d.img,if=none,id=drive-virtio-disk263 \
+-drive file=/var/lib/libvirt/images/disk-j-d.img,if=none,id=drive-virtio-disk263,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,\
 id=virtio-disk263 \
--drive file=/var/lib/libvirt/images/disk-k-a.img,if=none,id=drive-virtio-disk286 \
+-drive file=/var/lib/libvirt/images/disk-k-a.img,if=none,id=drive-virtio-disk286,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,\
 id=virtio-disk286 \
--drive file=/var/lib/libvirt/images/disk-k-b.img,if=none,id=drive-virtio-disk287 \
+-drive file=/var/lib/libvirt/images/disk-k-b.img,if=none,id=drive-virtio-disk287,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,\
 id=virtio-disk287 \
--drive file=/var/lib/libvirt/images/disk-k-c.img,if=none,id=drive-virtio-disk288 \
+-drive file=/var/lib/libvirt/images/disk-k-c.img,if=none,id=drive-virtio-disk288,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,\
 id=virtio-disk288 \
--drive file=/var/lib/libvirt/images/disk-k-d.img,if=none,id=drive-virtio-disk289 \
+-drive file=/var/lib/libvirt/images/disk-k-d.img,if=none,id=drive-virtio-disk289,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,\
 id=virtio-disk289 \
--drive file=/var/lib/libvirt/images/disk-l-a.img,if=none,id=drive-virtio-disk312 \
+-drive file=/var/lib/libvirt/images/disk-l-a.img,if=none,id=drive-virtio-disk312,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,\
 id=virtio-disk312 \
--drive file=/var/lib/libvirt/images/disk-l-b.img,if=none,id=drive-virtio-disk313 \
+-drive file=/var/lib/libvirt/images/disk-l-b.img,if=none,id=drive-virtio-disk313,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,\
 id=virtio-disk313 \
--drive file=/var/lib/libvirt/images/disk-l-c.img,if=none,id=drive-virtio-disk314 \
+-drive file=/var/lib/libvirt/images/disk-l-c.img,if=none,id=drive-virtio-disk314,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,\
 id=virtio-disk314 \
--drive file=/var/lib/libvirt/images/disk-l-d.img,if=none,id=drive-virtio-disk315 \
+-drive file=/var/lib/libvirt/images/disk-l-d.img,if=none,id=drive-virtio-disk315,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,\
 id=virtio-disk315 \
--drive file=/var/lib/libvirt/images/disk-m-a.img,if=none,id=drive-virtio-disk338 \
+-drive file=/var/lib/libvirt/images/disk-m-a.img,if=none,id=drive-virtio-disk338,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,\
 id=virtio-disk338 \
--drive file=/var/lib/libvirt/images/disk-m-b.img,if=none,id=drive-virtio-disk339 \
+-drive file=/var/lib/libvirt/images/disk-m-b.img,if=none,id=drive-virtio-disk339,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,\
 id=virtio-disk339 \
--drive file=/var/lib/libvirt/images/disk-m-c.img,if=none,id=drive-virtio-disk340 \
+-drive file=/var/lib/libvirt/images/disk-m-c.img,if=none,id=drive-virtio-disk340,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,\
 id=virtio-disk340 \
--drive file=/var/lib/libvirt/images/disk-m-d.img,if=none,id=drive-virtio-disk341 \
+-drive file=/var/lib/libvirt/images/disk-m-d.img,if=none,id=drive-virtio-disk341,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,\
 id=virtio-disk341 \
--drive file=/var/lib/libvirt/images/disk-n-a.img,if=none,id=drive-virtio-disk364 \
+-drive file=/var/lib/libvirt/images/disk-n-a.img,if=none,id=drive-virtio-disk364,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,\
 id=virtio-disk364 \
--drive file=/var/lib/libvirt/images/disk-n-b.img,if=none,id=drive-virtio-disk365 \
+-drive file=/var/lib/libvirt/images/disk-n-b.img,if=none,id=drive-virtio-disk365,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,\
 id=virtio-disk365 \
--drive file=/var/lib/libvirt/images/disk-n-c.img,if=none,id=drive-virtio-disk366 \
+-drive file=/var/lib/libvirt/images/disk-n-c.img,if=none,id=drive-virtio-disk366,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,\
 id=virtio-disk366 \
--drive file=/var/lib/libvirt/images/disk-n-d.img,if=none,id=drive-virtio-disk367 \
+-drive file=/var/lib/libvirt/images/disk-n-d.img,if=none,id=drive-virtio-disk367,\
+format=raw \
 -device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,\
 id=virtio-disk367 \
--drive file=/var/lib/libvirt/images/disk-o-a.img,if=none,id=drive-virtio-disk390 \
+-drive file=/var/lib/libvirt/images/disk-o-a.img,if=none,id=drive-virtio-disk390,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,\
 id=virtio-disk390 \
--drive file=/var/lib/libvirt/images/disk-o-b.img,if=none,id=drive-virtio-disk391 \
+-drive file=/var/lib/libvirt/images/disk-o-b.img,if=none,id=drive-virtio-disk391,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,\
 id=virtio-disk391 \
--drive file=/var/lib/libvirt/images/disk-o-c.img,if=none,id=drive-virtio-disk392 \
+-drive file=/var/lib/libvirt/images/disk-o-c.img,if=none,id=drive-virtio-disk392,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,\
 id=virtio-disk392 \
--drive file=/var/lib/libvirt/images/disk-o-d.img,if=none,id=drive-virtio-disk393 \
+-drive file=/var/lib/libvirt/images/disk-o-d.img,if=none,id=drive-virtio-disk393,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,\
 id=virtio-disk393 \
--drive file=/var/lib/libvirt/images/disk-p-a.img,if=none,id=drive-virtio-disk416 \
+-drive file=/var/lib/libvirt/images/disk-p-a.img,if=none,id=drive-virtio-disk416,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,\
 id=virtio-disk416 \
--drive file=/var/lib/libvirt/images/disk-p-b.img,if=none,id=drive-virtio-disk417 \
+-drive file=/var/lib/libvirt/images/disk-p-b.img,if=none,id=drive-virtio-disk417,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,\
 id=virtio-disk417 \
--drive file=/var/lib/libvirt/images/disk-p-c.img,if=none,id=drive-virtio-disk418 \
+-drive file=/var/lib/libvirt/images/disk-p-c.img,if=none,id=drive-virtio-disk418,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,\
 id=virtio-disk418 \
--drive file=/var/lib/libvirt/images/disk-p-d.img,if=none,id=drive-virtio-disk419 \
+-drive file=/var/lib/libvirt/images/disk-p-d.img,if=none,id=drive-virtio-disk419,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,\
 id=virtio-disk419 \
--drive file=/var/lib/libvirt/images/disk-q-a.img,if=none,id=drive-virtio-disk442 \
+-drive file=/var/lib/libvirt/images/disk-q-a.img,if=none,id=drive-virtio-disk442,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,\
 id=virtio-disk442 \
--drive file=/var/lib/libvirt/images/disk-q-b.img,if=none,id=drive-virtio-disk443 \
+-drive file=/var/lib/libvirt/images/disk-q-b.img,if=none,id=drive-virtio-disk443,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,\
 id=virtio-disk443 \
--drive file=/var/lib/libvirt/images/disk-q-c.img,if=none,id=drive-virtio-disk444 \
+-drive file=/var/lib/libvirt/images/disk-q-c.img,if=none,id=drive-virtio-disk444,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,\
 id=virtio-disk444 \
--drive file=/var/lib/libvirt/images/disk-q-d.img,if=none,id=drive-virtio-disk445 \
+-drive file=/var/lib/libvirt/images/disk-q-d.img,if=none,id=drive-virtio-disk445,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,\
 id=virtio-disk445 \
--drive file=/var/lib/libvirt/images/disk-r-a.img,if=none,id=drive-virtio-disk468 \
+-drive file=/var/lib/libvirt/images/disk-r-a.img,if=none,id=drive-virtio-disk468,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,\
 id=virtio-disk468 \
--drive file=/var/lib/libvirt/images/disk-r-b.img,if=none,id=drive-virtio-disk469 \
+-drive file=/var/lib/libvirt/images/disk-r-b.img,if=none,id=drive-virtio-disk469,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,\
 id=virtio-disk469 \
--drive file=/var/lib/libvirt/images/disk-r-c.img,if=none,id=drive-virtio-disk470 \
+-drive file=/var/lib/libvirt/images/disk-r-c.img,if=none,id=drive-virtio-disk470,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,\
 id=virtio-disk470 \
--drive file=/var/lib/libvirt/images/disk-r-d.img,if=none,id=drive-virtio-disk471 \
+-drive file=/var/lib/libvirt/images/disk-r-d.img,if=none,id=drive-virtio-disk471,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,\
 id=virtio-disk471 \
--drive file=/var/lib/libvirt/images/disk-s-a.img,if=none,id=drive-virtio-disk494 \
+-drive file=/var/lib/libvirt/images/disk-s-a.img,if=none,id=drive-virtio-disk494,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,\
 id=virtio-disk494 \
--drive file=/var/lib/libvirt/images/disk-s-b.img,if=none,id=drive-virtio-disk495 \
+-drive file=/var/lib/libvirt/images/disk-s-b.img,if=none,id=drive-virtio-disk495,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,\
 id=virtio-disk495 \
--drive file=/var/lib/libvirt/images/disk-s-c.img,if=none,id=drive-virtio-disk496 \
+-drive file=/var/lib/libvirt/images/disk-s-c.img,if=none,id=drive-virtio-disk496,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,\
 id=virtio-disk496 \
--drive file=/var/lib/libvirt/images/disk-s-d.img,if=none,id=drive-virtio-disk497 \
+-drive file=/var/lib/libvirt/images/disk-s-d.img,if=none,id=drive-virtio-disk497,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,\
 id=virtio-disk497 \
--drive file=/var/lib/libvirt/images/disk-t-a.img,if=none,id=drive-virtio-disk520 \
+-drive file=/var/lib/libvirt/images/disk-t-a.img,if=none,id=drive-virtio-disk520,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,\
 id=virtio-disk520 \
--drive file=/var/lib/libvirt/images/disk-t-b.img,if=none,id=drive-virtio-disk521 \
+-drive file=/var/lib/libvirt/images/disk-t-b.img,if=none,id=drive-virtio-disk521,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,\
 id=virtio-disk521 \
--drive file=/var/lib/libvirt/images/disk-t-c.img,if=none,id=drive-virtio-disk522 \
+-drive file=/var/lib/libvirt/images/disk-t-c.img,if=none,id=drive-virtio-disk522,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,\
 id=virtio-disk522 \
--drive file=/var/lib/libvirt/images/disk-t-d.img,if=none,id=drive-virtio-disk523 \
+-drive file=/var/lib/libvirt/images/disk-t-d.img,if=none,id=drive-virtio-disk523,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,\
 id=virtio-disk523 \
--drive file=/var/lib/libvirt/images/disk-u-a.img,if=none,id=drive-virtio-disk546 \
+-drive file=/var/lib/libvirt/images/disk-u-a.img,if=none,id=drive-virtio-disk546,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,\
 id=virtio-disk546 \
--drive file=/var/lib/libvirt/images/disk-u-b.img,if=none,id=drive-virtio-disk547 \
+-drive file=/var/lib/libvirt/images/disk-u-b.img,if=none,id=drive-virtio-disk547,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,\
 id=virtio-disk547 \
--drive file=/var/lib/libvirt/images/disk-u-c.img,if=none,id=drive-virtio-disk548 \
+-drive file=/var/lib/libvirt/images/disk-u-c.img,if=none,id=drive-virtio-disk548,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,\
 id=virtio-disk548 \
--drive file=/var/lib/libvirt/images/disk-u-d.img,if=none,id=drive-virtio-disk549 \
+-drive file=/var/lib/libvirt/images/disk-u-d.img,if=none,id=drive-virtio-disk549,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,\
 id=virtio-disk549 \
--drive file=/var/lib/libvirt/images/disk-v-a.img,if=none,id=drive-virtio-disk572 \
+-drive file=/var/lib/libvirt/images/disk-v-a.img,if=none,id=drive-virtio-disk572,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,\
 id=virtio-disk572 \
--drive file=/var/lib/libvirt/images/disk-v-b.img,if=none,id=drive-virtio-disk573 \
+-drive file=/var/lib/libvirt/images/disk-v-b.img,if=none,id=drive-virtio-disk573,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,\
 id=virtio-disk573 \
--drive file=/var/lib/libvirt/images/disk-v-c.img,if=none,id=drive-virtio-disk574 \
+-drive file=/var/lib/libvirt/images/disk-v-c.img,if=none,id=drive-virtio-disk574,\
+format=raw \
 -device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,\
 id=virtio-disk574 \
--drive file=/var/lib/libvirt/images/disk-v-d.img,if=none,id=drive-virtio-disk575 \
+-drive file=/var/lib/libvirt/images/disk-v-d.img,if=none,id=drive-virtio-disk575,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,\
 id=virtio-disk575 \
--drive file=/var/lib/libvirt/images/disk-w-a.img,if=none,id=drive-virtio-disk598 \
+-drive file=/var/lib/libvirt/images/disk-w-a.img,if=none,id=drive-virtio-disk598,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,\
 id=virtio-disk598 \
--drive file=/var/lib/libvirt/images/disk-w-b.img,if=none,id=drive-virtio-disk599 \
+-drive file=/var/lib/libvirt/images/disk-w-b.img,if=none,id=drive-virtio-disk599,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,\
 id=virtio-disk599 \
--drive file=/var/lib/libvirt/images/disk-w-c.img,if=none,id=drive-virtio-disk600 \
+-drive file=/var/lib/libvirt/images/disk-w-c.img,if=none,id=drive-virtio-disk600,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,\
 id=virtio-disk600 \
--drive file=/var/lib/libvirt/images/disk-w-d.img,if=none,id=drive-virtio-disk601 \
+-drive file=/var/lib/libvirt/images/disk-w-d.img,if=none,id=drive-virtio-disk601,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,\
 id=virtio-disk601 \
--drive file=/var/lib/libvirt/images/disk-x-a.img,if=none,id=drive-virtio-disk624 \
+-drive file=/var/lib/libvirt/images/disk-x-a.img,if=none,id=drive-virtio-disk624,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,\
 id=virtio-disk624 \
--drive file=/var/lib/libvirt/images/disk-x-b.img,if=none,id=drive-virtio-disk625 \
+-drive file=/var/lib/libvirt/images/disk-x-b.img,if=none,id=drive-virtio-disk625,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,\
 id=virtio-disk625 \
--drive file=/var/lib/libvirt/images/disk-x-c.img,if=none,id=drive-virtio-disk626 \
+-drive file=/var/lib/libvirt/images/disk-x-c.img,if=none,id=drive-virtio-disk626,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,\
 id=virtio-disk626 \
--drive file=/var/lib/libvirt/images/disk-x-d.img,if=none,id=drive-virtio-disk627 \
+-drive file=/var/lib/libvirt/images/disk-x-d.img,if=none,id=drive-virtio-disk627,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,\
 id=virtio-disk627 \
--drive file=/var/lib/libvirt/images/disk-y-a.img,if=none,id=drive-virtio-disk650 \
+-drive file=/var/lib/libvirt/images/disk-y-a.img,if=none,id=drive-virtio-disk650,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,\
 id=virtio-disk650 \
--drive file=/var/lib/libvirt/images/disk-y-b.img,if=none,id=drive-virtio-disk651 \
+-drive file=/var/lib/libvirt/images/disk-y-b.img,if=none,id=drive-virtio-disk651,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,\
 id=virtio-disk651 \
--drive file=/var/lib/libvirt/images/disk-y-c.img,if=none,id=drive-virtio-disk652 \
+-drive file=/var/lib/libvirt/images/disk-y-c.img,if=none,id=drive-virtio-disk652,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,\
 id=virtio-disk652 \
--drive file=/var/lib/libvirt/images/disk-y-d.img,if=none,id=drive-virtio-disk653 \
+-drive file=/var/lib/libvirt/images/disk-y-d.img,if=none,id=drive-virtio-disk653,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,\
 id=virtio-disk653 \
--drive file=/var/lib/libvirt/images/disk-z-a.img,if=none,id=drive-virtio-disk676 \
+-drive file=/var/lib/libvirt/images/disk-z-a.img,if=none,id=drive-virtio-disk676,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,\
 id=virtio-disk676 \
--drive file=/var/lib/libvirt/images/disk-z-b.img,if=none,id=drive-virtio-disk677 \
+-drive file=/var/lib/libvirt/images/disk-z-b.img,if=none,id=drive-virtio-disk677,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,\
 id=virtio-disk677 \
--drive file=/var/lib/libvirt/images/disk-z-c.img,if=none,id=drive-virtio-disk678 \
+-drive file=/var/lib/libvirt/images/disk-z-c.img,if=none,id=drive-virtio-disk678,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,\
 id=virtio-disk678 \
--drive file=/var/lib/libvirt/images/disk-z-d.img,if=none,id=drive-virtio-disk679 \
+-drive file=/var/lib/libvirt/images/disk-z-d.img,if=none,id=drive-virtio-disk679,\
+format=raw \
 -device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,\
 id=virtio-disk679

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
index 63a8ca7c97cbe7015b74b252660958a4d79fb11f..eff4223c436d79efb2a7fd70999e82c4d0e3e803 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
@@ -16,90 +16,118 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \
+-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk1 \
+-drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk1,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
--drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \
+-drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk26,\
 id=virtio-disk26 \
--drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \
+-drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,\
 id=virtio-disk27 \
--drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \
+-drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,\
 id=virtio-disk28 \
--drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \
+-drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,\
 id=virtio-disk29 \
--drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \
+-drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,\
 id=virtio-disk52 \
--drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \
+-drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,\
 id=virtio-disk53 \
--drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \
+-drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,\
 id=virtio-disk54 \
--drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \
+-drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,\
 id=virtio-disk55 \
--drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \
+-drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,\
 id=virtio-disk78 \
--drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \
+-drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,\
 id=virtio-disk79 \
--drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \
+-drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,\
 id=virtio-disk80 \
--drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \
+-drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,\
 id=virtio-disk81 \
--drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \
+-drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,\
 id=virtio-disk104 \
--drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \
+-drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,\
 id=virtio-disk105 \
--drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \
+-drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,\
 id=virtio-disk106 \
--drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \
+-drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,\
 id=virtio-disk107 \
--drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \
+-drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,\
 id=virtio-disk130 \
--drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \
+-drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,\
 id=virtio-disk131 \
--drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \
+-drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,\
 id=virtio-disk132 \
--drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \
+-drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,\
 id=virtio-disk133 \
--drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \
+-drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,\
 id=virtio-disk156 \
--drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \
+-drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,\
 id=virtio-disk157 \
--drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \
+-drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,\
 id=virtio-disk158 \
--drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \
+-drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,\
 id=virtio-disk159 \
--drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \
+-drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,\
 id=virtio-disk182 \
--drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \
+-drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183,\
+format=raw \
 -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,\
 id=virtio-disk183 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
index f1440d5cdce85cc51bc94f7c8664d3619d0d1bff..58f038c99bc51e3376a93a7a3378c45abdf0becc 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,\
 rombar=1 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
index 8a67d63e363ad374ccab0aa6d7d1f30e73a8496f..e7b9975c652b94819edf8f0454a8d162c0beff20 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
index 5c9b55ad32fe96d15ad2f980984d9e86194670c6..2803835dafcfa93a10a079ce9e149640e5a379d6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
 -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
 -device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x3 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
index a9ff9b98a4ae24e06e1b74e0af255dbcead357a2..3059e2d0cd33c1e3ca52052aef4209b32dfa3c3b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
@@ -28,7 +28,7 @@ QEMU_AUDIO_DRV=none \
 -device xio3130-downstream,port=0x4,chassis=10,id=pci.10,bus=pci.4,addr=0x4 \
 -device xio3130-downstream,port=0x5,chassis=11,id=pci.11,bus=pci.4,addr=0x5 \
 -device xio3130-downstream,port=0x6,chassis=12,id=pci.12,bus=pci.4,addr=0x6 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
index 2d25b34f43d6d8f91b4b350b7d90129e0a16f802..01c26930259d33d5c74105413573bfa8ef916cf3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \
 -device x3130-upstream,id=pci.5,bus=pci.3,addr=0x0 \
 -device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
index 5dd9e6c9ecfd3a311cf50262304e844ac87554df..cf20760bc18907c9ef163f78df5121f88237d730 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -global q35-pcihost.pci-hole64-size=1048576K \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
index 17a8fabd8f2c9881cc268b0cd967354e3ba3b51a..413231b2d6e85b9a7f0c09d63d311e177b6a2e26 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -device spapr-vscsi,id=scsi0,reg=0x2000 \
 -device spapr-vscsi,id=scsi1,reg=0x30000000 \
 -usb \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0,format=raw \
 -device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\
 id=scsi1-0-0-0 \
 -chardev pty,id=charserial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
index bd2a89e89064a11b65c713a8bb7621e3e93a4312..5962d4a94320b2737242a1e866c4da24c1af5a0d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -device spapr-vscsi,id=scsi0,reg=0x2000 \
 -device spapr-vscsi,id=scsi1,reg=0x3000 \
 -usb \
--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0,format=raw \
 -device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\
 id=scsi1-0-0-0 \
 -chardev pty,id=charserial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
index faa407fe55011aa7cb69fa734d3402522568f69f..7020e6027ba96e47e31c8abba9a74d7cc2ee6883 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
index d48f28d482759a8f6cd29ea3e89c11a1b15ecbee..a0226003b5a19d9bf1cb9a526ba4d1a5ebf155ef 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
index a517f168437b08d927d4e8f23f96a6af753c9e9f..b6f76271eb4dfc36bb5b6ff88cef2c2cc8bfea46 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
@@ -18,7 +18,7 @@ BAR='' \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
index e03bb8df408b02dbdfd4973d0fce278ac4f8eedd..a5e82fed37cbb7cfe991dcb140df2ae88b777eb0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
index 2e814a345d9614e7607384eab57be814ba56d2c8..44896c280707e18bb89f8f227ce5b0ea582d0a52 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
index 4f85749623ad67a0be876b9ce59906f645da4214..1b53ca972c4f1128525f589b4618b4210c263907 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -device virtio-serial-s390,id=virtio-serial0 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
index 4f85749623ad67a0be876b9ce59906f645da4214..1b53ca972c4f1128525f589b4618b4210c263907 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -device virtio-serial-s390,id=virtio-serial0 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
index b0c3b2647deaaae524d974846b795ec67615bb91..49709c3021416a6f76c664043dfa1053193dabf4 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
--drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
index edfb9c6e30a07ed7da1e5590805fae0f396a17d0..1ad0975dd208e1d9d68a0f97fac91c61c9c54a07 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
index 0a77fba5dafb55b201af6ab57e75f1237131ae18..0b5b488504f628435fcc08d2546392af65f84348 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
index 6cc64ef72b03b1939162d0a3b5e176d666c22753..778421ec073935f534030a1aa17cb0f303f4472b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial /dev/ttyS2 \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
index e2e8ba8f221ecca406da082b7446e5ddfa8d9596..64fcd297c6284d2b7a0ef00eaf8e3561c990dcfb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev file,id=charserial0,path=/tmp/serial.log \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
index 9fced8fd319dca31e0ecefc283bc34c7b617ccc4..14e07da923b86f24960fc6e39f45758d3c5b6794 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial file:/tmp/serial.log \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
index 07c230164c60478b1666f5ab4772848736001f7e..963fcdf532029d7f628b236a934f5c84b97389bf 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
index e71522c5e4aebedb3e3d803f2b91cb37b7cc13bf..8ab4d8c2cad2024a6fbe31af937b53b8d0ef1ce3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial pty \
 -serial file:/tmp/serial.log \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
index 1e071636ae8a89b6246b62c237315e4bf6698977..38b140cb0ccf1e22592de46097eb633eff1f9668 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
index 8dab65cf7021953fb64e8910615049ec8f8f2d3b..a4e4df7543bd7dee2ae52e47a3ce9fde6522ed95 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial pty \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
index 7a531fb531e2e6e4b85bc971a929e458e1f054eb..6f74a494ca6e8d63a279ece0c05b6a019c8c6561 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
index fa229c4a3690d2cc0a680bab04226826c2709739..99aeccfeb3803f5bb7295a85ae61081c1e8a5f49 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
index a934726208d598860f2fb9b8bc5cb626cec5c7b9..c589dc4b4a9ff9f899d2e21e9e9d10b09f82b4cc 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
index 33a95e7a1a3f7cfcba31697e566cbcc3329c75ca..806cd0a90c940a64e5c4705f26e4afdc297fea44 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
index 10e9524f82193fe496fa57bd13bc3eb02c9a0639..26e494a5b25a0dbd033b24fb596e240410eac3ff 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial telnet:127.0.0.1:9999,server,nowait \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
index f2b56f43e71f56a84115c47cf081abe89ccb0a96..dc0e722491e7e990617426a6d7ff98d820064f29 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial tcp:127.0.0.1:9999 \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
index 610f223d4f93dd9949a4cd387562ad947c27ea44..dcc1b904df7b0a6bf282b7cd4472db4d9f786240 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,\
 localport=9999 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
index 716e65e62e12c6d851e42302ca4addf646b81faf..df4bf2d704445df2d73fb6930cc4420e488f5afa 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial udp:127.0.0.1:9998@127.0.0.1:9999 \
 -serial udp::9999@:0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
index d5bab357bbcebda671096026a7988193d8877ed6..a427c51c31768ddb769aedf3d0d064badd31348f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charserial0,path=/tmp/serial.sock \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
index f9ace325f868095cda5c84389659e8ed34e2a4ff..41e71cf55c60bff47a60dcffdd88e5fd37c3dd84 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial unix:/tmp/serial.sock \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
index 3c475a627a44a2eb0827934021dd7fcdaf22e01e..ad6d151cfd69ff34818e2054a2b3e9b81795e43e 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev vc,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
index 5768089b755ede9557d4369259a5adb197e2cb1d..72c1aaa9e95086bff8e3a5250fda39c59cb5fa3e 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial vc \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
index 0203147ccbbdb7c844028ec924229afd3522a91e..1d61a84eb70a735c933ba2380bf03ae5c8d548cf 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
@@ -22,7 +22,7 @@ serial=CZC1065993,asset=CZC1065993,location=Upside down' \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
index 886cfd936381b05e681e047843a0933ede209415..5ebbedde04701179812b4b26953431efa61694f0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
index 8974d5039931b8c09ade64700ba8a2e71a990524..5fea15379f7bd3c74bf07533af351054fd8c7374 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -soundhw pcspk \
 -device ES1370,id=sound1,bus=pci.0,addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
index e72b272723e6f87fed7007095e9edbaed74840ea..2d1e2672254c732b84841bdcd70b62027c9f4f6f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
index 06f94073d2dc133fc0742443fd8d9a1a2eb2d7e4..3116c4f4f7a02e5197e7e97ae2ffc93cf01f80a3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -vnc 127.0.0.1:-5900 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
index 164f3203bace1df6daff13a54761a2cce541d96c..f85708c4f5476cd35186d3826acd63f09e377f30 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\
 bus=pci.0,addr=0x2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
index 12ef653f8f093cfb369fa7d23762bf7615d3aea3..ad5a7755d1f8cba5ea8b74c353c0da81b21e56c3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\
 addr=0x2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
index f9da7e0ce30c0c8b4dbc8987c9af14867b731b90..8427c00e062d9bbe0d006b8c104ed74b8d8b7718 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=none \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\
+cache=none \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
index ac9a798dc20d7c4d8ca31edbc2114d141ea82679..28dc75ce8d2827747305f1e204cdeecdabfb6533 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\
 bus=pci.0,addr=0x2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
index d4c386e0a1a44606351389496a5e076c778c34e8..b7312c37c2bcd5c0b44cb3323038f1bed736a042 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\
 addr=0x2 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
index 7824a510d3ce53e9f29e2d91069a481247eda986..0935b7d597f3c7b6a285920b33799f7e7a838bc2 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
index c803e0bb83503f445253127896c28d3ff5d7b659..6a21a799484d0e72e9e0e6b5fac6a9f477257f35 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
-cache=none \
+format=qcow2,cache=none \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
index db2f87e1a62c983cf553a7df27811646221ae6ed..27e5b4ea8a47dc6c6267b70c677ca2544fa2d9b6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=none \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\
+cache=none \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
index a014c559360e441ca40db8746a45b3d4ad37dfa3..302c634daf130efc7f78da8181b18a088a060e53 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
@@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \
 -boot dc \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
--drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/sdfake,if=none,id=drive-virtio-disk0,format=qcow2 \
 -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
--drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1 \
+-drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1,format=qcow2 \
 -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
index b849f134a01a86f63823a01a5b7bd44861e20222..2591c3d7660c1a204a8a5a20ae281f2d926e01da 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\
 bootindex=1 \
 -chardev pty,id=charconsole0 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
index 63b3f8785ff858fc5b3a4df6669a94ed36e0d852..157f46bec7c90ec97fc8f40d76ebc5f304ca2a7d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device ib700,id=watchdog0 \
 -watchdog-action poweroff \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
index c384b633b00f491a312665a353041db45672500f..c32065625250ae6173e4c7a8102a6ef84c34dde0 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=readline \
 -no-acpi \
--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \
 -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -device diag288,id=watchdog0 \
 -watchdog-action inject-nmi

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
index fe28c3c11acad84dfefb89c7cab638aa9aec2a66..ba12816250800f4203194de43fdc1aa8f7e67bdc 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
index 0dd622e15f375e8bd9389a775f4e210712641dbd..06af337a2050c0c3eccf4d824a9849b72959948f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
index 5eac1cf7f88b39257986faee12bacdd4c2819516..6bd2f916be8a555133f4d8b0f0fefd9acaa8a98b 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none \

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4fc50c24f77399ee60ccd0f64fd880e24671b135..bec8a7588d2b06f0bc84f5d52116af2c50be7ba7 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -656,7 +656,7 @@ mymain(void)
 
     DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA);
     DO_TEST("bios-nvram", QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_READONLY);
+            QEMU_CAPS_DRIVE_READONLY);
     DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG);
     DO_TEST("clock-localtime", NONE);
     DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
@@ -754,66 +754,50 @@ mymain(void)
     DO_TEST("disk-drive-boot-cdrom",
             QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("floppy-drive-fat",
-            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-fat",
-            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-readonly-disk",
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-readonly-no-device",
             QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-fmt-qcow",
-            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-shared",
-            QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL);
+            QEMU_CAPS_DRIVE_SERIAL);
     DO_TEST("disk-drive-error-policy-stop",
-            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON);
     DO_TEST("disk-drive-error-policy-enospace",
-            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON);
     DO_TEST("disk-drive-error-policy-wreport-rignore",
-            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-cache-v2-wt",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-cache-v2-wb",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-cache-v2-none",
-            QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON);
+    DO_TEST("disk-drive-cache-v2-wt", NONE);
+    DO_TEST("disk-drive-cache-v2-wb", NONE);
+    DO_TEST("disk-drive-cache-v2-none", NONE);
     DO_TEST("disk-drive-cache-directsync",
-            QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
     DO_TEST("disk-drive-cache-unsafe",
-            QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_UNSAFE);
     DO_TEST("disk-drive-copy-on-read",
-            QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-nbd",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-nbd-export",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-nbd-ipv6",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-nbd-ipv6-export",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-nbd-unix",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-iscsi",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-iscsi-auth",
-            QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_COPY_ON_READ);
+    DO_TEST("disk-drive-network-nbd", NONE);
+    DO_TEST("disk-drive-network-nbd-export", NONE);
+    DO_TEST("disk-drive-network-nbd-ipv6", NONE);
+    DO_TEST("disk-drive-network-nbd-ipv6-export", NONE);
+    DO_TEST("disk-drive-network-nbd-unix", NONE);
+    DO_TEST("disk-drive-network-iscsi", NONE);
+    DO_TEST("disk-drive-network-iscsi-auth", NONE);
     DO_TEST("disk-drive-network-iscsi-lun",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_FORMAT,
+            QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_BLOCK);
-    DO_TEST("disk-drive-network-gluster",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-rbd",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-sheepdog",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-rbd-auth",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST("disk-drive-network-rbd-ipv6",
-            QEMU_CAPS_DRIVE_FORMAT);
-    DO_TEST_FAILURE("disk-drive-network-rbd-no-colon",
-                    QEMU_CAPS_DRIVE_FORMAT);
+    DO_TEST("disk-drive-network-gluster", NONE);
+    DO_TEST("disk-drive-network-rbd", NONE);
+    DO_TEST("disk-drive-network-sheepdog", NONE);
+    DO_TEST("disk-drive-network-rbd-auth", NONE);
+    DO_TEST("disk-drive-network-rbd-ipv6", NONE);
+    DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE);
     DO_TEST("disk-drive-no-boot",
             QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
     DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
@@ -873,8 +857,7 @@ mymain(void)
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
     DO_TEST("disk-aio",
-            QEMU_CAPS_DRIVE_AIO,
-            QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_AIO);
     DO_TEST("disk-source-pool",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-source-pool-mode",
@@ -890,8 +873,7 @@ mymain(void)
     DO_TEST("disk-drive-discard",
             QEMU_CAPS_DRIVE_DISCARD,
             QEMU_CAPS_DEVICE);
-    DO_TEST("disk-snapshot",
-            QEMU_CAPS_DRIVE_FORMAT);
+    DO_TEST("disk-snapshot", NONE);
     DO_TEST_FAILURE("disk-same-targets",
                     QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI,
                     QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
index d9042446dfda2729bdf4e6375957b9a79eb17379..c25a069e539c6c2872a541112c859842a64ede1b 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none ARGUMENT

diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
index 37a02e80028857d9b3f535d1d380e7ed86159633..fc420404c870f803da62224c185e2b250ce87ce1 100644 (file)
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -net none \
 -serial none \
 -parallel none