10:27 a.m.
On a Thursday in 2022, Peter Krempa wrote:
The virtio-*-(non-)-transitional device models which replace the
properties were introduced in qemu-4.0, so we can remove the logic for
the old-style syntax.
In addition this series modernizes the tests meant for the virtio
devices in question.
Peter Krempa (8):
qemu: address: Use PCIe for virtio devices also with
QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL
qemuxml2*test: Use QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL for macos hfv
tests
qemuxml2argvtest: Add DO_TEST_CAPS_LATEST versions of tests which
assert QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY
qemuxml2argvtest: Convert all test cases asserting
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY
qemuxml2*test: Remove 'q35-virtio-pci' test case
qemuxml2xmltest: Convert all test cases asserting
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY
qemu: Remove extra logic around QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY
qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY
src/qemu/qemu_capabilities.c | 13 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 23 +--
src/qemu/qemu_domain_address.c | 2 +-
.../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 -
...h64-virtio-pci-default.aarch64-4.2.0.args} | 17 +-
...h64-virtio-pci-default.aarch64-latest.args | 55 ++++++
...ev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} | 4 +-
...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 35 ++++
...35-default-devices-only.x86_64-4.2.0.args} | 12 +-
...35-default-devices-only.x86_64-latest.args | 37 +++++
tests/qemuxml2argvdata/q35-multifunction.args | 49 ------
.../q35-multifunction.x86_64-4.2.0.args | 51 ++++++
.../q35-multifunction.x86_64-latest.args | 52 ++++++
...rgs => q35-pcie-autoadd.x86_64-4.2.0.args} | 36 ++--
.../q35-pcie-autoadd.x86_64-latest.args | 66 ++++++++
...5-pcie.args => q35-pcie.x86_64-4.2.0.args} | 34 ++--
.../q35-pcie.x86_64-latest.args | 67 ++++++++
... q35-virt-manager-basic.x86_64-4.2.0.args} | 21 ++-
.../q35-virt-manager-basic.x86_64-latest.args | 63 +++++++
tests/qemuxml2argvdata/q35-virtio-pci.args | 64 -------
tests/qemuxml2argvdata/q35-virtio-pci.xml | 1 -
tests/qemuxml2argvtest.c | 157 +++---------------
...h64-virtio-pci-default.aarch64-latest.xml} | 12 +-
...ev-scsi-vhost-scsi-pcie.x86_64-latest.xml} | 3 +
...35-default-devices-only.x86_64-latest.xml} | 11 +-
...ml => q35-multifunction.x86_64-latest.xml} | 41 ++---
...xml => q35-pcie-autoadd.x86_64-latest.xml} | 31 ++--
...35-pcie.xml => q35-pcie.x86_64-latest.xml} | 29 ++--
... q35-virt-manager-basic.x86_64-latest.xml} | 15 +-
tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 154 -----------------
tests/qemuxml2xmltest.c | 142 +---------------
56 files changed, 610 insertions(+), 714 deletions(-)
rename tests/qemuxml2argvdata/{aarch64-virtio-pci-default.args =>
aarch64-virtio-pci-default.aarch64-4.2.0.args} (71%)
create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args
rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pcie.args =>
hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} (88%)
create mode 100644
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
rename tests/qemuxml2argvdata/{q35-default-devices-only.args =>
q35-default-devices-only.x86_64-4.2.0.args} (67%)
create mode 100644 tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/q35-multifunction.args
create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args
rename tests/qemuxml2argvdata/{q35-pcie-autoadd.args =>
q35-pcie-autoadd.x86_64-4.2.0.args} (59%)
create mode 100644 tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args
rename tests/qemuxml2argvdata/{q35-pcie.args => q35-pcie.x86_64-4.2.0.args} (62%)
create mode 100644 tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args
rename tests/qemuxml2argvdata/{q35-virt-manager-basic.args =>
q35-virt-manager-basic.x86_64-4.2.0.args} (75%)
create mode 100644 tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.args
delete mode 120000 tests/qemuxml2argvdata/q35-virtio-pci.xml
rename tests/qemuxml2xmloutdata/{aarch64-virtio-pci-default.xml =>
aarch64-virtio-pci-default.aarch64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pcie.xml =>
hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{q35-default-devices-only.xml =>
q35-default-devices-only.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{q35-multifunction.xml =>
q35-multifunction.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{q35-pcie-autoadd.xml =>
q35-pcie-autoadd.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{q35-pcie.xml => q35-pcie.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{q35-virt-manager-basic.xml =>
q35-virt-manager-basic.x86_64-latest.xml} (93%)
delete mode 100644 tests/qemuxml2xmloutdata/q35-virtio-pci.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano