This series consists of 3 parts: Part 1, patches 1-3: These are fixes to the virCommand->string conversion, namely two bugs: - VIR_TEST_REGENERATE_OUTPUT would produce new files with missing end newline - memleak in bhyves xml->native conversion Part 2, patches 4 - 21: Removal of 's390-virtio' machine and the corresponding addressing type. This was removed in qemu 2.6. The exploration started because the last patch was for a strange reason checking the address type and I needed to know if indeed 'virtio-s390' addresses don't support iothreads. Turns out the whole thing can be deleted. Part 3, patch 22: Hotplug of disks with iothreads is broken because the code was moved prior to address asignment and didn't account for missing address. Let's remove the whole check as it turned out to be pointless. Peter Krempa (22): util: command: Introduce virCommandToStringBuf qemuxml2arvtest: Ensure newline at the end of generated .args files bhyveConnectDomainXMLToNative: Fix memory leak in incorrect virCommandToString usage tests: qemuxml2argv: Modernize 'watchdog-diag288' test tests: qemuxml2argv: Modernize 'console-sclp' test tests: qemuxml2argv: Remove redundant tests for the obsolete 'virtio-390' machine tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-none' test tests: qemuxml2xml: Modernize 's390-defaultconsole' case tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-controller' test qemu: domain: Remove hack for 's390-virtio' machine tests: Remove 's390-virtio' machine caps faking qemu: capabilities: Remove probing of 'virtio-*-s390' devices qemu: capabilities: Don't probe device properties for 'virtio-*-s390' devices qemuxml2argvtest: Use other bus capability for 'non-x86_64-timer-error' case qemu: Always reject 'virtio-s390' addresses qemu: Remove last uses of QEMU_CAPS_VIRTIO_S390 qemuxml2*test: Remove QEMU_CAPS_VIRTIO_S390 flag qemu: capabilities: Retire QEMU_CAPS_VIRTIO_S390 qemu: Drop handling of devices with VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 qemuValidateDomainDeviceDefAddress: Add validation of CCW address qemuDomainCheckCCWS390AddressSupport: Remove duplicated checker qemu: validate: Don't check bus type in qemuValidateDomainDeviceDefDiskIOThreads src/bhyve/bhyve_driver.c | 4 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 10 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 44 ----- src/qemu/qemu_domain.h | 6 - src/qemu/qemu_domain_address.c | 17 +- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_hotplug.c | 17 +- src/qemu/qemu_validate.c | 48 ++--- src/util/vircommand.c | 50 ++++-- src/util/vircommand.h | 4 + .../caps_2.11.0.s390x.replies | 108 +++++------ .../caps_2.11.0.x86_64.replies | 152 +++++++--------- .../caps_2.12.0.aarch64.replies | 132 ++++++-------- .../caps_2.12.0.ppc64.replies | 124 ++++++------- .../caps_2.12.0.s390x.replies | 116 ++++++------ .../caps_2.12.0.x86_64.replies | 168 ++++++++---------- .../caps_3.0.0.ppc64.replies | 124 ++++++------- .../caps_3.0.0.riscv32.replies | 100 +++++------ .../caps_3.0.0.riscv64.replies | 100 +++++------ .../caps_3.0.0.s390x.replies | 120 ++++++------- .../caps_3.0.0.x86_64.replies | 168 ++++++++---------- .../caps_3.1.0.ppc64.replies | 124 ++++++------- .../caps_3.1.0.x86_64.replies | 168 ++++++++---------- .../caps_4.0.0.aarch64.replies | 136 +++++++------- .../caps_4.0.0.ppc64.replies | 132 ++++++-------- .../caps_4.0.0.riscv32.replies | 128 ++++++------- .../caps_4.0.0.riscv64.replies | 128 ++++++------- .../caps_4.0.0.s390x.replies | 120 ++++++------- .../caps_4.0.0.x86_64.replies | 168 ++++++++---------- .../caps_4.1.0.x86_64.replies | 160 ++++++++--------- .../caps_4.2.0.aarch64.replies | 144 +++++++-------- .../caps_4.2.0.ppc64.replies | 132 ++++++-------- .../caps_4.2.0.s390x.replies | 124 ++++++------- .../caps_4.2.0.x86_64.replies | 164 ++++++++--------- .../caps_5.0.0.aarch64.replies | 144 +++++++-------- .../caps_5.0.0.ppc64.replies | 140 +++++++-------- .../caps_5.0.0.riscv64.replies | 132 ++++++-------- .../caps_5.0.0.x86_64.replies | 164 ++++++++--------- .../caps_5.1.0.x86_64.replies | 164 ++++++++--------- .../caps_5.2.0.aarch64.replies | 148 +++++++-------- .../caps_5.2.0.ppc64.replies | 140 +++++++-------- .../caps_5.2.0.riscv64.replies | 132 ++++++-------- .../caps_5.2.0.s390x.replies | 124 ++++++------- .../caps_5.2.0.x86_64.replies | 164 ++++++++--------- .../caps_6.0.0.s390x.replies | 124 ++++++------- .../caps_6.0.0.x86_64.replies | 164 ++++++++--------- .../caps_6.1.0.x86_64.replies | 164 ++++++++--------- tests/qemuxml2argvdata/console-sclp.args | 28 --- .../console-sclp.s390x-latest.args | 36 ++++ tests/qemuxml2argvdata/console-sclp.xml | 2 +- .../qemuxml2argvdata/console-virtio-s390.args | 29 --- .../qemuxml2argvdata/console-virtio-s390.xml | 24 --- tests/qemuxml2argvdata/disk-virtio-s390.args | 26 --- tests/qemuxml2argvdata/disk-virtio-s390.xml | 22 --- tests/qemuxml2argvdata/net-virtio-s390.args | 26 --- tests/qemuxml2argvdata/net-virtio-s390.xml | 22 --- .../s390-allow-bogus-usb-controller.args | 31 ---- ...low-bogus-usb-controller.s390x-latest.args | 39 ++++ .../s390-allow-bogus-usb-controller.xml | 2 +- .../s390-allow-bogus-usb-none.args | 31 ---- ...390-allow-bogus-usb-none.s390x-latest.args | 39 ++++ .../s390-allow-bogus-usb-none.xml | 2 +- .../qemuxml2argvdata/s390-defaultconsole.xml | 2 +- tests/qemuxml2argvdata/watchdog-diag288.args | 28 --- .../watchdog-diag288.s390x-latest.args | 36 ++++ tests/qemuxml2argvdata/watchdog-diag288.xml | 2 +- tests/qemuxml2argvtest.c | 125 +++++-------- ...l => s390-defaultconsole.s390x-latest.xml} | 4 +- tests/qemuxml2xmltest.c | 27 +-- tests/testutilsqemu.c | 2 +- tests/vircapstest.c | 4 - 74 files changed, 2562 insertions(+), 3387 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-sclp.args create mode 100644 tests/qemuxml2argvdata/console-sclp.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml => s390-defaultconsole.s390x-latest.xml} (82%) -- 2.31.1