qemu: parse: Use virControllerDefNew

Rather than reimplement it. This will be needed in upcoming patches

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a8b517382ac1f6e2235a70c4839864ffa3861e24..3883d04c428e24da374850c70bd22f901d8d9eed 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1638,7 +1638,7 @@ virDomainDiskSetFormat(virDomainDiskDefPtr def, int format)
 }
 
 
-static virDomainControllerDefPtr
+virDomainControllerDefPtr
 virDomainControllerDefNew(virDomainControllerType type)
 {
     virDomainControllerDefPtr def;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c2fa3b81007c55309393da26ddee0aa7c4f4b20d..fb872d4bb7af2cb11744673b82d4173fda9c5f70 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2563,6 +2563,8 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
                                                  int bus,
                                                  char *dst);
 void virDomainControllerDefFree(virDomainControllerDefPtr def);
+virDomainControllerDefPtr
+virDomainControllerDefNew(virDomainControllerType type);
 void virDomainFSDefFree(virDomainFSDefPtr def);
 void virDomainActualNetDefFree(virDomainActualNetDefPtr def);
 void virDomainNetDefFree(virDomainNetDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index a057a1e8305c75dd9ffa35e545d515568b2888fa..48b28c486f7ab4316859923747c0c4f38c855bc3 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -186,6 +186,7 @@ virDomainClockOffsetTypeToString;
 virDomainConfigFile;
 virDomainControllerAliasFind;
 virDomainControllerDefFree;
+virDomainControllerDefNew;
 virDomainControllerFind;
 virDomainControllerFindByType;
 virDomainControllerInsert;

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 577651bbdb83c4f06f0ddfc0695c3cb61d94cf85..7ce90f926dd534534e839327567b1c512ac9c452 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -2351,13 +2351,11 @@ qemuParseCommandLine(virCapsPtr caps,
             /* ignore, generted on the fly */
         } else if (STREQ(arg, "-usb")) {
             virDomainControllerDefPtr ctldef;
-            if (VIR_ALLOC(ctldef) < 0)
+            ctldef = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
+            if (!ctldef)
                 goto error;
-            ctldef->type = VIR_DOMAIN_CONTROLLER_TYPE_USB;
-            ctldef->idx = 0;
-            ctldef->model = -1;
             if (virDomainControllerInsert(def, ctldef) < 0) {
-                VIR_FREE(ctldef);
+                virDomainControllerDefFree(ctldef);
                 goto error;
             }
         } else if (STREQ(arg, "-pidfile")) {