qemu: capabilities: Retire QEMU_CAPS_NBD_SERVER

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3e9983bb96b152d723bff3f43b54cead14ce8cbb..e84310c79a395ae5f7814bf1ac90bdf5cebd98fb 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -242,7 +242,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 125 */
               "add-fd", /* X_QEMU_CAPS_ADD_FD */
-              "nbd-server", /* QEMU_CAPS_NBD_SERVER */
+              "nbd-server", /* X_QEMU_CAPS_NBD_SERVER */
               "virtio-rng", /* QEMU_CAPS_DEVICE_VIRTIO_RNG */
               "rng-random", /* QEMU_CAPS_OBJECT_RNG_RANDOM */
               "rng-egd", /* QEMU_CAPS_OBJECT_RNG_EGD */
@@ -1207,7 +1207,6 @@ struct virQEMUCapsStringFlags {
 struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-spice", QEMU_CAPS_SPICE },
     { "query-vnc", QEMU_CAPS_VNC },
-    { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
     { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
     { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
     { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 395a3281d33a355786faba77b82e54ceb63b59b1..9cd00ba81245151e33e6d95aa4ff924a5dedfb3f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -220,7 +220,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 125 */
     X_QEMU_CAPS_ADD_FD, /* -add-fd */
-    QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
+    X_QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
     QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */
     QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */
     QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 8af26b9e7aa5d2bcfdb4f55063787eb69036043a..8223d13409cc9363d8807f85b3c426d72b280d9c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 24a885c2798689732410bee62c91bff45805a5e4..96baa4e7bf232954f86eeec7bb63b5cdf13cbcfe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 2c4ba45d66fbff703bb1a588723ab8be9c56ee67..7bf042707705020b039d37ff19297a97a9eaee79 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -16,7 +16,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index f282f6d0ab007e8bb72e58a1bdd8072b8647bb49..245a0bd2fb0fee03db71a985d893c7c7ff967301 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -40,7 +40,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 50b42bca78212ed22d41c95240694f3bc709a650..250ad9d9146f04ccba8d7b0f5106077d57f671a4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 08146d22358a6176be9410be11981c7de39ea7b2..e356f431c25085b909ebf20b61799ea316c3abc0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9376367a6bebfd8038e7f52eb19b634d5588feab..19edb90927d320e8e7067b8bd433e70a3667bcc9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -34,7 +34,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 0438554086ba4207a14812ab4f63e419bcef88ed..46bbfac18602a5d6c352d4151407ecf4d3bf7567 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -40,7 +40,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 399d37218baf657d6a25406b2c0fc45ef614afc6..93ae1b6d0a8c41213e223d087a75ed8af9cedfc2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -12,7 +12,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
-  <flag name='nbd-server'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='enable-fips'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a94cf90d9bd8d93c9e6b4afa00d64040e434ed3f..9dbe8f1ca809d8e746d7099d8970b5abc8179745 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -40,7 +40,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 20101d8c3be05de1d4401d290da1cd5ca8b7ebe7..f4c9ad1bc4dc201b81fee39cf440c5f6cf1a5847 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 3ea86de12a5b4b5bb71cc0a86e82157ce4779bb8..b40b8a573548f76cb234c2fe48fcc6fe573c23a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 33efb8d36780c5e2618cdfe9a3f95c20a2222751..7b4915b67fc1a803d7f1cb1dabb120d99d149f5b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -34,7 +34,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 2b65c1a2f28c7e49a7fc558a61fe6b67b6530571..0523c8d22f0621dc5711b98cbdd9510a1c676ed2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -16,7 +16,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 0ca9043d738466ea9f12e49a07dc99de8b491a4b..c71275506a0686c3fb32be520620609da46a6daf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -40,7 +40,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 8502fca63301d0c27d80642fac37556035d320b5..e38e8fa5f5ee642f169cf4f4035ffd5f222b93ba 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -30,7 +30,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index a3a6b57d657586542af3ba0cd076f41fa7adc8e4..4f009def585d60fcb195e2000daacf1877d0c4ac 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -16,7 +16,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 545df89eb1ed78844858c45998e81f819b55ed3b..876a5afe43203e80f4e002ea8b20eb5fb0897c10 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 627eeb339592f0a0a02042d291d0ef2209e6fa16..f73c070c9e8b6b7387724b97cc81fee111efbcbf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index fa329f2cbcb174a346c53236b77076d262939fa4..234f386736a2ac1b3ee9845d4605f59eb6a3ab9e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -35,7 +35,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 365dd8904d61f6bc1541b221e536dab87c73a9d2..4e90d3953a99d22d314f2ee5d4d1c7070611c09f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index cc15970f6d641e77e153592b4e4ef3a2ea31ffb5..fd57627ad54c3f92a485c7fc195f5ccebd22967f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 3e60c19a598e6627c770aa929577201e6451ef85..19a6c3335372ac0b08125192f559b42ad4d65f12 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -35,7 +35,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 6f985a55d0c26782798eb61340a0267daafd4a77..0d3c321a679688a84ffebde2c68dc0e3fd17b22a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -36,7 +36,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index d48c1f733ce0c1cc62058ed4508864c08dd7480a..dc7b041294bf8bddf8095850f2e4068aa2326dfc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 9fb4ca58fa25b9643ca51511fa14e06b3e70cc19..5c60b7cf8849dde01a01ce5d4c008ccdbff27ed8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>