If files whose name doesn't follow the expected format are added to the repository, it's better to make the test suite fail than to silently ignore them. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/testutilsqemu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 0faa9cb84a..7a2ea3bf4e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -910,7 +910,7 @@ testQemuCapsIterate(const char *suffix, goto cleanup; while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { - char *tmp = ent->d_name; + g_autofree char *tmp = g_strdup(ent->d_name); char *base = NULL; char *archName = NULL; @@ -918,9 +918,11 @@ testQemuCapsIterate(const char *suffix, if (!virStringStripSuffix(tmp, suffix)) continue; - /* Find the last dot, moving on if none is present */ - if (!(archName = strrchr(tmp, '.'))) - continue; + /* Find the last dot */ + if (!(archName = strrchr(tmp, '.'))) { + VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name); + goto cleanup; + } /* The base name is everything before the last dot, and * the architecture name everything after it */ -- 2.21.0

Right now users need to know input file live inside TEST_QEMU_CAPS_PATH, which is bad layering. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/qemucapabilitiestest.c | 5 +++-- tests/qemucaps2xmltest.c | 5 +++-- tests/testutilsqemu.c | 2 +- tests/testutilsqemu.h | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index bb4ce74a29..6b8d2676e3 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -49,7 +49,6 @@ testQemuDataInit(testQemuDataPtr data) if (qemuTestDriverInit(&data->driver) < 0) return -1; - data->inputDir = TEST_QEMU_CAPS_PATH; data->outputDir = TEST_QEMU_CAPS_PATH; data->ret = 0; @@ -180,7 +179,8 @@ testQemuCapsCopy(const void *opaque) static int -doCapsTest(const char *base, +doCapsTest(const char *inputDir, + const char *base, const char *archName, void *opaque) { @@ -193,6 +193,7 @@ doCapsTest(const char *base, return -1; } + data->inputDir = inputDir; data->base = base; data->archName = archName; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f5aecaa391..8985b20ac6 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -39,7 +39,6 @@ struct _testQemuData { static int testQemuDataInit(testQemuDataPtr data) { - data->inputDir = TEST_QEMU_CAPS_PATH; data->outputDir = abs_srcdir "/qemucaps2xmloutdata"; data->ret = 0; @@ -174,7 +173,8 @@ testQemuCapsXML(const void *opaque) } static int -doCapsTest(const char *base, +doCapsTest(const char *inputDir, + const char *base, const char *archName, void *opaque) { @@ -184,6 +184,7 @@ doCapsTest(const char *base, if (virAsprintf(&title, "%s (%s)", base, archName) < 0) return -1; + data->inputDir = inputDir; data->base = base; data->archName = archName; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index c602255149..75c8180c7a 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -937,7 +937,7 @@ testQemuCapsIterate(const char *suffix, archName++; /* Run the user-provided callback */ - if (callback(base, archName, opaque) < 0) + if (callback(TEST_QEMU_CAPS_PATH, base, archName, opaque) < 0) goto cleanup; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index a2f7bfcc26..07373f8ce6 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -96,7 +96,8 @@ char *testQemuGetLatestCapsForArch(const char *arch, const char *suffix); virHashTablePtr testQemuGetLatestCaps(void); -typedef int (*testQemuCapsIterateCallback)(const char *base, +typedef int (*testQemuCapsIterateCallback)(const char *inputDir, + const char *base, const char *archName, void *opaque); int testQemuCapsIterate(const char *suffix, -- 2.21.0

Right now we're passing a "base" string that contains both, separated by an underscore. Some changes that we're going to introduce later will require us to have the version number on its own, and instead of delegating the task of splitting the two apart to the callback it make more sense to perform it upfront. This change results in quite a bit of churn because we're now using the version number only, without the prefix, to calculate the dummy microcodeVersion. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../caps_1.5.3.x86_64.xml | 2 +- .../caps_1.6.0.x86_64.xml | 2 +- .../caps_1.7.0.x86_64.xml | 2 +- .../caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.xml | 2 +- .../caps_2.10.0.ppc64.xml | 2 +- .../caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.xml | 2 +- .../caps_2.11.0.s390x.xml | 2 +- .../caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.xml | 2 +- .../caps_2.4.0.x86_64.xml | 2 +- .../caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../caps_2.9.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 +- .../caps_3.0.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- .../caps_3.1.0.x86_64.xml | 2 +- .../caps_4.0.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 +- .../caps_4.0.0.x86_64.xml | 2 +- .../caps_4.1.0.x86_64.xml | 2 +- .../caps_4.2.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 +- .../caps_4.2.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 29 +++++++++++-------- tests/qemucaps2xmltest.c | 15 ++++++---- tests/testutilsqemu.c | 16 ++++++---- tests/testutilsqemu.h | 3 +- 43 files changed, 78 insertions(+), 63 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 780d75a513..8b573070d5 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -85,7 +85,7 @@ <flag name='mch'/> <version>1005003</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>43100763</microcodeVersion> + <microcodeVersion>43100245</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> [... many more changes exactly like this one ...] diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index cc2242df50..8fa4104f20 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -37,9 +37,10 @@ struct _testQemuData { virQEMUDriver driver; const char *inputDir; const char *outputDir; + const char *prefix; + const char *version; const char *archName; const char *suffix; - const char *base; int ret; }; @@ -78,11 +79,12 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion = 0; const char *p; - if (virAsprintf(&repliesFile, "%s/%s.%s.%s", - data->inputDir, data->base, + if (virAsprintf(&repliesFile, "%s/%s_%s.%s.%s", + data->inputDir, data->prefix, data->version, data->archName, data->suffix) < 0 || - virAsprintf(&capsFile, "%s/%s.%s.xml", - data->outputDir, data->base, data->archName) < 0) + virAsprintf(&capsFile, "%s/%s_%s.%s.xml", + data->outputDir, data->prefix, data->version, + data->archName) < 0) goto cleanup; if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL, @@ -114,7 +116,7 @@ testQemuCaps(const void *opaque) fakeMicrocodeVersion *= 100000; - for (p = data->base; *p; p++) + for (p = data->version; *p; p++) fakeMicrocodeVersion += *p; virQEMUCapsSetMicrocodeVersion(capsActual, fakeMicrocodeVersion); @@ -148,8 +150,9 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy = NULL; char *actual = NULL; - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->outputDir, data->base, data->archName) < 0) + if (virAsprintf(&capsFile, "%s/%s_%s.%s.xml", + data->outputDir, data->prefix, data->version, + data->archName) < 0) goto cleanup; if (!(caps = virCapabilitiesNew(virArchFromString(data->archName), @@ -182,7 +185,8 @@ testQemuCapsCopy(const void *opaque) static int doCapsTest(const char *inputDir, - const char *base, + const char *prefix, + const char *version, const char *archName, const char *suffix, void *opaque) @@ -191,13 +195,14 @@ doCapsTest(const char *inputDir, g_autofree char *title = NULL; g_autofree char *copyTitle = NULL; - if (virAsprintf(&title, "%s (%s)", base, archName) < 0 || - virAsprintf(©Title, "copy %s (%s)", base, archName) < 0) { + if (virAsprintf(&title, "%s (%s)", version, archName) < 0 || + virAsprintf(©Title, "copy %s (%s)", version, archName) < 0) { return -1; } data->inputDir = inputDir; - data->base = base; + data->prefix = prefix; + data->version = version; data->archName = archName; data->suffix = suffix; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 7a41e9cdd3..365efbe4b1 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -31,7 +31,8 @@ typedef testQemuData *testQemuDataPtr; struct _testQemuData { const char *inputDir; const char *outputDir; - const char *base; + const char *prefix; + const char *version; const char *archName; const char *suffix; int ret; @@ -146,8 +147,8 @@ testQemuCapsXML(const void *opaque) data->outputDir, data->archName) < 0) goto cleanup; - if (virAsprintf(&capsFile, "%s/%s.%s.%s", - data->inputDir, data->base, + if (virAsprintf(&capsFile, "%s/%s_%s.%s.%s", + data->inputDir, data->prefix, data->version, data->archName, data->suffix) < 0) goto cleanup; @@ -176,7 +177,8 @@ testQemuCapsXML(const void *opaque) static int doCapsTest(const char *inputDir, - const char *base, + const char *prefix, + const char *version, const char *archName, const char *suffix, void *opaque) @@ -184,11 +186,12 @@ doCapsTest(const char *inputDir, testQemuDataPtr data = (testQemuDataPtr) opaque; g_autofree char *title = NULL; - if (virAsprintf(&title, "%s (%s)", base, archName) < 0) + if (virAsprintf(&title, "%s (%s)", version, archName) < 0) return -1; data->inputDir = inputDir; - data->base = base; + data->prefix = prefix; + data->version = version; data->archName = archName; data->suffix = suffix; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 1f0270f488..54d6b1a0ac 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -917,22 +917,28 @@ testQemuCapsIterate(const char *suffix, while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { g_autofree char *tmp = g_strdup(ent->d_name); - char *base = NULL; + char *version = NULL; char *archName = NULL; /* Strip the trailing suffix, moving on if it's not present */ if (!virStringStripSuffix(tmp, suffix)) continue; + /* Strip the leading prefix */ + if (!(version = STRSKIP(tmp, "caps_"))) { + VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name); + goto cleanup; + } + /* Find the last dot */ if (!(archName = strrchr(tmp, '.'))) { VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name); goto cleanup; } - /* The base name is everything before the last dot, and - * the architecture name everything after it */ - base = tmp; + /* The version number and the architecture name are separated by + * a dot: overwriting that dot with \0 results in both being usable + * as independent, null-terminated strings */ archName[0] = '\0'; archName++; @@ -942,7 +948,7 @@ testQemuCapsIterate(const char *suffix, * to make it nicer to rebuild the original file name from inside * the callback. */ - if (callback(TEST_QEMU_CAPS_PATH, base, + if (callback(TEST_QEMU_CAPS_PATH, "caps", version, archName, suffix + 1, opaque) < 0) { goto cleanup; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 2c8c4960e9..714a95bb7a 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -97,7 +97,8 @@ char *testQemuGetLatestCapsForArch(const char *arch, virHashTablePtr testQemuGetLatestCaps(void); typedef int (*testQemuCapsIterateCallback)(const char *inputDir, - const char *base, + const char *prefix, + const char *version, const char *archName, const char *suffix, void *opaque); -- 2.21.0

Requiring the user to provide the final string themselves will make subsequent changes easier to implement. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapstest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 7a69543a45..f38f5fb047 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -299,9 +299,8 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ char *name = NULL; \ - if (virAsprintf(&name, "qemu_%s%s%s.%s", \ + if (virAsprintf(&name, "qemu_%s.%s", \ Name, \ - Machine ? "-" : "", Machine ? Machine : "", \ Arch) < 0) { \ ret = -1; \ break; \ @@ -387,7 +386,7 @@ mymain(void) "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.9.0", "caps_2.9.0", + DO_TEST_QEMU("2.9.0-q35", "caps_2.9.0", "/usr/bin/qemu-system-x86_64", "q35", "x86_64", VIR_DOMAIN_VIRT_KVM); @@ -403,11 +402,11 @@ mymain(void) "/usr/bin/qemu-system-aarch64", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0", + DO_TEST_QEMU("2.6.0-virt", "caps_2.6.0", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.12.0", "caps_2.12.0", + DO_TEST_QEMU("2.12.0-virt", "caps_2.12.0", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); -- 2.21.0

The full name of the test case, as well as the name of the QEMU binary and corresponding capabilities file, can all be derived from other information passed to the test, so there's no point in asking the user to provide them. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapstest.c | 127 ++++++++++++----------------------------- 1 file changed, 36 insertions(+), 91 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index e35eddc659..e3329ef1ff 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -267,17 +267,23 @@ test_virDomainCapsFormat(const void *opaque) } static int -doTestQemu(const char *partialName, - const char *capsName, - const char *emulator, +doTestQemu(const char *version, const char *machine, const char *arch, virDomainVirtType type, void *opaque) { g_autofree char *name = NULL; + g_autofree char *capsName = NULL; + g_autofree char *emulator = NULL; - name = g_strdup_printf("qemu_%s.%s", partialName, arch); + name = g_strdup_printf("qemu_%s%s%s%s.%s", + version, + (type == VIR_DOMAIN_VIRT_QEMU ? "-tcg" : ""), + (machine ? "-" : ""), (machine ? machine : ""), + arch); + capsName = g_strdup_printf("caps_%s", version); + emulator = g_strdup_printf("/usr/bin/qemu-system-%s", arch); struct testData data = { .name = name, @@ -326,9 +332,9 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ +#define DO_TEST_QEMU(Version, Machine, Arch, Type) \ do { \ - if (doTestQemu(Name, CapsName, Emulator, Machine, Arch, Type, cfg) < 0) \ + if (doTestQemu(Version, Machine, Arch, Type, cfg) < 0) \ ret = -1; \ } while (0) @@ -378,101 +384,40 @@ mymain(void) virFileWrapperAddPrefix("/home/user/.config/qemu/firmware", abs_srcdir "/qemufirmwaredata/home/user/.config/qemu/firmware"); - DO_TEST_QEMU("1.7.0", "caps_1.7.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("1.7.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", NULL, "ppc64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.8.0", "caps_2.8.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.7.0", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.8.0-tcg", "caps_2.8.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_QEMU); + DO_TEST_QEMU("2.8.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.8.0", NULL, "x86_64", VIR_DOMAIN_VIRT_QEMU); + DO_TEST_QEMU("2.8.0", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.9.0", "caps_2.9.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.9.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.9.0", "q35", "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.9.0", NULL, "x86_64", VIR_DOMAIN_VIRT_QEMU); - DO_TEST_QEMU("2.9.0-q35", "caps_2.9.0", - "/usr/bin/qemu-system-x86_64", "q35", - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", NULL, "ppc64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.9.0-tcg", "caps_2.9.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_QEMU); + DO_TEST_QEMU("3.0.0", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.12.0", "caps_2.12.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("3.1.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0", - "/usr/bin/qemu-system-aarch64", NULL, - "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.0.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.0.0", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0-virt", "caps_2.6.0", - "/usr/bin/qemu-system-aarch64", "virt", - "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.1.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.12.0-virt", "caps_2.12.0", - "/usr/bin/qemu-system-aarch64", "virt", - "aarch64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.6.0", "caps_2.6.0", - "/usr/bin/qemu-system-ppc64", NULL, - "ppc64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.12.0", "caps_2.12.0", - "/usr/bin/qemu-system-ppc64", NULL, - "ppc64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.7.0", "caps_2.7.0", - "/usr/bin/qemu-system-s390x", NULL, - "s390x", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.8.0", "caps_2.8.0", - "/usr/bin/qemu-system-s390x", NULL, - "s390x", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.12.0", "caps_2.12.0", - "/usr/bin/qemu-system-s390x", NULL, - "s390x", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("3.0.0", "caps_3.0.0", - "/usr/bin/qemu-system-s390x", NULL, - "s390x", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("3.1.0", "caps_3.1.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.0.0", "caps_4.0.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.0.0", "caps_4.0.0", - "/usr/bin/qemu-system-s390x", NULL, - "s390x", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.1.0", "caps_4.1.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.2.0", "caps_4.2.0", - "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.2.0", "caps_4.2.0", - "/usr/bin/qemu-system-ppc64", NULL, - "ppc64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("4.2.0", "caps_4.2.0", - "/usr/bin/qemu-system-aarch64", NULL, - "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.2.0", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.2.0", NULL, "ppc64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("4.2.0", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); virObjectUnref(cfg); -- 2.21.0

Now that the only data we need for fully testing a QEMU binary is the (version, arch) combo, we can stop providing that information ourselves and instead rely on testQemuCapsIterate() automatically picking up new input files as they are added to the repository, the same way the qemucapabilities and qemucaps2xml tests already behave. Unsurprisingly, this change results in a bunch of extra output files being created, significantly expanding our test coverage. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 134 ++++++++++++ .../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 134 ++++++++++++ tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 134 ++++++++++++ .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 134 ++++++++++++ .../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 134 ++++++++++++ tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 134 ++++++++++++ .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 135 ++++++++++++ .../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 135 ++++++++++++ tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 135 ++++++++++++ .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 158 ++++++++++++++ .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 177 ++++++++++++++++ .../qemu_2.10.0-virt.aarch64.xml | 142 +++++++++++++ tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 136 ++++++++++++ tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 108 ++++++++++ tests/domaincapsdata/qemu_2.10.0.s390x.xml | 198 ++++++++++++++++++ tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 158 ++++++++++++++ .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 156 ++++++++++++++ .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 172 +++++++++++++++ tests/domaincapsdata/qemu_2.11.0.s390x.xml | 197 +++++++++++++++++ tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 156 ++++++++++++++ .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 143 +++++++++++++ .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 143 +++++++++++++ tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 143 +++++++++++++ .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 143 +++++++++++++ .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 143 +++++++++++++ tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 143 +++++++++++++ .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 144 +++++++++++++ .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 144 +++++++++++++ tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 144 +++++++++++++ tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 108 ++++++++++ tests/domaincapsdata/qemu_2.9.0.s390x.xml | 183 ++++++++++++++++ .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 169 +++++++++++++++ .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 184 ++++++++++++++++ tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 109 ++++++++++ tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 169 +++++++++++++++ tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 110 ++++++++++ .../qemu_4.0.0-virt.aarch64.xml | 150 +++++++++++++ tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 144 +++++++++++++ tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 111 ++++++++++ tests/domaincapstest.c | 57 ++--- 40 files changed, 5715 insertions(+), 36 deletions(-) create mode 100644 tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_1.5.3.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_1.6.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.1.1.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0.ppc64.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0.s390x.xml create mode 100644 tests/domaincapsdata/qemu_2.10.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml create mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.4.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.5.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.7.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_2.9.0.ppc64.xml create mode 100644 tests/domaincapsdata/qemu_2.9.0.s390x.xml create mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml create mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml create mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml diff --git a/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml b/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml new file mode 100644 index 0000000000..c6b090ed06 --- /dev/null +++ b/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml @@ -0,0 +1,134 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>kvm</domain> + <machine>pc-q35-1.5</machine> + <arch>x86_64</arch> + <vcpu max='255'/> + <iothreads supported='no'/> + <os supported='yes'> + <enum name='firmware'> + <value>bios</value> + <value>efi</value> + </enum> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + <enum name='secure'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'/> + <mode name='host-model' supported='yes'> + <model fallback='allow'>Broadwell</model> + </mode> + <mode name='custom' supported='yes'> + <model usable='unknown'>Opteron_G5</model> + <model usable='unknown'>Opteron_G4</model> + <model usable='unknown'>Opteron_G3</model> + <model usable='unknown'>Opteron_G2</model> + <model usable='unknown'>Opteron_G1</model> + <model usable='unknown'>Haswell</model> + <model usable='unknown'>SandyBridge</model> + <model usable='unknown'>Westmere</model> + <model usable='unknown'>Nehalem</model> + <model usable='unknown'>Penryn</model> + <model usable='unknown'>Conroe</model> + <model usable='unknown'>n270</model> + <model usable='unknown'>athlon</model> + <model usable='unknown'>pentium3</model> + <model usable='unknown'>pentium2</model> + <model usable='unknown'>pentium</model> + <model usable='unknown'>486</model> + <model usable='unknown'>coreduo</model> + <model usable='unknown'>kvm32</model> + <model usable='unknown'>qemu32</model> + <model usable='unknown'>kvm64</model> + <model usable='unknown'>core2duo</model> + <model usable='unknown'>phenom</model> + <model usable='unknown'>qemu64</model> + </mode> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + <value>sata</value> + </enum> + <enum name='model'> + <value>virtio</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>qxl</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>vfio</value> + </enum> + </hostdev> + <rng supported='yes'> + <enum name='model'> + <value>virtio</value> + </enum> + <enum name='backendModel'> + <value>random</value> + <value>egd</value> + </enum> + </rng> + </devices> + <features> + <gic supported='no'/> + <vmcoreinfo supported='no'/> + <genid supported='no'/> + <sev supported='no'/> + </features> +</domainCapabilities> [... many more files like this one get generated ...] diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 4476423228..0197c61c8a 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -303,8 +303,11 @@ doTestQemuInternal(const char *version, } static int -doTestQemu(const char *version, +doTestQemu(const char *inputDir G_GNUC_UNUSED, + const char *prefix G_GNUC_UNUSED, + const char *version, const char *arch, + const char *suffix G_GNUC_UNUSED, void *opaque) { if (STREQ(arch, "x86_64")) { @@ -376,12 +379,6 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST_QEMU(Version, Arch) \ - do { \ - if (doTestQemu(Version, Arch, cfg) < 0) \ - ret = -1; \ - } while (0) - #define DO_TEST_LIBXL(Name, Emulator, Machine, Arch, Type) \ do { \ struct testData data = { \ @@ -428,36 +425,24 @@ mymain(void) virFileWrapperAddPrefix("/home/user/.config/qemu/firmware", abs_srcdir "/qemufirmwaredata/home/user/.config/qemu/firmware"); - DO_TEST_QEMU("1.7.0", "x86_64"); - - DO_TEST_QEMU("2.6.0", "x86_64"); - DO_TEST_QEMU("2.6.0", "aarch64"); - DO_TEST_QEMU("2.6.0", "ppc64"); - - DO_TEST_QEMU("2.7.0", "s390x"); - - DO_TEST_QEMU("2.8.0", "x86_64"); - DO_TEST_QEMU("2.8.0", "s390x"); - - DO_TEST_QEMU("2.9.0", "x86_64"); - - DO_TEST_QEMU("2.12.0", "x86_64"); - DO_TEST_QEMU("2.12.0", "aarch64"); - DO_TEST_QEMU("2.12.0", "ppc64"); - DO_TEST_QEMU("2.12.0", "s390x"); - - DO_TEST_QEMU("3.0.0", "s390x"); - - DO_TEST_QEMU("3.1.0", "x86_64"); - - DO_TEST_QEMU("4.0.0", "x86_64"); - DO_TEST_QEMU("4.0.0", "s390x"); - - DO_TEST_QEMU("4.1.0", "x86_64"); + if (testQemuCapsIterate(".xml", doTestQemu, cfg) < 0) + return EXIT_FAILURE; - DO_TEST_QEMU("4.2.0", "x86_64"); - DO_TEST_QEMU("4.2.0", "ppc64"); - DO_TEST_QEMU("4.2.0", "aarch64"); + /* + * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies" + * to generate updated or new *.replies data files. + * + * If you manually edit replies files you can run + * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. + * + * Once a replies file has been generated and tweaked if necessary, + * you can drop it into tests/qemucapabilitiesdata/ (with a sensible + * name - look at what's already there for inspiration) and test + * programs will automatically pick it up. + * + * To generate the corresponding output files after a new replies + * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 make check". + */ virObjectUnref(cfg); -- 2.21.0