qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet

[libvirt PATCH] qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet

Jiri Denemark posted 1 patch 3 years, 1 month ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/5953324856ca164d4fbf05e259dc48c3df0c5d2d.1616193024.git.jdenemar@redhat.com

src/qemu/qemu_domain.c  | 5 +----
src/qemu/qemu_process.c | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)

Expand all Fold all

[libvirt PATCH] qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet

Posted by Jiri Denemark 3 years, 1 month ago

virQEMUCapsGet checks for qemuCaps itself, no need to do it explicitly.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_domain.c  | 5 +----
 src/qemu/qemu_process.c | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5c98f8ff1a..fff67481a7 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5289,7 +5289,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDefPtr disk,
     g_autofree char *encalias = NULL;
 
     if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) ||
-        !qemuCaps ||
         virStorageSourceIsEmpty(disk->src) ||
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET))
         return 0;
@@ -5475,7 +5474,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDefPtr hostde
     g_autofree char *authalias = NULL;
 
     if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) ||
-        !qemuCaps ||
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET))
         return 0;
 
@@ -5520,8 +5518,7 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDefPtr ho
     if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS))
         return 0;
 
-    if (!qemuCaps ||
-        hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
+    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
         hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI ||
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI))
         return 0;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0b79dde2c3..b86afe4daa 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8349,8 +8349,7 @@ qemuProcessReconnect(void *opaque)
     if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
         goto error;
 
-    if (priv->qemuCaps &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS))
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS))
         retry = false;
 
     if (qemuDomainObjStartWorker(obj) < 0)
-- 
2.31.0

Re: [libvirt PATCH] qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet

Posted by Erik Skultety 3 years ago

On Fri, Mar 19, 2021 at 11:30:24PM +0100, Jiri Denemark wrote:
> virQEMUCapsGet checks for qemuCaps itself, no need to do it explicitly.
> 
> Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
> ---
Reviewed-by: Erik Skultety <eskultet@redhat.com>