External/libvirt
1
0
Fork 0
Code

Canonicalize the qemu machine type in qemuxml2argvtest

Browse Source 
This doesn't have any affect on the current tests because we don't have
any machine aliases in the current test data.

* src/qemu_conf.h, src/qemu_driver.c: expose qemudCanonicalizeMachine()
  for the tests

* tests/qemuxml2argvtest.c: canonicalize the machine type
This commit is contained in:
Mark McLoughlin 2009-09-10 11:09:06 +01:00
parent d7ed2c18e1
commit 6e7ab46106
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu_conf.h
View File

@ -194,6 +194,9 @@ int qemudProbeMachineTypes (const char *binary,
virCapsGuestMachinePtr **machines, virCapsGuestMachinePtr **machines,
int *nmachines); int *nmachines);
int qemudCanonicalizeMachine (struct qemud_driver *driver,
virDomainDefPtr def);
virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, virDomainDefPtr qemuParseCommandLine(virConnectPtr conn,
virCapsPtr caps, virCapsPtr caps,
const char **progenv, const char **progenv,

7
src/qemu_driver.c
View File

@ -4781,10 +4781,9 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical)
return 0; return 0;
} }
static int int
qemudCanonicalizeMachine(virConnectPtr conn, virDomainDefPtr def) qemudCanonicalizeMachine(struct qemud_driver *driver, virDomainDefPtr def)
{ {
struct qemud_driver *driver = conn->privateData;
char *canonical = NULL; char *canonical = NULL;
int i; int i;
@ -4875,7 +4874,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
} }
} }
if (qemudCanonicalizeMachine(conn, def) < 0) if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup; goto cleanup;
if (!(vm = virDomainAssignDef(conn, if (!(vm = virDomainAssignDef(conn,

3
tests/qemuxml2argvtest.c
View File

@ -56,6 +56,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
QEMUD_CMD_FLAG_NO_REBOOT | QEMUD_CMD_FLAG_NO_REBOOT |
extraFlags; extraFlags;
if (qemudCanonicalizeMachine(&driver, vmdef) < 0)
goto fail;
if (qemudBuildCommandLine(NULL, &driver, if (qemudBuildCommandLine(NULL, &driver,
vmdef, &monitor_chr, flags, vmdef, &monitor_chr, flags,
&argv, &qenv, &argv, &qenv,