conf: remove virDomainDiskInsertPreAlloced

Replace the last use of the function by virDomainDiskInsert and remove
the unused helper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8172c8882aca9c3a79c1e1672ea438b6e6e9a38e..e27154f22d8d0758809fc4546364e12fb8aafb75 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15523,13 +15523,6 @@ virDomainDiskByTarget(virDomainDef *def,
 
 void virDomainDiskInsert(virDomainDef *def,
                          virDomainDiskDef *disk)
-{
-    def->disks = g_renew(virDomainDiskDef *, def->disks, def->ndisks + 1);
-    virDomainDiskInsertPreAlloced(def, disk);
-}
-
-void virDomainDiskInsertPreAlloced(virDomainDef *def,
-                                   virDomainDiskDef *disk)
 {
     int idx;
     /* Tentatively plan to insert disk at the end. */
@@ -15556,9 +15549,7 @@ void virDomainDiskInsertPreAlloced(virDomainDef *def,
         }
     }
 
-    /* VIR_INSERT_ELEMENT_INPLACE will never return an error here. */
-    ignore_value(VIR_INSERT_ELEMENT_INPLACE(def->disks, insertAt,
-                                            def->ndisks, disk));
+    ignore_value(VIR_INSERT_ELEMENT(def->disks, insertAt, def->ndisks, disk));
 }
 
 
@@ -19553,9 +19544,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0)
         goto error;
 
-    if (n)
-        def->disks = g_new0(virDomainDiskDef *, n);
-
     for (i = 0; i < n; i++) {
         virDomainDiskDef *disk = virDomainDiskDefParseXML(xmlopt,
                                                           nodes[i],
@@ -19564,7 +19552,7 @@ virDomainDefParseXML(xmlDocPtr xml,
         if (!disk)
             goto error;
 
-        virDomainDiskInsertPreAlloced(def, disk);
+        virDomainDiskInsert(def, disk);
     }
     VIR_FREE(nodes);
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8d64d4a1e2f8d513cb66ef8a01626b654790d60f..f38ab21a3b7b3e3a96630cee51315ec166633e84 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3559,8 +3559,6 @@ virDomainDiskByTarget(virDomainDef *def,
                       const char *dst);
 
 void virDomainDiskInsert(virDomainDef *def, virDomainDiskDef *disk);
-void virDomainDiskInsertPreAlloced(virDomainDef *def,
-                                   virDomainDiskDef *disk);
 int virDomainStorageNetworkParseHost(xmlNodePtr hostnode,
                                      virStorageNetHostDef *host);
 int virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index baca9dc1b3b6af05eefecfdd4b0450364a54b47f..e1aef5267ee5b688dda81a9d9b75781cdcc8c6f0 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -389,7 +389,6 @@ virDomainDiskGetType;
 virDomainDiskIndexByAddress;
 virDomainDiskIndexByName;
 virDomainDiskInsert;
-virDomainDiskInsertPreAlloced;
 virDomainDiskIoTypeFromString;
 virDomainDiskIoTypeToString;
 virDomainDiskMirrorStateTypeFromString;