qemu: retire QEMU_CAPS_VIRTIO_TX_ALG

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5adde83a2e9ec4a48f703fd0cb8aa4cee962f6a1..4fca7744259dea12b9b9dc22d20a3806c24f9536 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -144,7 +144,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 55 */
               "device-spicevmc", /* X_QEMU_CAPS_DEVICE_SPICEVMC */
-              "virtio-tx-alg", /* QEMU_CAPS_VIRTIO_TX_ALG */
+              "virtio-tx-alg", /* X_QEMU_CAPS_VIRTIO_TX_ALG */
               "device-qxl-vga", /* X_QEMU_CAPS_DEVICE_QXL_VGA */
               "pci-multifunction", /* X_QEMU_CAPS_PCI_MULTIFUNCTION */
               "virtio-blk-pci.ioeventfd", /* X_QEMU_CAPS_VIRTIO_IOEVENTFD */
@@ -1439,7 +1439,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = {
-    { "tx", QEMU_CAPS_VIRTIO_TX_ALG, 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 6c1b43d69f64a9e63f04d2513efd93282ca52977..fc8bb6e2ab494a8629ff1d28f0969e9db82a93a5 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -122,7 +122,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 55 */
     X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc */
-    QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
+    X_QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
     X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */
     X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */
     X_QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=on */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index c80ccfcdfc08d4d19f560f489512cde8b1bdd8bb..de3ef449fe38ad45637f6519c7c1ea307326f268 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 96975114d3a48179ee94bb7caac4c4b1f7e4b3d3..173023c70439422c13573c12d890623823194800 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 d29feec20983849a7b5ff86028b447cbfcd4bec3..141d82857f882cd882d6ccd32b4aaa8c385bcfbc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -5,7 +5,6 @@
   <selfvers>0</selfvers>
   <flag name='kvm'/>
   <flag name='sdl'/>
-  <flag name='virtio-tx-alg'/>
   <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 8a54a8865a678dba0728d13c991cf8cc93cc3205..04c3b206f7a18f67d212a522a739c32694e824eb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 c98bb55f02f3f9906ee391654b776ae7ad9240fc..9d876a3408c19d966c4d55c5d2c5eafcd52fdee3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 8fbe7bbe1eb0675bda13bdca7985d45aa469417a..b1353f23ebf5a46162e0829d17be2545a944dd01 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 62520103ae95cd5e6507d1258fd49d5d747743d4..92e51a478a8f8e2086e0e393cbf897451751af57 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -8,7 +8,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 52f6e9fdbab53cca1c1f23cc4d12de14fd31a451..70843813bc505d5a4f654801862d105c7775b1c7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 b111184c5f8eb9b14e90f1385ddac0d71d3831e6..c42773772470f57965bb95b7b351cce1df4991c5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 7c52fe68d6e4993c576addc8133939bf330f06c7..b3099f138adf31cc890394ad4f159e1692c92176 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 015dcb7a6689bd27b90164108d7f0da19d1020a4..cab644c543ffed376b7e5c5c4cc36ccb1685644b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 d3e71aa7ce21b91ef3ba1c54f5cc1c11cac2ede3..5b86d9bfc6aca9905606eeeacc28a2207b44d84c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -8,7 +8,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 39381c219e0ead339c9851be66432e6a70926edd..e491de1c715114bcb781955081aaff65167e0e3e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -5,7 +5,6 @@
   <selfvers>0</selfvers>
   <flag name='kvm'/>
   <flag name='sdl'/>
-  <flag name='virtio-tx-alg'/>
   <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 cc5f4bef5666c16cc15c9d6bd74ecbfbc85dffe2..5fe99a7e790c3689ec7e3cae193a8161e4d1baf4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 55c25340a8dfd9fef974d453b1844f59cc4ae5a1..5a436168886d4515e7b161c8353985ab4811c995 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='sdl'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <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 9503af76f9b9f1d2114ae7038206b21cde4d8a53..a6fcfed213cc09d45280a4b4c72fec40dc2573d1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -5,7 +5,6 @@
   <selfvers>0</selfvers>
   <flag name='kvm'/>
   <flag name='sdl'/>
-  <flag name='virtio-tx-alg'/>
   <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 a025d7dad5638e63d2a638af6ddfe34005db404d..b96c8c2d2b13f00b9a34a1a10cb6e8399f426825 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <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 01a258d2f3296625f93a20f39b2501ca92f31f0b..35bd9b632713babc48946fd623f627053f9db995 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 152600bfae6fa1cf2a5e33815bf2ed4806fc59b8..663b94b1ff56dd5eedf88925fec58014445051f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -9,7 +9,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index e34a6e5d00682fd8f728db7555b1e78bb0a7e542..2468780a5188be744dff53cb9ebbf34ae42c0ed7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -5,7 +5,6 @@
   <selfvers>0</selfvers>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 699c3cff3a9c9c3c99d99daef3c42ff4e4b46ee6..e3f9ee47bd89a84e41b7e4d71110f9b0dde931df 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index d57b80ceb20b58c4f733003f7c72a87705874c84..5ca77807efc0d462176e5b3d549a50d78c6747ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -9,7 +9,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 4c29a96360b5529b5d8180e3a0534226210bfe88..cd41a08fa9a514aa1f36972db213bc2048e81e03 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -8,7 +8,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index e1d2e50785bad22b64ee1a7c79aa35c864b37f8f..86fe88b878e847b583befb1b5cbd3f7f237517e1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index fa66d192a1752dece358054059b6c93d24b8d8b9..ad433855948fa379c71268199aeee60418cc1c64 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
-  <flag name='virtio-tx-alg'/>
   <flag name='piix3-usb-uhci'/>
   <flag name='piix4-usb-uhci'/>
   <flag name='usb-ehci'/>