From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 21 Jul 2022 10:23:53 +0000 (+0200)
Subject: qemu_cgroup: Avoid ternary operator when setting @deviceACL
X-Git-Tag: v8.6.0-rc1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=086bbbad0946f13833f4136cba9ad4c13ae69ae4;p=thirdparty%2Flibvirt.git

qemu_cgroup: Avoid ternary operator when setting @deviceACL

Inside of the qemuSetupDevicesCgroup() there's @deviceACL
variable, which points to a string list of devices that are
allowed in devices controller by default. This list can either
come from qemu.conf (cfg->cgroupDeviceACL) or from a builtin
@defaultDeviceACL. However, a multiline ternary operator is used
when setting the variable which is against our coding style.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 2cc16a69d3..e012ba92c0 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -652,7 +652,7 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
-    const char *const *deviceACL = NULL;
+    const char *const *deviceACL = (const char *const *) cfg->cgroupDeviceACL;
     int rv = -1;
     size_t i;
 
@@ -686,9 +686,8 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
     if (rv < 0)
         return -1;
 
-    deviceACL = cfg->cgroupDeviceACL ?
-                (const char *const *)cfg->cgroupDeviceACL :
-                defaultDeviceACL;
+    if (!deviceACL)
+        deviceACL = defaultDeviceACL;
 
     if (vm->def->nsounds &&
         ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) ||