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

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,

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,

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,