[PATCH 05/17] qemu_hotplug: cleanup qemuDomainChangeGraphics

[Pavel Hrdina <phrdina@xxxxxxxxxx>]

Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/qemu/qemu_hotplug.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 03e5309..97f4152 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2607,9 +2607,10 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
                          virDomainGraphicsDefPtr dev)
 {
     virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev);
-    int ret = -1;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+    const char *type = virDomainGraphicsTypeToString(dev->type);
     size_t i;
+    int ret = -1;
 
     if (!olddev) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -2618,8 +2619,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
     }
 
     if (dev->nListens != olddev->nListens) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("cannot change the number of listen addresses"));
+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                       _("cannot change the number of listen addresses "
+                         "on '%s' graphics"), type);
         goto cleanup;
     }
 
@@ -2628,30 +2630,30 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
         virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i];
 
         if (newlisten->type != oldlisten->type) {
-            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                           _("cannot change the type of listen address"));
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                           _("cannot change the type of listen address "
+                             "on '%s' graphics"), type);
             goto cleanup;
         }
 
         switch ((virDomainGraphicsListenType) newlisten->type) {
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
             if (STRNEQ_NULLABLE(newlisten->address, oldlisten->address)) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ?
-                               _("cannot change listen address setting on vnc graphics") :
-                               _("cannot change listen address setting on spice graphics"));
+                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                               _("cannot change listen address setting "
+                                 "on '%s' graphics"), type);
                 goto cleanup;
             }
-            break;
 
+            break;
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
             if (STRNEQ_NULLABLE(newlisten->network, oldlisten->network)) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ?
-                           _("cannot change listen network setting on vnc graphics") :
-                           _("cannot change listen network setting on spice graphics"));
+                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                               _("cannot change listen address setting "
+                                 "on '%s' graphics"), type);
                 goto cleanup;
             }
+
             break;
 
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
@@ -2761,8 +2763,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
 
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unable to change config on '%s' graphics type"),
-                       virDomainGraphicsTypeToString(dev->type));
+                       _("unable to change config on '%s' graphics type"), type);
         break;
     }
 
-- 
2.8.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list