[PATCH 13/44] Deprecate QEMU_CAPS_DRIVE_SERIAL

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                         |  1 -
 src/qemu/qemu_capabilities.h                         |  2 +-
 src/qemu/qemu_command.c                              | 20 ++++++++------------
 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml      |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml      |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml      |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml     |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml      |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml      |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml     |  1 -
 .../disk-drive-network-tlsx509-vxhs.args             |  6 +++---
 tests/qemuxml2argvdata/disk-drive-network-vxhs.args  |  2 +-
 tests/qemuxml2argvdata/disk-scsi-disk-wwn.args       |  2 +-
 tests/qemuxml2argvtest.c                             |  8 +++-----
 34 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index bb2fd0544..6b16662fe 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3633,7 +3633,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 3d7239085..3073446ee 100644
--- 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 7fd05ec76..2ab3dcb10 100644
--- 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 &&
@@ -1677,7 +1675,6 @@ qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk,
 
 static void
 qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,
-                                virQEMUCapsPtr qemuCaps,
                                 virBufferPtr buf)
 {
     /* generate geometry command string */
@@ -1694,8 +1691,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);
     }
@@ -1742,7 +1738,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.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 898badc59..be0412bd2 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.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_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 5f7415eb9..2dbc1b913 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.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.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 891cb25e8..1b09d4108 100644
--- 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 2d9b18c72..96f6a3c2e 100644
--- 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 dbe56d746..ff7f5e139 100644
--- 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 4f4399c7d..ca98ee14d 100644
--- 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 29bb8846f..146f0f0b8 100644
--- 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 c9fbdc897..5df71879f 100644
--- 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 a3c5c6084..5bc204e14 100644
--- 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 218700913..3d59e0e3b 100644
--- 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 895752990..2fbd794ec 100644
--- 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 02d4c47d5..6aa99fac9 100644
--- 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 323148c5f..744a95481 100644
--- 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 45676a091..5e2ac1d96 100644
--- 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 3ac161a76..cc05d2dd9 100644
--- 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 1ad8ce62c..a94a47ee5 100644
--- 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 fdc6b4b73..7576e0b1d 100644
--- 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 a3a640014..34bc3919e 100644
--- 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 c8e31f336..9ae59448b 100644
--- 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 3c4452f7e..748b5ebc5 100644
--- 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 96ec062cf..c35cade3d 100644
--- 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 0ed1ab5c5..b9e5b3110 100644
--- 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 ac01f3d5a..82d7dd791 100644
--- 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 a78a6c35c..2cdd49231 100644
--- 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 15516df5f..7c8973ae0 100644
--- 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 ee820d252..d99924f99 100644
--- 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 d9ba0e19c..5bd53f71f 100644
--- 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 b4298b11a..601bcfd83 100644
--- 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 638769601..e8d6344c1 100644
--- 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 41f025571..3fb9168f7 100644
--- 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 076b1a137..346382c8f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -910,8 +910,7 @@ mymain(void)
             QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-fmt-qcow",
             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);
@@ -1059,8 +1058,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",
@@ -1966,7 +1964,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",
-- 
2.16.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux