External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: remove virDomainDiskInsertPreAlloced

Browse Source 
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>
This commit is contained in:
Peter Krempa 2021-05-18 16:02:18 +02:00
parent 7c67afce65
commit 02f843e70a
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -15523,13 +15523,6 @@ virDomainDiskByTarget(virDomainDef *def,
void virDomainDiskInsert(virDomainDef *def, void virDomainDiskInsert(virDomainDef *def,
virDomainDiskDef *disk) virDomainDiskDef *disk)
{
def->disks = g_renew(virDomainDiskDef *, def->disks, def->ndisks + 1);
virDomainDiskInsertPreAlloced(def, disk);
}
void virDomainDiskInsertPreAlloced(virDomainDef *def,
virDomainDiskDef *disk)
{ {
int idx; int idx;
/* Tentatively plan to insert disk at the end. */ /* 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(def->disks, insertAt, def->ndisks, disk));
ignore_value(VIR_INSERT_ELEMENT_INPLACE(def->disks, insertAt,
def->ndisks, disk));
} }
@ -19553,9 +19544,6 @@ virDomainDefParseXML(xmlDocPtr xml,
if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0) if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0)
goto error; goto error;
if (n)
def->disks = g_new0(virDomainDiskDef *, n);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
virDomainDiskDef *disk = virDomainDiskDefParseXML(xmlopt, virDomainDiskDef *disk = virDomainDiskDefParseXML(xmlopt,
nodes[i], nodes[i],
@ -19564,7 +19552,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (!disk) if (!disk)
goto error; goto error;
virDomainDiskInsertPreAlloced(def, disk); virDomainDiskInsert(def, disk);
} }
VIR_FREE(nodes); VIR_FREE(nodes);

2
src/conf/domain_conf.h
View File

@ -3559,8 +3559,6 @@ virDomainDiskByTarget(virDomainDef *def,
const char *dst); const char *dst);
void virDomainDiskInsert(virDomainDef *def, virDomainDiskDef *disk); void virDomainDiskInsert(virDomainDef *def, virDomainDiskDef *disk);
void virDomainDiskInsertPreAlloced(virDomainDef *def,
virDomainDiskDef *disk);
int virDomainStorageNetworkParseHost(xmlNodePtr hostnode, int virDomainStorageNetworkParseHost(xmlNodePtr hostnode,
virStorageNetHostDef *host); virStorageNetHostDef *host);
int virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt, int virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt,

1
src/libvirt_private.syms
View File

@ -389,7 +389,6 @@ virDomainDiskGetType;
virDomainDiskIndexByAddress; virDomainDiskIndexByAddress;
virDomainDiskIndexByName; virDomainDiskIndexByName;
virDomainDiskInsert; virDomainDiskInsert;
virDomainDiskInsertPreAlloced;
virDomainDiskIoTypeFromString; virDomainDiskIoTypeFromString;
virDomainDiskIoTypeToString; virDomainDiskIoTypeToString;
virDomainDiskMirrorStateTypeFromString; virDomainDiskMirrorStateTypeFromString;