This patch saga aims to improve and simplify testing of qemu XML configs. Part 1 deals with input test files which are not used in qemuxml2argvtest, introduces a mock network driver and adds a checker that all input files are in fact used. Peter Krempa (19): qemuxml2argvtest: Reinstate 'console-compat-chardev' and 'pci-serial-dev-chardev' qemuxml2argvtest: Fix and use 'disk-network-ssh-key' case qemuxml2argvtest: Reinstate 'pseries-vio-address-clash' case qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest qemuxml2argvtest: Remove duplicated invocations of tests qemuxml2argvtest: Check for duplicate invocation of tests qemuxml2argvmock: Mock qemuInterfaceBridgeConnect qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 1 qemuxml2xmltest: Move 'graphics-listen-network2' case go genericxml2xmltest qemuxml2*test: Add specific test case for interface link state qemuxml*test: Improve 'vhost_queues' test case qemuxml2xmltest: Delete 'interface-driver' case qemu: process: Separate setup of network device objects qemuxml2argvmock: Mock virNetDevSetMTU qemuxml2xmltest: Introduce fake network driver qemuxml2argvtest: Enable 'graphics-listen-network' case virnetworkportxml2xmltest: Add simple versions of bridge/network tests qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 2 qemuxml2argvtest: Add checker that all input files are used src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_process.c | 45 ++-- src/util/virnetdev.h | 2 +- .../graphics-listen-network2.xml | 0 .../smbios-multiple-type2.xml | 0 .../graphics-listen-network2.xml | 35 +++ tests/genericxml2xmltest.c | 3 + tests/qemustatusxml2xmltest.c | 2 +- ...nu-disable-with-timeout.x86_64-latest.args | 36 +++ ...hannel-unix-source-path.x86_64-latest.args | 45 ++++ .../chardev-label.x86_64-latest.args | 41 +++ .../console-compat2.x86_64-latest.args | 40 +++ .../cpu-empty.x86_64-latest.args | 33 +++ ...cpu-host-model-features.x86_64-latest.args | 33 +++ .../cpu-numa-disordered.x86_64-latest.args | 38 +++ .../disk-active-commit.x86_64-latest.args | 38 +++ .../disk-mirror-old.x86_64-latest.args | 45 ++++ .../disk-mirror.x86_64-latest.args | 48 ++++ .../disk-network-ssh-key.x86_64-latest.args | 38 +++ .../qemuxml2argvdata/disk-network-ssh-key.xml | 2 +- .../disk-network-vxhs.x86_64-5.0.0.args | 35 +++ .../downscript.x86_64-latest.args | 43 +++ ...graphics-listen-network.x86_64-latest.args | 37 +++ .../graphics-listen-network.xml | 2 +- .../hostdev-mdev-display.x86_64-latest.args | 34 +++ ...ev-scsi-autogen-address.x86_64-latest.args | 60 +++++ ...hostdev-scsi-large-unit.x86_64-latest.args | 39 +++ .../hostdev-scsi-shareable.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/interface-driver.xml | 54 ---- .../qemuxml2argvdata/lease.x86_64-latest.args | 39 +++ .../memorybacking-set.x86_64-latest.args | 33 +++ .../memorybacking-unset.x86_64-latest.args | 33 +++ .../metadata-duplicate.x86_64-latest.args | 36 +++ .../metadata.x86_64-latest.args | 36 +++ .../net-bandwidth.x86_64-latest.args | 47 ++++ tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- .../net-bandwidth2.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- .../net-coalesce.x86_64-latest.args | 48 ++++ tests/qemuxml2argvdata/net-coalesce.xml | 6 +- .../net-isolated-port.x86_64-latest.args | 43 +++ tests/qemuxml2argvdata/net-isolated-port.xml | 2 +- .../net-linkstate.x86_64-latest.args | 36 +++ tests/qemuxml2argvdata/net-linkstate.xml | 34 +++ .../net-midonet.x86_64-latest.args | 38 +++ .../net-mtu.x86_64-latest.args | 46 ++++ tests/qemuxml2argvdata/net-mtu.xml | 4 +- .../net-openvswitch.x86_64-latest.args | 38 +++ tests/qemuxml2argvdata/net-openvswitch.xml | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 42 +++ .../net-virtio-network-portgroup.xml | 6 +- ...-virtio-teaming-network.x86_64-latest.args | 39 +++ .../net-virtio-teaming-network.xml | 4 +- .../net-virtio-vhost.x86_64-latest.args | 42 +++ ...{vhost_queues.xml => net-virtio-vhost.xml} | 25 +- ...d-auto-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...static-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...vcpus-topology-mismatch.x86_64-latest.args | 34 +++ .../panic-pseries.ppc64-latest.args | 34 +++ .../pcihole64-gib.x86_64-latest.args | 34 +++ ...pseries-vio-address-clash.ppc64-latest.err | 1 + .../s390-defaultconsole.s390x-latest.args | 33 +++ .../s390-panic.s390x-latest.args | 35 +++ ...eclabel-device-multiple.x86_64-latest.args | 36 +++ ...el-dynamic-none-relabel.x86_64-latest.args | 37 +++ .../seclabel-dynamic-none.x86_64-latest.args | 36 +++ ...serial-target-port-auto.x86_64-latest.args | 42 +++ .../tap-vhost-incorrect.x86_64-latest.args | 40 +++ .../qemuxml2argvdata/tap-vhost-incorrect.xml | 4 +- .../tap-vhost.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/tap-vhost.xml | 2 +- .../vhost-user-fs-sock.x86_64-latest.args | 34 +++ ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 36 +++ tests/qemuxml2argvmock.c | 25 ++ tests/qemuxml2argvtest.c | 255 +++++++++++++++++- .../graphics-listen-network.x86_64-latest.xml | 2 +- .../interface-driver.x86_64-latest.xml | 67 ----- .../net-bandwidth.x86_64-latest.xml | 2 +- .../net-bandwidth2.x86_64-latest.xml | 2 +- .../net-coalesce.x86_64-latest.xml | 6 +- .../net-isolated-port.x86_64-latest.xml | 2 +- ...st.xml => net-linkstate.x86_64-latest.xml} | 34 ++- .../net-openvswitch.x86_64-latest.xml | 2 +- ...virtio-network-portgroup.x86_64-latest.xml | 6 +- ...t-virtio-teaming-network.x86_64-latest.xml | 4 +- ...xml => net-virtio-vhost.x86_64-latest.xml} | 29 +- .../tap-vhost-incorrect.x86_64-latest.xml | 4 +- .../tap-vhost.x86_64-latest.xml | 2 +- tests/qemuxml2xmltest.c | 6 +- tests/testutils.c | 14 + tests/testutils.h | 2 + tests/testutilsqemu.h | 3 + .../plug-bridge-basic.xml | 11 + .../plug-network-basic.xml | 10 + tests/virnetworkportxml2xmltest.c | 2 + 95 files changed, 2407 insertions(+), 233 deletions(-) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/graphics-listen-network2.xml (100%) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/smbios-multiple-type2.xml (100%) create mode 100644 tests/genericxml2xmloutdata/graphics-listen-network2.xml create mode 100644 tests/qemuxml2argvdata/boot-menu-disable-with-timeout.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/chardev-label.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/console-compat2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-empty.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-active-commit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror-old.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/downscript.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-autogen-address.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-large-unit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-shareable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/interface-driver.xml create mode 100644 tests/qemuxml2argvdata/lease.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-set.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-unset.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata-duplicate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.xml create mode 100644 tests/qemuxml2argvdata/net-midonet.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-mtu.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args rename tests/qemuxml2argvdata/{vhost_queues.xml => net-virtio-vhost.xml} (67%) create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numavcpus-topology-mismatch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/panic-pseries.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pcihole64-gib.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-vio-address-clash.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/s390-defaultconsole.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-panic.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-device-multiple.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-target-port-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-sock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.s390x-latest.args delete mode 100644 tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{graphics-listen-network2.x86_64-latest.xml => net-linkstate.x86_64-latest.xml} (63%) rename tests/qemuxml2xmloutdata/{vhost_queues.x86_64-latest.xml => net-virtio-vhost.x86_64-latest.xml} (78%) create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-basic.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-network-basic.xml -- 2.43.0 _______________________________________________ Devel mailing list -- devel@xxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx