qemu: deprecate QEMU_CAPS_NETDEV_BRIDGE

Unused since commit <2d80fbb1>. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-29 12:51:55 +02:00 · 2018-03-29 12:51:55 +02:00 · d91890f30c
parent da6df1be8c
commit d91890f30c
27 changed files with 1 additions and 27 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -188,7 +188,7 @@ typedef enum {
    QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */

    /* 100 */
-    QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */
+    X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */
    QEMU_CAPS_SCSI_LSI, /* -device lsi */
    QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */
    QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -30,7 +30,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -29,7 +29,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -30,7 +30,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -29,7 +29,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -37,7 +37,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@ -32,7 +32,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@ -29,7 +29,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@ -29,7 +29,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@ -17,7 +17,6 @@
  <flag name='scsi-cd'/>
  <flag name='dump-guest-memory'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>
  <flag name='scsi-disk.wwn'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@ -39,7 +39,6 @@
  <flag name='dump-guest-memory'/>
  <flag name='nec-usb-xhci'/>
  <flag name='balloon-event'/>
-  <flag name='bridge'/>
  <flag name='lsi'/>
  <flag name='virtio-scsi-pci'/>
  <flag name='blockio'/>