Detect QEMU flags per VM instead of once for driver as a whole

This commit is contained in:
Daniel P. Berrange
2007-09-21 21:20:32 +00:00
parent b32f429849
commit 136ebc6e3c
5 changed files with 49 additions and 33 deletions

View File

@@ -31,6 +31,10 @@ static int testCompareXMLToXMLFiles(const char *xml) {
vm.def = vmdef;
vm.pid = -1;
vm.id = -1;
vm.qemuVersion = 0 * 1000 * 100 + (8 * 1000) + 1;
vm.qemuCmdFlags = QEMUD_CMD_FLAG_VNC_COLON |
QEMUD_CMD_FLAG_NO_REBOOT;
vmdef->vncActivePort = vmdef->vncPort;
if (!(actual = qemudGenerateXML(NULL, &driver, &vm, vmdef, 0)))
@@ -72,10 +76,6 @@ main(int argc, char **argv)
exit(EXIT_FAILURE);
}
driver.qemuVersion = 0 * 1000 * 100 + (8 * 1000) + 1;
driver.qemuCmdFlags = QEMUD_CMD_FLAG_VNC_COLON |
QEMUD_CMD_FLAG_NO_REBOOT;
if (virtTestRun("QEMU XML-2-ARGV minimal",
1, testCompareXMLToXMLHelper, "minimal") < 0)
ret = -1;