External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Drop virStoragePRDefIsEnabled

Browse Source 
The function now does not do anything useful. Replace it by the pointer
check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-14 07:24:25 +02:00
parent e72b3f0bbe
commit 900fc66121
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2806,7 +2806,6 @@ virStorageNetHostTransportTypeToString;
virStorageNetProtocolTypeToString;
virStoragePRDefFormat;
virStoragePRDefFree;
virStoragePRDefIsEnabled;
virStoragePRDefIsEqual;
virStoragePRDefIsManaged;
virStoragePRDefParseXML;

4
src/qemu/qemu_command.c
View File

@ -1477,7 +1477,7 @@ qemuBuildDriveSourcePR(virBufferPtr buf,
char *alias = NULL;
const char *defaultAlias = NULL;
if (!virStoragePRDefIsEnabled(disk->src->pr))
if (!disk->src->pr)
return 0;
if (virStoragePRDefIsManaged(disk->src->pr))
@ -9740,7 +9740,7 @@ qemuBuildPRManagerInfoProps(virDomainObjPtr vm,
*propsret = NULL;
*aliasret = NULL;
if (!virStoragePRDefIsEnabled(disk->src->pr))
if (!disk->src->pr)
return 0;
if (!(socketPath = qemuDomainGetPRSocketPath(vm, disk->src->pr)))

8
src/qemu/qemu_domain.c
View File

@ -4204,7 +4204,7 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
}
}
if (virStoragePRDefIsEnabled(src->pr) &&
if (src->pr &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("reservations not supported with this QEMU binary"));
@ -10240,7 +10240,7 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
}
/* qemu-pr-helper might require access to /dev/mapper/control. */
if (virStoragePRDefIsEnabled(disk->src->pr) &&
if (disk->src->pr &&
qemuDomainCreateDevice(DEVICE_MAPPER_CONTROL_PATH, data, true) < 0)
goto cleanup;
@ -11273,7 +11273,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
}
/* qemu-pr-helper might require access to /dev/mapper/control. */
if (virStoragePRDefIsEnabled(src->pr) &&
if (src->pr &&
(VIR_STRDUP(dmPath, DEVICE_MAPPER_CONTROL_PATH) < 0 ||
VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0))
goto cleanup;
@ -12050,7 +12050,7 @@ qemuDomainGetPRSocketPath(virDomainObjPtr vm,
const char *defaultAlias = NULL;
char *ret = NULL;
if (!virStoragePRDefIsEnabled(pr))
if (!pr)
return NULL;
if (virStoragePRDefIsManaged(pr)) {

2
src/qemu/qemu_hotplug.c
View File

@ -3838,7 +3838,7 @@ qemuDomainDiskNeedRemovePR(virDomainObjPtr vm,
*aliasret = NULL;
*stopDaemon = false;
if (!virStoragePRDefIsEnabled(disk->src->pr))
if (!disk->src->pr)
return 0;
if (!virStoragePRDefIsManaged(disk->src->pr)) {

7
src/util/virstoragefile.c
View File

@ -2018,13 +2018,6 @@ virStoragePRDefIsEqual(virStoragePRDefPtr a,
}
bool
virStoragePRDefIsEnabled(virStoragePRDefPtr prd)
{
return !!prd;
}
bool
virStoragePRDefIsManaged(virStoragePRDefPtr prd)
{

1
src/util/virstoragefile.h
View File

@ -396,7 +396,6 @@ void virStoragePRDefFormat(virBufferPtr buf,
virStoragePRDefPtr prd);
bool virStoragePRDefIsEqual(virStoragePRDefPtr a,
virStoragePRDefPtr b);
bool virStoragePRDefIsEnabled(virStoragePRDefPtr prd);
bool virStoragePRDefIsManaged(virStoragePRDefPtr prd);
virSecurityDeviceLabelDefPtr