External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: make virDomainDiskInsert() void

Browse Source 
This function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Matt Coleman 2020-11-05 22:32:57 -05:00 committed by Michal Privoznik
parent 81e91f6a93
commit 736c9ea02d
7 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/domain_conf.c
View File

@ -17682,14 +17682,11 @@ virDomainDiskByTarget(virDomainDefPtr def,
} }
int virDomainDiskInsert(virDomainDefPtr def, void virDomainDiskInsert(virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
def->disks = g_renew(virDomainDiskDefPtr, def->disks, def->ndisks + 1); def->disks = g_renew(virDomainDiskDefPtr, def->disks, def->ndisks + 1);
virDomainDiskInsertPreAlloced(def, disk); virDomainDiskInsertPreAlloced(def, disk);
return 0;
} }
void virDomainDiskInsertPreAlloced(virDomainDefPtr def, void virDomainDiskInsertPreAlloced(virDomainDefPtr def,

4
src/conf/domain_conf.h
View File

@ -3354,9 +3354,7 @@ virDomainDiskDefPtr
virDomainDiskByTarget(virDomainDefPtr def, virDomainDiskByTarget(virDomainDefPtr def,
const char *dst); const char *dst);
int virDomainDiskInsert(virDomainDefPtr def, void virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk);
virDomainDiskDefPtr disk)
G_GNUC_WARN_UNUSED_RESULT;
void virDomainDiskInsertPreAlloced(virDomainDefPtr def, void virDomainDiskInsertPreAlloced(virDomainDefPtr def,
virDomainDiskDefPtr disk); virDomainDiskDefPtr disk);
int virDomainStorageNetworkParseHost(xmlNodePtr hostnode, int virDomainStorageNetworkParseHost(xmlNodePtr hostnode,

3
src/libxl/libxl_driver.c
View File

@ -3548,8 +3548,7 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
_("target %s already exists."), disk->dst); _("target %s already exists."), disk->dst);
return -1; return -1;
} }
if (virDomainDiskInsert(vmdef, disk) < 0) virDomainDiskInsert(vmdef, disk);
return -1;
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */ /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
dev->data.disk = NULL; dev->data.disk = NULL;
break; break;

3
src/lxc/lxc_driver.c
View File

@ -3045,8 +3045,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef,
_("target %s already exists."), disk->dst); _("target %s already exists."), disk->dst);
return -1; return -1;
} }
if (virDomainDiskInsert(vmdef, disk) < 0) virDomainDiskInsert(vmdef, disk);
return -1;
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */ /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
dev->data.disk = NULL; dev->data.disk = NULL;
ret = 0; ret = 0;

3
src/qemu/qemu_driver.c
View File

@ -7233,8 +7233,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0) if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0)
return -1; return -1;
if (virDomainDiskInsert(vmdef, disk) < 0) virDomainDiskInsert(vmdef, disk);
return -1;
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */ /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
dev->data.disk = NULL; dev->data.disk = NULL;
break; break;

6
src/vz/vz_sdk.c
View File

@ -833,8 +833,7 @@ prlsdkAddDomainHardDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDef
if (prlsdkGetDiskInfo(driver, hdd, disk, false, IS_CT(def)) < 0) if (prlsdkGetDiskInfo(driver, hdd, disk, false, IS_CT(def)) < 0)
goto error; goto error;
if (virDomainDiskInsert(def, disk) < 0) virDomainDiskInsert(def, disk);
goto error;
disk = NULL; disk = NULL;
PrlHandle_Free(hdd); PrlHandle_Free(hdd);
@ -876,8 +875,7 @@ prlsdkAddDomainOpticalDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomain
PrlHandle_Free(cdrom); PrlHandle_Free(cdrom);
cdrom = PRL_INVALID_HANDLE; cdrom = PRL_INVALID_HANDLE;
if (virDomainDiskInsert(def, disk) < 0) virDomainDiskInsert(def, disk);
goto error;
} }
return 0; return 0;

5
tests/qemublocktest.c
View File

@ -278,10 +278,11 @@ testQemuDiskXMLToProps(const void *opaque)
VIR_DOMAIN_DEF_PARSE_STATUS))) VIR_DOMAIN_DEF_PARSE_STATUS)))
return -1; return -1;
if (!(vmdef = virDomainDefNew()) || if (!(vmdef = virDomainDefNew()))
virDomainDiskInsert(vmdef, disk) < 0)
return -1; return -1;
virDomainDiskInsert(vmdef, disk);
if (qemuValidateDomainDeviceDefDisk(disk, vmdef, data->qemuCaps) < 0) { if (qemuValidateDomainDeviceDefDisk(disk, vmdef, data->qemuCaps) < 0) {
VIR_TEST_VERBOSE("invalid configuration for disk"); VIR_TEST_VERBOSE("invalid configuration for disk");
return -1; return -1;