qemu: deprecate QEMU_CAPS_DRIVE_SERIAL

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b41955a7d08bb811d67aacc3afc94c32df24b9f2..27180e85090b96175795df7268661b4fa2a828dd 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3637,7 +3637,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index cb588886c680265a87e5ade8f7c97e52e73d29fd..3a8ffcd0e722725ee35c69e6bd1629a1df0ce280 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -73,7 +73,7 @@ typedef enum {
     X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */
     X_QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */
     X_QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */
-    QEMU_CAPS_DRIVE_SERIAL, /* -driver serial=  available */
+    X_QEMU_CAPS_DRIVE_SERIAL, /* -driver serial=  available */
 
     /* 20 */
     X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b42b8c98dee82a721777ae986674a26d1b5368e..f864350bd5f624a530e4a717a28abc4d602fff8f 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1340,14 +1340,12 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk,
 
     if (qemuCaps) {
         if (disk->serial &&
-            virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) {
-            if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI &&
-                disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("scsi-block 'lun' devices do not support the "
-                                 "serial property"));
-                return -1;
-            }
+            disk->bus == VIR_DOMAIN_DISK_BUS_SCSI &&
+            disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("scsi-block 'lun' devices do not support the "
+                             "serial property"));
+            return -1;
         }
 
         if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC &&
@@ -1685,7 +1683,6 @@ qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk,
 
 static void
 qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,
-                                virQEMUCapsPtr qemuCaps,
                                 virBufferPtr buf)
 {
     /* generate geometry command string */
@@ -1702,8 +1699,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,
                               virDomainDiskGeometryTransTypeToString(disk->geometry.trans));
     }
 
-    if (disk->serial &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) {
+    if (disk->serial) {
         virBufferAddLit(buf, ",serial=");
         virBufferEscape(buf, '\\', " ", "%s", disk->serial);
     }
@@ -1752,7 +1748,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
 
     /* Format attributes for the drive itself (not the storage backing it) which
      * we've formatted historically with -drive */
-    qemuBuildDiskFrontendAttributes(disk, qemuCaps, &opt);
+    qemuBuildDiskFrontendAttributes(disk, &opt);
 
     /* While this is a frontend attribute, it only makes sense to be used when
      * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used.

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 891cb25e8b7c1fd7631c216a1c7d6666de6fd1e0..1b09d41083ee8c211936ebdbce0ef78448446b8a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 2d9b18c72ab58d6c51b25aa44087e3681888b2f8..96f6a3c2ef13c10ef60189e75bc362c12b2ce07f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index dbe56d74655507697dc860568c1dcb2dd9773fd7..ff7f5e139b8e3ec75281e10a4b8fd05ca2e9f1f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 4f4399c7d237d64961cc577c2aec40ce85c95f65..ca98ee14dbd6a71eb33011e7204dac94e53a5777 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 325850bcbbe2d93509c39d85d5b6c871180728c5..1b3080a7880d01cbc9ae078173e7f731a66220df 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 41959fdb96abcc0b5c1aceb6b8e5c398719dded9..3f518f9207aeaea742643b26fbe55a5d4b7e977c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 9d6c57d8b8bfe19cf7c79d542a0ecc6f54ba7c78..b1b6d66c679998bfdc0f0744a8496055b1fbdee7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 1203958b0a06b9ff8befee555f79719f048cf3c2..cad21498e1eec6df1423b6ab72a51539637c9578 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index a2ea35f2e81e5f3a60e2492284564171653dfb9b..3a77b04d4f22a9aa53c3e973b13f15c7a982a4a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 45a81de582838170d356348d740ba1d37f528a93..b9c589e09285dfaeefe040c3d25e6f3bfb4275d2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 8eb6f802316e048f06a140b083279d060c78f884..8094139624346cf83d78308d05a84238ce9d2c8a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 16f4c4e3548550bbb9260b5b698d81e2eff99aaf..210ebb1a13fd4909fac85e9f99d4bea8996d55fa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -3,7 +3,6 @@
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
   <usedQMP/>
-  <flag name='drive-serial'/>
   <flag name='enable-kvm'/>
   <flag name='sdl'/>
   <flag name='rtc'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 54971485c15eb344b8ff68d2277beb294b4a567b..9d477f7fec41f42f9d81457af28a75007b1c5db2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 1ad8ce62c6646b3754ff664fd25042cb21aff835..a94a47ee5dfa07084feb1cef6287d290a29ed8f0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index fdc6b4b73ff6c24ebbd4168822ea2ca96079fff2..7576e0b1dde709110ab166b0368d2f50784a4353 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index a3a6400143dd621234cc38641daf7588687355f7..34bc3919ea6444f5cd8f2b6dbc3793e60d2cd295 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index c8e31f336cd3efac520cefe5fd3800dfac5f0aef..9ae59448ba304b5d537d3bf0a1e8e5698c22e0de 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 3c4452f7eefe29a2b99fbda1dc9389d6f7638bb9..748b5ebc56e7af3b4269161c3cbe5c6beba1cec6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 96ec062cfce3997c61ca4fa893339ad475b82e9c..c35cade3df2d646590bb485e31ff3d82a940ad9c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 0ed1ab5c53c750b4510647cdc193d3f6fc1fe28e..b9e5b31108f25e572a2c0bd714a76d75256b9645 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index ac01f3d5a5cc7c5274ac33af6e67328e224b3504..82d7dd79169cd780ce0cefe27f659525768dc40a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index a78a6c35c54a748d0abf6175ee5c1d33b54a4718..2cdd4923163e8f332ae4135893ada9ee24ed36f6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 15516df5f64e4a5c9dc8fa9b1509efa995f08d14..7c8973ae05805079c482be87c8670d4542b635ed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index ee820d252b4cb93974c80a2e47a4f47c47344d5d..d99924f996d4a1390c1b966fb509a65671929444 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index d9ba0e19c32d7dbc49b96eb7c21849056b7eabb3..5bd53f71f58637fdb153f97800a43c8124121aee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='drive-serial'/>
   <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
index b4298b11a7d0362b93d99473d56abee27115f006..601bcfd8316b22c0d81bae804b19ec15cea4c75b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
@@ -26,7 +26,7 @@ endpoint=client,verify-peer=yes \
 -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\
 file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\
 file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\
-id=drive-virtio-disk0,cache=none \
+id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0 \
 -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs,\
@@ -34,11 +34,11 @@ endpoint=client,verify-peer=yes \
 -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\
 file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\
 file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\
-id=drive-virtio-disk1,cache=none \
+id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
 id=virtio-disk1 \
 -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\
 file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\
-id=drive-virtio-disk2,cache=none \
+id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\
 id=virtio-disk2

diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args
index 6387696016923f16f3ec8424e3ddde6819446005..e8d6344c1a823bbedea33fab1e6168e6a68878ad 100644 (file)
--- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args
@@ -23,6 +23,6 @@ server,nowait \
 -usb \
 -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\
 file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\
-id=drive-virtio-disk0,cache=none \
+id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 41f025571ba62754fe814e4b2af71f1bd4c78a0e..3fb9168f7846e8581ae57c1d7d5c6d9261834e32 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -23,7 +23,7 @@ server,nowait \
 -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\
-readonly=on \
+serial=WD-WMAP9A966149,readonly=on \
 -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,format=raw,if=none,id=drive-scsi0-0-0-0 \

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 78754199c896252bceef3783c2d0d5cc63879794..8e5d79834d8a7b2ff360b94098f8b93291a7f537 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -948,8 +948,7 @@ mymain(void)
     DO_TEST_PARSE_ERROR("disk-drive-fmt-cow", QEMU_CAPS_DRIVE_BOOT);
     DO_TEST_PARSE_ERROR("disk-drive-fmt-dir", QEMU_CAPS_DRIVE_BOOT);
     DO_TEST_PARSE_ERROR("disk-drive-fmt-iso", QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST("disk-drive-shared",
-            QEMU_CAPS_DRIVE_SERIAL);
+    DO_TEST("disk-drive-shared", NONE);
     DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE);
     DO_TEST("disk-drive-shared-locking",
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW);
@@ -1097,8 +1096,7 @@ mymain(void)
             QEMU_CAPS_SCSI_BLOCK,
             QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-serial",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_DRIVE_SERIAL);
+            QEMU_CAPS_KVM);
     DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address",
                         NONE);
     DO_TEST_PARSE_ERROR("disk-ide-incompatible-address",
@@ -2007,7 +2005,7 @@ mymain(void)
             QEMU_CAPS_IDE_CD);
     DO_TEST("disk-ide-wwn",
             QEMU_CAPS_IDE_CD,
-            QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_IDE_DRIVE_WWN);
+            QEMU_CAPS_IDE_DRIVE_WWN);
 
     DO_TEST("disk-geometry", NONE);
     DO_TEST("disk-blockio",