Re: [libvirt] [PATCH 4/9] tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases

When we unconditionally enable QEMU_CAPS_DEVICE, these tests need some massaging, so do it ahead of time to not mix it in with the big test refresh. - minimal-s390 is not a real world working config, so drop it - disk-usb was testing for an old code path that will be removed. instead use it to test lack of USB disk support, and rename it to disk-usb-nosupport. Switch xml2xml to use disk-usb-device for input. - cputune-numatune was needlessly using q35, switch it to an older machine type --- .../qemuxml2argv-cputune-numatune.args | 7 +-- .../qemuxml2argv-cputune-numatune.xml | 12 +--- .../qemuxml2argv-disk-usb-nosupport.xml} | 0 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 23 -------- .../qemuxml2argv-minimal-s390.args | 21 ------- .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 ------- tests/qemuxml2argvtest.c | 5 +- .../qemuxml2xmlout-cputune-numatune.xml | 14 +---- .../qemuxml2xmlout-disk-cdrom-empty.xml | 36 ++++++++++++ .../qemuxml2xmlout-disk-drive-boot-cdrom.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-boot-disk.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-cache-directsync.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-cache-unsafe.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-cache-v2-none.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-cache-v2-wb.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-cache-v2-wt.xml | 37 +++++++++++++ ...xml2xmlout-disk-drive-error-policy-enospace.xml | 37 +++++++++++++ ...qemuxml2xmlout-disk-drive-error-policy-stop.xml | 37 +++++++++++++ ...out-disk-drive-error-policy-wreport-rignore.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-network-gluster.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-drive-network-rbd-auth.xml | 42 ++++++++++++++ ...uxml2xmlout-disk-drive-network-rbd-ceph-env.xml | 39 +++++++++++++ .../qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml | 40 ++++++++++++++ .../qemuxml2xmlout-disk-drive-network-rbd.xml | 64 ++++++++++++++++++++++ .../qemuxml2xmlout-disk-drive-network-sheepdog.xml | 37 +++++++++++++ .../qemuxml2xmlout-disk-usb-device.xml} | 6 +- .../qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml | 30 ++++++++++ .../qemuxml2xmlout-misc-uuid.xml | 33 +++++++++++ .../qemuxml2xmlout-nographics-vga.xml | 30 ++++++++++ .../qemuxml2xmlout-qemu-ns-no-env.xml | 34 ++++++++++++ .../qemuxml2xmlout-restore-v2.xml | 30 ++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml | 31 +++++++++++ tests/qemuxml2xmltest.c | 2 +- 33 files changed, 865 insertions(+), 99 deletions(-) rename tests/{qemuxml2xmloutdata/qemuxml2xmlout-disk-usb.xml => qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.xml => qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml} (90%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-uuid.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-nographics-vga.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-qemu-ns-no-env.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-restore-v2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml