[PATCH 078/103] qemu: capabilities: Retire QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX

Peter Krempa pkrempa at redhat.com
Thu Oct 7 15:18:06 UTC 2021


Both are assumed as always present since last commit.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                       | 6 ++----
 src/qemu/qemu_capabilities.h                       | 4 ++--
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml    | 2 --
 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml  | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml    | 2 --
 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml    | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml    | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml    | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml    | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml   | 2 --
 38 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b60ed5ca2f..9a87f40743 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -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 */

@@ -1402,7 +1402,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 },
@@ -1419,7 +1418,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 },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d2e9e9a598..72cd4700a9 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -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 */

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index b7996f02c4..2bade882a4 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 2271812d34..2c432bff9e 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 66e1661f20..8a927796bc 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 265e0d9f2f..a68605f4dd 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 15625dd1a9..b711c05eff 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 00d1df5d53..429c0c260e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 1f9357d674..2e81e837a2 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 6d5539277e..19a9f31860 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index b621b0a798..be1283d449 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 24ea8eefb3..d0d7e26055 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index c09335e376..738e781aae 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index ee213e5403..02fc0df0b3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 94541c38db..bc0cc57eec 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 03ef0262be..2692dcbe6d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 3e3a713280..e2bcfd788c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 38898324bf..a57d2dbc09 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 1c309c2d9a..624dd5344b 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index a4a35951ca..757cdf0504 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 5f516c4e47..a466bc51b9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index e880018ef1..bb65c49f5d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 783c9ca5d2..8c10fa260d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index a052800d30..28ba47afd7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 493504d640..920feb1f07 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 51b36e7b5e..e97419a08b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 636ef0fb6f..c6f183769e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 4099bf144c..4398da6599 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 4798ab7d96..40904c8803 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index de9b785459..042060235e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 4c280f0b96..61328e1987 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index eba031c41d..5f7b02a396 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index c043ada9a6..3c653acbde 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index c7ee6c39f1..bd2dc77d21 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 2c197bc40a..0c897137a4 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 47155f6e5c..5d75b2ef63 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 9cfa4faae6..dc0c01c25b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -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'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 12ed6d2101..87ca50b2c6 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -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.31.1




More information about the libvir-list mailing list