提交 d91890f3 编写于 作者: J Ján Tomko

qemu: deprecate QEMU_CAPS_NETDEV_BRIDGE

Unused since commit <2d80fbb1>.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 da6df1be
...@@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = { ...@@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
static void static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{ {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
......
...@@ -188,7 +188,7 @@ typedef enum { ...@@ -188,7 +188,7 @@ typedef enum {
QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */
/* 100 */ /* 100 */
QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */
QEMU_CAPS_SCSI_LSI, /* -device lsi */ QEMU_CAPS_SCSI_LSI, /* -device lsi */
QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */
QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<flag name='scsi-cd'/> <flag name='scsi-cd'/>
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
<flag name='scsi-disk.wwn'/> <flag name='scsi-disk.wwn'/>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<flag name='dump-guest-memory'/> <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/> <flag name='nec-usb-xhci'/>
<flag name='balloon-event'/> <flag name='balloon-event'/>
<flag name='bridge'/>
<flag name='lsi'/> <flag name='lsi'/>
<flag name='virtio-scsi-pci'/> <flag name='virtio-scsi-pci'/>
<flag name='blockio'/> <flag name='blockio'/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册