From: Laine Stump <laine@redhat.com>
Date: Thu, 9 Sep 2021 16:57:32 +0000 (-0400)
Subject: conf: reformat virDomainDefCompatibleDevice for upcoming additional check
X-Git-Tag: v7.8.0-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf916af4a1f029bfbebe7db0431bc42955479cca;p=thirdparty%2Flibvirt.git

conf: reformat virDomainDefCompatibleDevice for upcoming additional check

The next patch will add another check similar to the existing check
for a change in alias name. This patch reformats the code in
preparation so that the next patch's purpose will be clear.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 858f6f923a..73f8aade96 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28477,13 +28477,14 @@ virDomainDefCompatibleDevice(virDomainDef *def,
         data.oldInfo = virDomainDeviceGetInfo(oldDev);
 
     if (action == VIR_DOMAIN_DEVICE_ACTION_UPDATE &&
-        live &&
-        (data.newInfo && data.oldInfo &&
-         data.newInfo->alias && data.oldInfo->alias &&
-         STRNEQ(data.newInfo->alias, data.oldInfo->alias))) {
-        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
-                       _("changing device alias is not allowed"));
-        return -1;
+        live && data.newInfo && data.oldInfo) {
+
+        if (data.newInfo->alias && data.oldInfo->alias &&
+            STRNEQ(data.newInfo->alias, data.oldInfo->alias)) {
+            virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                           _("changing device alias is not allowed"));
+            return -1;
+        }
     }
 
     if (!virDomainDefHasUSB(def) &&