External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX

Browse Source 
Both are assumed as always present since last commit.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-04 15:39:07 +02:00
parent ea0f408474
commit 9616976433
38 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -152,8 +152,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 60 */
"sga", /* X_QEMU_CAPS_SGA */
"virtio-blk-pci.event_idx", /* QEMU_CAPS_VIRTIO_BLK_EVENT_IDX */
"virtio-net-pci.event_idx", /* QEMU_CAPS_VIRTIO_NET_EVENT_IDX */
"virtio-blk-pci.event_idx", /* X_QEMU_CAPS_VIRTIO_BLK_EVENT_IDX */
"virtio-net-pci.event_idx", /* X_QEMU_CAPS_VIRTIO_NET_EVENT_IDX */
"cache-directsync", /* X_QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC */
"piix3-usb-uhci", /* QEMU_CAPS_PIIX3_USB_UHCI */
@ -1403,7 +1403,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props,
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
{ "event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, NULL },
{ "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault },
{ "logical_block_size", QEMU_CAPS_BLOCKIO, NULL },
{ "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL },
@ -1420,7 +1419,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = {
{ "tx", QEMU_CAPS_VIRTIO_TX_ALG, NULL },
{ "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX, NULL },
{ "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, NULL },
{ "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL },
{ "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL },

4
src/qemu/qemu_capabilities.h
View File

@ -131,8 +131,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 60 */
X_QEMU_CAPS_SGA, /* Serial Graphics Adapter */
QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */
QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */
X_QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */
X_QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */
X_QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=directsync supported? */
QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */

2
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>

2
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>

2
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>

2
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -9,8 +9,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -9,8 +9,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>

2
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -9,8 +9,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
View File

@ -9,8 +9,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
View File

@ -7,8 +7,6 @@
<flag name='sdl'/>
<flag name='hda-duplex'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
View File

@ -6,8 +6,6 @@
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>

2
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

2
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
View File

@ -11,8 +11,6 @@
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>