From fa46b5b4d5bb732462d0d5484cc010aa652d821b Mon Sep 17 00:00:00 2001 Message-Id: From: John Ferlan Date: Mon, 17 Dec 2018 20:42:32 -0500 Subject: [PATCH] RHEL: qemu: Alter @val usage in qemuSetUnprivSGIO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://bugzilla.redhat.com/show_bug.cgi?id=1656362 (RHEL8) https://bugzilla.redhat.com/show_bug.cgi?id=1656360 (RHEL7) RHEL-only Rather than initializing to -1 and then setting to the result of a boolean check (either 0 or 1), let's just initialize @val to 0 and then only change to 1 if conditions are "right". Signed-off-by: John Ferlan Reviewed-by: Ján Tomko --- src/qemu/qemu_conf.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2a84972fd9..faabc4d49f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1828,7 +1828,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) g_autofree char *sysfs_path = NULL; g_autofree char *hostdev_path = NULL; const char *path = NULL; - int val = -1; + int val = 0; /* "sgio" is only valid for block disk; cdrom * and floopy disk can have empty source. @@ -1859,11 +1859,14 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) return -1; /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ - if (dev->type == VIR_DOMAIN_DEVICE_DISK) - val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); - else - val = (hostdev->source.subsys.u.scsi.sgio == - VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); + if (dev->type == VIR_DOMAIN_DEVICE_DISK && + disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) { + val = 1; + } else { + if (hostdev->source.subsys.u.scsi.sgio == + VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) + val = 1; + } /* Do not do anything if unpriv_sgio is not supported by the kernel and the * whitelist is enabled. But if requesting unfiltered access, always call -- 2.25.0