On 03/29/2017 10:08 AM, Andrea Bolognani wrote: > The capabilities used in test cases should match those used > during normal operation for the tests to make any sense. Could you add just a bit of text about why all -no-acpi is removed (mostly) and why -no-hpet is added to a couple? It's essentially the comment from the subsequent patch: "-no-acpi is not supported on non-x86 even if qemu reports it in -help", so all non-x64 .args file need to remove Still not sure I understand why the no-hpet got added, but I suppose they're necessary. And only a couple of outputs have it... Guess it depends on what else is defined... Should have said something in v1... ACK John > --- > src/qemu/qemu_capabilities.c | 2 +- > src/qemu/qemu_capabilities.h | 2 ++ > tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args | 1 + > tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args | 1 + > .../qemuxml2argv-s390-allow-bogus-usb-controller.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args | 1 - > tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args | 1 - > tests/qemuxml2argvtest.c | 4 ++-- > 55 files changed, 7 insertions(+), 53 deletions(-) > > -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list