From 4841f815fcefb0a2e8715808bb4038c89e3b3889 Mon Sep 17 00:00:00 2001 Message-Id: <4841f815fcefb0a2e8715808bb4038c89e3b3889@dist-git> From: Michal Privoznik Date: Mon, 23 Feb 2015 08:20:02 +0100 Subject: [PATCH] qemuxml2argvtest: Fake response from numad RHEL-7.2: https://bugzilla.redhat.com/show_bug.cgi?id=1191567 RHEL-7.1.z: https://bugzilla.redhat.com/show_bug.cgi?id=1194982 Well, we can pretend that we've asked numad for its suggestion and let qemu command line be built with that respect. Again, this alone has no big value, but see later commits which build on the top of this. Signed-off-by: Michal Privoznik (cherry picked from commit 38064806966c04d7cf7525cd78aa6f82bd09e6d0) Signed-off-by: Michal Privoznik Conflicts: tests/qemuxml2argvtest.c: Context, as f7afeddc is not backported yet. Signed-off-by: Jiri Denemark --- tests/qemuxml2argvtest.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 595b658..98bb9ad 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -279,12 +279,16 @@ static int testCompareXMLToArgvFiles(const char *xml, char *log = NULL; virCommandPtr cmd = NULL; size_t i; + virBitmapPtr nodeset = NULL; if (!(conn = virGetConnect())) goto out; conn->secretDriver = &fakeSecretDriver; conn->storageDriver = &fakeStorageDriver; + if (virBitmapParse("0-3", '\0', &nodeset, 4) < 0) + goto out; + if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, QEMU_EXPECTED_VIRT_TYPES, VIR_DOMAIN_XML_INACTIVE))) { @@ -363,7 +367,7 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &testCallbacks, false, (flags & FLAG_FIPS), - NULL))) { + nodeset))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_FAILURE)) { ret = 0; @@ -416,6 +420,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandFree(cmd); virDomainDefFree(vmdef); virObjectUnref(conn); + virBitmapFree(nodeset); return ret; } -- 2.3.0