From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 10 Sep 2009 10:09:06 +0000 (+0100)
Subject: Canonicalize the qemu machine type in qemuxml2argvtest
X-Git-Tag: v0.7.1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7ab461061b3cc6806ac8c0ffb305dcc6c56f41;p=thirdparty%2Flibvirt.git

Canonicalize the qemu machine type in qemuxml2argvtest

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
---

diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index 9fa455975a..ed91d2cd2a 100644
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -194,6 +194,9 @@ int         qemudProbeMachineTypes      (const char *binary,
                                          virCapsGuestMachinePtr **machines,
                                          int *nmachines);
 
+int         qemudCanonicalizeMachine    (struct qemud_driver *driver,
+                                         virDomainDefPtr def);
+
 virDomainDefPtr qemuParseCommandLine(virConnectPtr conn,
                                      virCapsPtr caps,
                                      const char **progenv,
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index ae112d84f7..f2b0becca8 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4781,10 +4781,9 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical)
     return 0;
 }
 
-static int
-qemudCanonicalizeMachine(virConnectPtr conn, virDomainDefPtr def)
+int
+qemudCanonicalizeMachine(struct qemud_driver *driver, virDomainDefPtr def)
 {
-    struct qemud_driver *driver = conn->privateData;
     char *canonical = NULL;
     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;
 
     if (!(vm = virDomainAssignDef(conn,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d1cef0ef1a..edd37441aa 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -56,6 +56,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
         QEMUD_CMD_FLAG_NO_REBOOT |
         extraFlags;
 
+    if (qemudCanonicalizeMachine(&driver, vmdef) < 0)
+        goto fail;
+
     if (qemudBuildCommandLine(NULL, &driver,
                               vmdef, &monitor_chr, flags,
                               &argv, &qenv,