[libvirt PATCH 0/3] qemu: retire QEMU_CAPS_VIRTIO_TX_ALG
*** BRULB HERE *** Ján Tomko (3): tests: qemuxml2xmltest: remove interface from disk test qemu: always assume QEMU_CAPS_VIRTIO_TX_ALG qemu: retire QEMU_CAPS_VIRTIO_TX_ALG src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 36 +++++++++---------- src/qemu/qemu_validate.c | 8 ----- .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - .../caps_5.0.0.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - .../caps_7.1.0.x86_64.xml | 1 - .../disk-copy_on_read.x86_64-latest.args | 4 +-- tests/qemuxml2argvdata/disk-copy_on_read.xml | 5 --- tests/qemuxml2argvtest.c | 3 +- .../qemuxml2xmloutdata/disk-copy_on_read.xml | 8 +---- tests/qemuxml2xmltest.c | 4 +-- 34 files changed, 24 insertions(+), 74 deletions(-) -- 2.37.1
There is no need to specify an interface for a disk test. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- .../qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args | 4 +--- tests/qemuxml2argvdata/disk-copy_on_read.xml | 5 ----- tests/qemuxml2xmloutdata/disk-copy_on_read.xml | 8 +------- tests/qemuxml2xmltest.c | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 9041eda95a..98ddf685e2 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -36,9 +36,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \ --netdev user,id=hostnet0 \ --device '{"driver":"virtio-net-pci","tx":"bh","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.xml b/tests/qemuxml2argvdata/disk-copy_on_read.xml index 95f4715bbd..10f56a8a64 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/disk-copy_on_read.xml @@ -35,11 +35,6 @@ </controller> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> - <interface type='user'> - <mac address='52:54:00:e5:48:58'/> - <model type='virtio'/> - <driver name='vhost' txmode='iothread'/> - </interface> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml index b2581450e9..ae76cbafad 100644 --- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml +++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml @@ -39,17 +39,11 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='pci' index='0' model='pci-root'/> - <interface type='user'> - <mac address='52:54:00:e5:48:58'/> - <model type='virtio'/> - <driver name='vhost' txmode='iothread'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </interface> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 32e331ca5d..b55715e0f5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -747,7 +747,7 @@ mymain(void) DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset"); DO_TEST_NOCAPS("usb-ich9-ehci-addr"); - DO_TEST("disk-copy_on_read", QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST_NOCAPS("disk-copy_on_read"); DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); DO_TEST_CAPS_LATEST("tpm-emulator"); -- 2.37.1
Introduced back in 2010 by QEMU commit: commit a697a334b3c4d3250e6420f5d38550ea10eb5319 virtio-net: Introduce a new bottom half packet TX Released in QEMU 0.14.0 Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 36 +++++++++++++++++------------------- src/qemu/qemu_validate.c | 8 -------- tests/qemuxml2argvtest.c | 3 +-- tests/qemuxml2xmltest.c | 2 +- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c5e41ac619..812176ab99 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3680,28 +3680,26 @@ qemuBuildNicDevProps(virDomainDef *def, unsigned long long vectors = 0; virTristateSwitch failover = VIR_TRISTATE_SWITCH_ABSENT; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_TX_ALG)) { - switch (net->driver.virtio.txmode) { - case VIR_DOMAIN_NET_VIRTIO_TX_MODE_IOTHREAD: - tx = "bh"; - break; + switch (net->driver.virtio.txmode) { + case VIR_DOMAIN_NET_VIRTIO_TX_MODE_IOTHREAD: + tx = "bh"; + break; - case VIR_DOMAIN_NET_VIRTIO_TX_MODE_TIMER: - tx = "timer"; - break; + case VIR_DOMAIN_NET_VIRTIO_TX_MODE_TIMER: + tx = "timer"; + break; - case VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT: - break; + case VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT: + break; - case VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST: - default: - /* this should never happen, if it does, we need - * to add another case to this switch. - */ - virReportEnumRangeError(virDomainNetVirtioTxModeType, - net->driver.virtio.txmode); - return NULL; - } + case VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST: + default: + /* this should never happen, if it does, we need + * to add another case to this switch. + */ + virReportEnumRangeError(virDomainNetVirtioTxModeType, + net->driver.virtio.txmode); + return NULL; } if (net->driver.virtio.queues > 1) { diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index fb9fbab100..6e457f3814 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1928,14 +1928,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, } if (virDomainNetIsVirtioModel(net)) { - if (net->driver.virtio.txmode && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_TX_ALG)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-net-pci 'tx' option not supported in " - "this QEMU binary")); - return -1; - } - if (net->driver.virtio.rx_queue_size) { if (!VIR_IS_POW2(net->driver.virtio.rx_queue_size)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be083acf14..8933e373f7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1529,8 +1529,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS, FLAG_SLIRP_HELPER); DO_TEST_NOCAPS("net-user-addr"); DO_TEST_NOCAPS("net-virtio"); - DO_TEST("net-virtio-device", - QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST_NOCAPS("net-virtio-device"); DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-virtio-netdev"); DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b55715e0f5..af0e2c930f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -464,7 +464,7 @@ mymain(void) DO_TEST_NOCAPS("net-user"); DO_TEST_NOCAPS("net-user-addr"); DO_TEST_NOCAPS("net-virtio"); - DO_TEST("net-virtio-device", QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST_NOCAPS("net-virtio-device"); DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-eth"); DO_TEST_NOCAPS("net-eth-ifname"); -- 2.37.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 27 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5adde83a2e..4fca774425 100644 --- 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 6c1b43d69f..fc8bb6e2ab 100644 --- 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 c80ccfcdfc..de3ef449fe 100644 --- 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 96975114d3..173023c704 100644 --- 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 d29feec209..141d82857f 100644 --- 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 8a54a8865a..04c3b206f7 100644 --- 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 c98bb55f02..9d876a3408 100644 --- 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 8fbe7bbe1e..b1353f23eb 100644 --- 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 62520103ae..92e51a478a 100644 --- 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 52f6e9fdba..70843813bc 100644 --- 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 b111184c5f..c427737724 100644 --- 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 7c52fe68d6..b3099f138a 100644 --- 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 015dcb7a66..cab644c543 100644 --- 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 d3e71aa7ce..5b86d9bfc6 100644 --- 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 39381c219e..e491de1c71 100644 --- 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 cc5f4bef56..5fe99a7e79 100644 --- 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 55c25340a8..5a43616888 100644 --- 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 9503af76f9..a6fcfed213 100644 --- 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 a025d7dad5..b96c8c2d2b 100644 --- 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 01a258d2f3..35bd9b6327 100644 --- 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 152600bfae..663b94b1ff 100644 --- 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 e34a6e5d00..2468780a51 100644 --- 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 699c3cff3a..e3f9ee47bd 100644 --- 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 d57b80ceb2..5ca77807ef 100644 --- 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 4c29a96360..cd41a08fa9 100644 --- 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 e1d2e50785..86fe88b878 100644 --- 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 fa66d192a1..ad43385594 100644 --- 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'/> -- 2.37.1
On 8/11/22 9:01 AM, Ján Tomko wrote:
*** BRULB HERE ***
Ján Tomko (3): tests: qemuxml2xmltest: remove interface from disk test qemu: always assume QEMU_CAPS_VIRTIO_TX_ALG qemu: retire QEMU_CAPS_VIRTIO_TX_ALG
src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 36 +++++++++---------- src/qemu/qemu_validate.c | 8 ----- .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - .../caps_5.0.0.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - .../caps_7.1.0.x86_64.xml | 1 - .../disk-copy_on_read.x86_64-latest.args | 4 +-- tests/qemuxml2argvdata/disk-copy_on_read.xml | 5 --- tests/qemuxml2argvtest.c | 3 +- .../qemuxml2xmloutdata/disk-copy_on_read.xml | 8 +---- tests/qemuxml2xmltest.c | 4 +-- 34 files changed, 24 insertions(+), 74 deletions(-)
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
participants (2)
-
Jonathon Jongsma -
Ján Tomko