util: storage: Drop virStoragePRDefIsEnabled

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

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 98529bd5ef4a47dadd5b952a1029d4736c2f23c7..05babb7ac02bbae87d4f288812494d84c9827a70 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2806,7 +2806,6 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStoragePRDefFormat;
 virStoragePRDefFree;
-virStoragePRDefIsEnabled;
 virStoragePRDefIsEqual;
 virStoragePRDefIsManaged;
 virStoragePRDefParseXML;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d62dda6d960252174bf8218d6dce598c87a0f399..53de109a2002cbb257081402164fa7e147c1893a 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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)))

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8a39956564623185f508ffa5376e4f877c4e2426..9c9a1bda6aa0593bf1543cac7a8d9482e27b7b2d 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -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)) {

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0bc7be28d1b67b719082e0e11cac4e1fc95fdc98..fbbb7d1917d813778eb7522a29c92f111f666823 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -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)) {

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d6907e47bbb8f7d3e153696fc6475e1ba2982fba..c89bdb9e494487914a65ff693522b9b051f2b020 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2018,13 +2018,6 @@ virStoragePRDefIsEqual(virStoragePRDefPtr a,
 }
 
 
-bool
-virStoragePRDefIsEnabled(virStoragePRDefPtr prd)
-{
-    return !!prd;
-}
-
-
 bool
 virStoragePRDefIsManaged(virStoragePRDefPtr prd)
 {

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index ec4915288073030857f8bf783caf07de922ac0f6..3a90c60fa52fc8bf4f66d60d92c5c85d068a537d 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -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