Revert commit 55e6d8cd9eac7eb2aaa4d221585e9402cf7269d5. This fix for https://bugzilla.redhat.com/show_bug.cgi?id=1267256 unconditionally required a machine type for all machine types even though qemu is the only emulator using them. Revert it to fix persistent configs for drivers with no machine type: https://www.redhat.com/archives/libvir-list/2016-February/msg01228.html --- src/conf/domain_conf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3b15cb4..79758d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14851,12 +14851,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } VIR_FREE(capsdata); - } else { - if (!def->os.machine) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing machine type")); - goto error; - } } /* Extract domain name */ -- 2.4.10

--- tests/qemuxml2argvtest.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 854623d..517f996 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -253,7 +253,8 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, const char *migrateURI, - virQemuXML2ArgvTestFlags flags) + virQemuXML2ArgvTestFlags flags, + unsigned int parseFlags) { char *actualargv = NULL; int ret = -1; @@ -275,7 +276,8 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) { + (VIR_DOMAIN_DEF_PARSE_INACTIVE | + parseFlags)))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_PARSE_ERROR)) goto ok; @@ -408,6 +410,7 @@ struct testInfo { const char *migrateFrom; int migrateFd; unsigned int flags; + unsigned int parseFlags; }; static int @@ -443,7 +446,7 @@ testCompareXMLToArgvHelper(const void *data) goto cleanup; result = testCompareXMLToArgvFiles(xml, args, info->extraFlags, - migrateURI, flags); + migrateURI, flags, info->parseFlags); cleanup: VIR_FREE(migrateURI); @@ -537,10 +540,11 @@ mymain(void) if (VIR_STRDUP_QUIET(driver.config->channelTargetDir, "/tmp") < 0) return EXIT_FAILURE; -# define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, ...) \ +# define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, \ + parseFlags, ...) \ do { \ static struct testInfo info = { \ - name, NULL, migrateFrom, migrateFd, (flags) \ + name, NULL, migrateFrom, migrateFd, (flags), parseFlags \ }; \ if (!(info.extraFlags = virQEMUCapsNew())) \ return EXIT_FAILURE; \ @@ -554,21 +558,22 @@ mymain(void) } while (0) # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, NULL, -1, 0, __VA_ARGS__) + DO_TEST_FULL(name, NULL, -1, 0, 0, __VA_ARGS__) # define DO_TEST_ERROR(name, ...) \ - DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_ERROR, __VA_ARGS__) + DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_ERROR, 0, __VA_ARGS__) # define DO_TEST_FAILURE(name, ...) \ - DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, __VA_ARGS__) + DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, 0, __VA_ARGS__) # define DO_TEST_PARSE_ERROR(name, ...) \ DO_TEST_FULL(name, NULL, -1, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_ERROR, \ - __VA_ARGS__) + 0, __VA_ARGS__) + # define DO_TEST_LINUX(name, ...) \ - DO_TEST_LINUX_FULL(name, NULL, -1, 0, __VA_ARGS__) + DO_TEST_LINUX_FULL(name, NULL, -1, 0, 0, __VA_ARGS__) # ifdef __linux__ /* This is a macro that invokes test only on Linux. It's @@ -1262,12 +1267,12 @@ mymain(void) QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_ROMBAR); - DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, NONE); - DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, NONE); - DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, NONE); - DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, NONE); + DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, NONE); + DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, NONE); + DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, NONE); + DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, NONE); - DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, + DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); -- 2.4.10

On 02/25/2016 10:40 AM, Ján Tomko wrote: A "nit" of sorts... Sometimes we start error messages with Capital letters and sometimes we don't... I guess I've trained my fingers to go with lower case letters (although it really messes with my eyes/brain). Since a majority in qemu_domain go with lower case, could we take that path here too. But really what I'd like to point out - would it be possible to add "def->name" to the error message to indicate which domain had the issue. When it happened to me all I got were two messages during startup - I had to generate a local patch which added the def->name to the output to figure out which of my domains had the issue. This actually is a much bigger problem overall... We have a *lot* of messages spewed in domain_conf.c and perhaps a couple that spit out *which* domain. Now if I'm defining/creating a single domain, it's easy to figure out. Figuring it out which domain had an issue during libvirtd start/restart/reload is a problem of magnitude! I have to figure out who's missing ;-) Tks - John