conf: Introduce virDomainLoaderDefNew()

For now we just allocate the object, so the only advantage is
that invocations are shorter and look a bit nicer.

Later on, its introduction will pay off by letting us change
things in a single spot instead of all over the library.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c
index b0f3026c760338c75ee0c5ae63b5058b93fd98e6..cb1b94b4d533f1ec3ea697ffb3d10df1689c5ba1 100644 (file)
--- a/src/bhyve/bhyve_firmware.c
+++ b/src/bhyve/bhyve_firmware.c
@@ -78,7 +78,7 @@ bhyveFirmwareFillDomain(bhyveConn *driver,
     }
 
     if (!def->os.loader)
-        def->os.loader = g_new0(virDomainLoaderDef, 1);
+        def->os.loader = virDomainLoaderDefNew();
 
     def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH;
     def->os.loader->readonly = VIR_TRISTATE_BOOL_YES;

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8d77eb42951e5ebdbedb7cede5426aeb05ab2a04..f61874e8ab52b62329cf3055524cd1015f4d2de8 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3723,6 +3723,12 @@ virDomainPanicDefFree(virDomainPanicDef *panic)
     g_free(panic);
 }
 
+virDomainLoaderDef *
+virDomainLoaderDefNew(void)
+{
+    return g_new0(virDomainLoaderDef, 1);
+}
+
 void
 virDomainLoaderDefFree(virDomainLoaderDef *loader)
 {
@@ -17245,7 +17251,7 @@ virDomainDefParseBootLoaderOptions(virDomainDef *def,
     if (!loaderNode && !nvramNode)
         return 0;
 
-    def->os.loader = g_new0(virDomainLoaderDef, 1);
+    def->os.loader = virDomainLoaderDefNew();
 
     if (virDomainLoaderDefParseXML(def->os.loader,
                                    loaderNode, nvramNode, nvramSourceNode,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2a8ad17f44079e1f6d077c6546c3f2a0033aa580..f1513eb222372a99325dea90f1d9331d32e7e6da 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2316,6 +2316,7 @@ struct _virDomainLoaderDef {
     char *nvramTemplate;   /* user override of path to master nvram */
 };
 
+virDomainLoaderDef *virDomainLoaderDefNew(void);
 void virDomainLoaderDefFree(virDomainLoaderDef *loader);
 
 typedef enum {

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f1bed27ba72807c62d7200484fbd483f149711ef..67254b6ac8068124712de407c194895f84bc7ce5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -507,6 +507,7 @@ virDomainLeaseRemoveAt;
 virDomainLifecycleActionTypeFromString;
 virDomainLifecycleActionTypeToString;
 virDomainLoaderDefFree;
+virDomainLoaderDefNew;
 virDomainLoaderTypeFromString;
 virDomainLoaderTypeToString;
 virDomainLockFailureTypeFromString;

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index cee9f827f725c2c11c8532ed5677b7b79184cac7..97c183ebf341e1e6f7243ac0d313eafc72d4b40e 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -643,7 +643,7 @@ libxlMakeDomBuildInfo(virDomainDef *def,
          */
         if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
             if (def->os.loader == NULL)
-                def->os.loader = g_new0(virDomainLoaderDef, 1);
+                def->os.loader = virDomainLoaderDefNew();
             if (def->os.loader->path == NULL)
                 def->os.loader->path = g_strdup(cfg->firmwares[0]->name);
             if (def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_NONE)

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 69193256239d705e118aa4a325a3a4d1e487fe0b..cfd56b3b05e8ae37f94cfd8d5083f70b7625bd0d 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -111,7 +111,7 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
             return -1;
 
         if (bios && STREQ(bios, "ovmf")) {
-            def->os.loader = g_new0(virDomainLoaderDef, 1);
+            def->os.loader = virDomainLoaderDefNew();
             def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH;
             def->os.loader->readonly = VIR_TRISTATE_BOOL_YES;
 
@@ -120,7 +120,7 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
             for (i = 0; i < caps->nguests; i++) {
                 if (caps->guests[i]->ostype == VIR_DOMAIN_OSTYPE_HVM &&
                     caps->guests[i]->arch.id == def->os.arch) {
-                    def->os.loader = g_new0(virDomainLoaderDef, 1);
+                    def->os.loader = virDomainLoaderDefNew();
                     def->os.loader->path = g_strdup(caps->guests[i]->arch.defaultInfo.loader);
                 }
             }

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 081d323c2a49bf374e5e957c50067c190c562313..334de071bab2c6ec9e16cb611a2863b7e35a9d50 100644 (file)
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -42,7 +42,7 @@ xenParseXMOS(virConf *conf, virDomainDef *def)
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         g_autofree char *boot = NULL;
 
-        def->os.loader = g_new0(virDomainLoaderDef, 1);
+        def->os.loader = virDomainLoaderDefNew();
 
         if (xenConfigCopyString(conf, "kernel", &def->os.loader->path) < 0)
             return -1;

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index eb7abb0b323b3d3096a67b0797389b959192616b..98b42bc6fbc1bbe9027840cd0195d1325bb53cea 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1168,7 +1168,7 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
     switch (fw->mapping.device) {
     case QEMU_FIRMWARE_DEVICE_FLASH:
         if (!def->os.loader)
-            def->os.loader = g_new0(virDomainLoaderDef, 1);
+            def->os.loader = virDomainLoaderDefNew();
 
         def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH;
         def->os.loader->readonly = VIR_TRISTATE_BOOL_YES;
@@ -1218,7 +1218,7 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
 
     case QEMU_FIRMWARE_DEVICE_MEMORY:
         if (!def->os.loader)
-            def->os.loader = g_new0(virDomainLoaderDef, 1);
+            def->os.loader = virDomainLoaderDefNew();
 
         def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM;
         def->os.loader->path = g_strdup(memory->filename);