[libvirt] [libvirt PATCH v2 35/44] Deprecate QEMU_CAPS_NETDEV_BRIDGE

Unused since commit <2d80fbb1>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- 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 - 27 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4dc94b8561..c242886c85 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3629,7 +3629,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); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b36693f072..2b9b55ac45 100644 --- 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 */ diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index bcc623e020..dad34c6883 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 0d65b93608..b571fd5d82 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index e58ede2425..181d6f8934 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 18b0613570..b9a6f7251e 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index f07d222ed4..c667f43429 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 716c174ae4..c083d67d28 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 47d6bd1345..e43887630e 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index f95826e1a3..bba2af0b88 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 4eef916529..0d02329fe7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index da2429a495..75caa40320 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index fce252e494..d1c9e15e08 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 80ba875fac..de9f072bb7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4c34cbe5b8..8ba2f82cf5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1709f57770..867142bfc2 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ff1c073de7..9cd8f46555 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 0ebb86ec89..9445d48aa4 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index d196dd28f4..0de4f85248 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 0b96bdd176..fcbfccc638 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b7d398066a..f15c4a0359 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 2ed18713d3..734d791ff7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 1afe2da3b3..65f62eb49c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 51a918219e..c4ff3470d8 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 158fa49763..3bd1c9d466 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index ada4b403e0..0c1c610f86 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 6a824ecf9e..65546aca66 100644 --- 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'/> -- 2.16.1