Re: [PATCH 01/14] qemu: command: Always assume 'QEMU_CAPS_BOOT_STRICT'
On Mon, Sep 20, 2021 at 18:28:47 +0200, Ján Tomko wrote: > On a Monday in 2021, Peter Krempa wrote: > > Added by c8a6ae8bb9 in qemu-v1.5.0 and can't be compiled out. Assume > > that it's present and fix all fake-caps tests. > > > > Signed-off-by: Peter Krempa > > --- > > src/qemu/qemu_command.c| 10 +++--- > > tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 1 + > > tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + > > [...] > > > tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 + > > tests/qemuxml2argvdata/watchdog.args | 1 + > > tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + > > tests/qemuxml2argvtest.c | 1 - > > 564 files changed, 565 insertions(+), 25 deletions(-) > > > > [...] > > > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c > > index 74af93b08f..74a9f5a0ee 100644 > > --- a/tests/qemuxml2argvtest.c > > +++ b/tests/qemuxml2argvtest.c > > @@ -1082,7 +1082,6 @@ mymain(void) > > DO_TEST("boot-complex", > > QEMU_CAPS_VIRTIO_BLK_SCSI); > > DO_TEST("boot-strict", > > -QEMU_CAPS_BOOT_STRICT, > > QEMU_CAPS_VIRTIO_BLK_SCSI); > > > > The test can be removed completely because it's identical to > "boot-complex" after this change I plan to do some more testing cleanups. I'll include that fix there.
Re: [PATCH 01/14] qemu: command: Always assume 'QEMU_CAPS_BOOT_STRICT'
On a Monday in 2021, Peter Krempa wrote: Added by c8a6ae8bb9 in qemu-v1.5.0 and can't be compiled out. Assume that it's present and fix all fake-caps tests. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c| 10 +++--- tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 1 + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + [...] tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + tests/qemuxml2argvtest.c | 1 - 564 files changed, 565 insertions(+), 25 deletions(-) [...] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 74af93b08f..74a9f5a0ee 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1082,7 +1082,6 @@ mymain(void) DO_TEST("boot-complex", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("boot-strict", -QEMU_CAPS_BOOT_STRICT, QEMU_CAPS_VIRTIO_BLK_SCSI); The test can be removed completely because it's identical to "boot-complex" after this change Jano /* Simplest possible , all supported with ENV */ -- 2.31.1 signature.asc Description: PGP signature