External/libvirt
1
0
Fork 0
Code

qemu: block: Introduce and use AUTOPTR func for qemuBlockStorageSourceAttachDataPtr

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-04-04 10:46:21 +02:00
parent e0befb78b1
commit 1d2eb86682
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_block.c
View File

@ -1543,7 +1543,7 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
qemuBlockStorageSourceAttachDataPtr qemuBlockStorageSourceAttachDataPtr
qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src) qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src)
{ {
qemuBlockStorageSourceAttachDataPtr data; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL;
qemuBlockStorageSourceAttachDataPtr ret = NULL; qemuBlockStorageSourceAttachDataPtr ret = NULL;
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
@ -1559,7 +1559,6 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src)
VIR_STEAL_PTR(ret, data); VIR_STEAL_PTR(ret, data);
cleanup: cleanup:
qemuBlockStorageSourceAttachDataFree(data);
return ret; return ret;
} }

3
src/qemu/qemu_block.h
View File

@ -102,6 +102,9 @@ struct qemuBlockStorageSourceAttachData {
void void
qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data); qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data);
VIR_DEFINE_AUTOPTR_FUNC(qemuBlockStorageSourceAttachData,
qemuBlockStorageSourceAttachDataFree);
qemuBlockStorageSourceAttachDataPtr qemuBlockStorageSourceAttachDataPtr
qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src); qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src);

14
src/qemu/qemu_command.c
View File

@ -2554,7 +2554,7 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
{ {
qemuBlockStorageSourceAttachDataPtr *data = NULL; qemuBlockStorageSourceAttachDataPtr *data = NULL;
size_t ndata = 0; size_t ndata = 0;
qemuBlockStorageSourceAttachDataPtr tmp = NULL; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) tmp = NULL;
virJSONValuePtr copyOnReadProps = NULL; virJSONValuePtr copyOnReadProps = NULL;
virStorageSourcePtr n; virStorageSourcePtr n;
char *str = NULL; char *str = NULL;
@ -2613,7 +2613,6 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
for (i = 0; i < ndata; i++) for (i = 0; i < ndata; i++)
qemuBlockStorageSourceAttachDataFree(data[i]); qemuBlockStorageSourceAttachDataFree(data[i]);
VIR_FREE(data); VIR_FREE(data);
qemuBlockStorageSourceAttachDataFree(tmp);
virJSONValueFree(copyOnReadProps); virJSONValueFree(copyOnReadProps);
VIR_FREE(str); VIR_FREE(str);
return ret; return ret;
@ -11162,18 +11161,19 @@ qemuBlockStorageSourceAttachDataPtr
qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
qemuBlockStorageSourceAttachDataPtr data = NULL; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL;
qemuBlockStorageSourceAttachDataPtr ret = NULL;
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
return NULL; return NULL;
if (!(data->driveCmd = qemuBuildDriveStr(disk, qemuCaps)) || if (!(data->driveCmd = qemuBuildDriveStr(disk, qemuCaps)) ||
!(data->driveAlias = qemuAliasDiskDriveFromDisk(disk))) { !(data->driveAlias = qemuAliasDiskDriveFromDisk(disk)))
qemuBlockStorageSourceAttachDataFree(data);
return NULL; return NULL;
}
return data; VIR_STEAL_PTR(ret, data);
return ret;
} }

9
src/qemu/qemu_hotplug.c
View File

@ -531,7 +531,7 @@ qemuHotplugRemoveStorageSourcePrepareData(virStorageSourcePtr src,
{ {
qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
qemuBlockStorageSourceAttachDataPtr data; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL;
qemuBlockStorageSourceAttachDataPtr ret = NULL; qemuBlockStorageSourceAttachDataPtr ret = NULL;
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
@ -571,7 +571,6 @@ qemuHotplugRemoveStorageSourcePrepareData(virStorageSourcePtr src,
cleanup: cleanup:
VIR_FREE(driveAlias); VIR_FREE(driveAlias);
qemuBlockStorageSourceAttachDataFree(data);
return ret; return ret;
} }
@ -582,7 +581,7 @@ qemuHotplugDiskSourceRemovePrepare(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
qemuBlockStorageSourceAttachDataPtr backend = NULL; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend = NULL;
qemuHotplugDiskSourceDataPtr data = NULL; qemuHotplugDiskSourceDataPtr data = NULL;
qemuHotplugDiskSourceDataPtr ret = NULL; qemuHotplugDiskSourceDataPtr ret = NULL;
char *drivealias = NULL; char *drivealias = NULL;
@ -617,7 +616,6 @@ qemuHotplugDiskSourceRemovePrepare(virDomainDiskDefPtr disk,
VIR_STEAL_PTR(ret, data); VIR_STEAL_PTR(ret, data);
cleanup: cleanup:
qemuBlockStorageSourceAttachDataFree(backend);
qemuHotplugDiskSourceDataFree(data); qemuHotplugDiskSourceDataFree(data);
return ret; return ret;
} }
@ -637,7 +635,7 @@ qemuHotplugDiskSourceAttachPrepare(virDomainDiskDefPtr disk,
virStorageSourcePtr src, virStorageSourcePtr src,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
qemuBlockStorageSourceAttachDataPtr backend = NULL; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend = NULL;
qemuHotplugDiskSourceDataPtr data; qemuHotplugDiskSourceDataPtr data;
qemuHotplugDiskSourceDataPtr ret = NULL; qemuHotplugDiskSourceDataPtr ret = NULL;
virStorageSourcePtr savesrc = NULL; virStorageSourcePtr savesrc = NULL;
@ -683,7 +681,6 @@ qemuHotplugDiskSourceAttachPrepare(virDomainDiskDefPtr disk,
if (savesrc) if (savesrc)
VIR_STEAL_PTR(disk->src, savesrc); VIR_STEAL_PTR(disk->src, savesrc);
qemuBlockStorageSourceAttachDataFree(backend);
qemuHotplugDiskSourceDataFree(data); qemuHotplugDiskSourceDataFree(data);
return ret; return ret;
} }

3
src/qemu/qemu_migration.c
View File

@ -787,7 +787,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver,
unsigned int mirror_flags, unsigned int mirror_flags,
const char *tlsAlias) const char *tlsAlias)
{ {
qemuBlockStorageSourceAttachDataPtr data = NULL; VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL;
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
int mon_ret = 0; int mon_ret = 0;
int ret = -1; int ret = -1;
@ -849,7 +849,6 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
qemuBlockStorageSourceAttachDataFree(data);
return ret; return ret;
} }