External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

tests: qemuxml2argv: push ARG_QEMU_CAPS to callers

Browse Source 
This is necessary before we can start adding more optional parameter
implementations to DO_TEST_FULL

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-13 15:18:11 -04:00
parent fdf6c89ee7
commit c1202cbc92
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/qemuxml2argvtest.c
View File

@ -855,8 +855,7 @@ mymain(void)
}; \ }; \
if (testInitQEMUCaps(&info, gic) < 0) \ if (testInitQEMUCaps(&info, gic) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (testInfoSetArgs(&info, ARG_QEMU_CAPS, \ if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \
__VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (virTestRun("QEMU XML-2-ARGV " name, \ if (virTestRun("QEMU XML-2-ARGV " name, \
testCompareXMLToArgv, &info) < 0) \ testCompareXMLToArgv, &info) < 0) \
@ -865,24 +864,29 @@ mymain(void)
} while (0) } while (0)
# define DO_TEST(name, ...) \ # define DO_TEST(name, ...) \
DO_TEST_FULL(name, NULL, -1, 0, 0, GIC_NONE, __VA_ARGS__) DO_TEST_FULL(name, NULL, -1, 0, 0, GIC_NONE, \
ARG_QEMU_CAPS, __VA_ARGS__)
# define DO_TEST_GIC(name, gic, ...) \ # define DO_TEST_GIC(name, gic, ...) \
DO_TEST_FULL(name, NULL, -1, 0, 0, gic, __VA_ARGS__) DO_TEST_FULL(name, NULL, -1, 0, 0, gic, \
ARG_QEMU_CAPS, __VA_ARGS__)
# define DO_TEST_FAILURE(name, ...) \ # define DO_TEST_FAILURE(name, ...) \
DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, \ DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, \
0, GIC_NONE, __VA_ARGS__) 0, GIC_NONE, \
ARG_QEMU_CAPS, __VA_ARGS__)
# define DO_TEST_PARSE_ERROR(name, ...) \ # define DO_TEST_PARSE_ERROR(name, ...) \
DO_TEST_FULL(name, NULL, -1, \ DO_TEST_FULL(name, NULL, -1, \
FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \
0, GIC_NONE, __VA_ARGS__) 0, GIC_NONE, \
ARG_QEMU_CAPS, __VA_ARGS__)
# define DO_TEST_PARSE_FLAGS_ERROR(name, parseFlags, ...) \ # define DO_TEST_PARSE_FLAGS_ERROR(name, parseFlags, ...) \
DO_TEST_FULL(name, NULL, -1, \ DO_TEST_FULL(name, NULL, -1, \
FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \
parseFlags, GIC_NONE, __VA_ARGS__) parseFlags, GIC_NONE, \
ARG_QEMU_CAPS, __VA_ARGS__)
# define NONE QEMU_CAPS_LAST # define NONE QEMU_CAPS_LAST
@ -1720,12 +1724,17 @@ mymain(void)
QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_CCW_CSSID_UNRESTRICTED,
QEMU_CAPS_DEVICE_VFIO_CCW); QEMU_CAPS_DEVICE_VFIO_CCW);
DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE); DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE,
DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE, NONE); ARG_QEMU_CAPS, NONE);
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, GIC_NONE, NONE); DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE,
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, GIC_NONE, NONE); ARG_QEMU_CAPS, NONE);
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, GIC_NONE,
ARG_QEMU_CAPS, NONE);
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, GIC_NONE,
ARG_QEMU_CAPS, NONE);
DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, GIC_NONE, DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, GIC_NONE,
ARG_QEMU_CAPS,
QEMU_CAPS_NUMA, QEMU_CAPS_NUMA,
QEMU_CAPS_OBJECT_MEMORY_RAM); QEMU_CAPS_OBJECT_MEMORY_RAM);
@ -1769,10 +1778,12 @@ mymain(void)
DO_TEST("cpu-host-model-vendor", NONE); DO_TEST("cpu-host-model-vendor", NONE);
DO_TEST_FULL("cpu-host-model-fallback", NULL, -1, DO_TEST_FULL("cpu-host-model-fallback", NULL, -1,
FLAG_SKIP_LEGACY_CPUS, 0, FLAG_SKIP_LEGACY_CPUS, 0,
GIC_NONE, NONE); GIC_NONE,
ARG_QEMU_CAPS, NONE);
DO_TEST_FULL("cpu-host-model-nofallback", NULL, -1, DO_TEST_FULL("cpu-host-model-nofallback", NULL, -1,
FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE,
0, GIC_NONE, NONE); 0, GIC_NONE,
ARG_QEMU_CAPS, NONE);
DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM);
DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM);
@ -2862,6 +2873,7 @@ mymain(void)
QEMU_CAPS_PIIX3_USB_UHCI); QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", NULL, -1, 0, DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", NULL, -1, 0,
VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, GIC_NONE, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, GIC_NONE,
ARG_QEMU_CAPS,
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_DEVICE_QEMU_XHCI); QEMU_CAPS_DEVICE_QEMU_XHCI);