Re: [libvirt] [libvirt PATCH v2 18/44] Deprecate QEMU_CAPS_NODEFCONFIG
On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
@@ -1349,156 +1305,133 @@ mymain(void)
driver.config->chardevTLS = 0;
VIR_FREE(driver.config->chardevTLSx509certdir);
DO_TEST("serial-many-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_NODEFCONFIG);
- DO_TEST("parallel-tcp-chardev",
- QEMU_CAPS_NODEFCONFIG);
+ QEMU_CAPS_DEVICE_ISA_SERIAL);
+ DO_TEST("parallel-tcp-chardev", NONE);
DO_TEST("parallel-parport-chardev",
- QEMU_CAPS_NODEFCONFIG);
+ NONE);
NONE should be on the same line as the test name in this case.
There are a few more instances of the same issue below.
DO_TEST("console-compat-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_NODEFCONFIG);
+ NONE);
I guess technically this will work, but it's definitely not what
you were aiming for, is it? Again, more instances below.
@@ -1783,14 +1698,10 @@ mymain(void)
QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH);
DO_TEST("multifunction-pci-device",
- QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_SCSI_LSI);
- DO_TEST("monitor-json",
- QEMU_CAPS_NODEFCONFIG);
- DO_TEST("no-shutdown",
- QEMU_CAPS_NODEFCONFIG,
- QEMU_CAPS_NO_SHUTDOWN);
+ DO_TEST("monitor-json", NONE);
+ DO_TEST("no-shutdown", QEMU_CAPS_NO_SHUTDOWN);
Here the NO_SHUTDOWN capability should have stayed on its own line.
I'm attaching a patch that fixes all the issues I could find,
because that's faster than pointing them all out :)
With that squashed in
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
Attachments:
- 0001-fixup.patch (text/x-patch — 7.0 KB)