graphics: rename gListen to glisten

We have both in the code.  Let's use only one format.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9d413b9b92acbd3f0fd1b30c88df1eed6032ebf9..0d491b88c4dd044226f0ac996449a64c5983c111 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23865,21 +23865,21 @@ int
 virDomainGraphicsListenAppendAddress(virDomainGraphicsDefPtr def,
                                      const char *address)
 {
-    virDomainGraphicsListenDef gListen;
+    virDomainGraphicsListenDef glisten;
 
-    memset(&gListen, 0, sizeof(gListen));
+    memset(&glisten, 0, sizeof(glisten));
 
-    gListen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS;
+    glisten.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS;
 
-    if (VIR_STRDUP(gListen.address, address) < 0)
+    if (VIR_STRDUP(glisten.address, address) < 0)
         goto error;
 
-    if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, gListen) < 0)
+    if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten) < 0)
         goto error;
 
     return 0;
  error:
-    VIR_FREE(gListen.address);
+    VIR_FREE(glisten.address);
     return -1;
 }
 

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index c399f5cfb995ac12173140d07ce5262342b1c27b..13e56ac1ffaf168d91b97de164c075a06bd4cd40 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1430,7 +1430,7 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports,
              libxl_device_vfb *x_vfb)
 {
     unsigned short port;
-    virDomainGraphicsListenDefPtr gListen = NULL;
+    virDomainGraphicsListenDefPtr glisten = NULL;
 
     libxl_device_vfb_init(x_vfb);
 
@@ -1457,11 +1457,11 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports,
             }
             x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN;
 
-            if ((gListen = virDomainGraphicsGetListen(l_vfb, 0)) &&
-                gListen->address) {
+            if ((glisten = virDomainGraphicsGetListen(l_vfb, 0)) &&
+                glisten->address) {
                 /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */
                 VIR_FREE(x_vfb->vnc.listen);
-                if (VIR_STRDUP(x_vfb->vnc.listen, gListen->address) < 0)
+                if (VIR_STRDUP(x_vfb->vnc.listen, glisten->address) < 0)
                     return -1;
             }
             if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0)
@@ -1551,7 +1551,7 @@ libxlMakeBuildInfoVfb(virPortAllocatorPtr graphicsports,
     for (i = 0; i < def->ngraphics; i++) {
         virDomainGraphicsDefPtr l_vfb = def->graphics[i];
         unsigned short port;
-        virDomainGraphicsListenDefPtr gListen = NULL;
+        virDomainGraphicsListenDefPtr glisten = NULL;
 
         if (l_vfb->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE)
             continue;
@@ -1565,9 +1565,9 @@ libxlMakeBuildInfoVfb(virPortAllocatorPtr graphicsports,
         }
         b_info->u.hvm.spice.port = l_vfb->data.spice.port;
 
-        if ((gListen = virDomainGraphicsGetListen(l_vfb, 0)) &&
-            gListen->address &&
-            VIR_STRDUP(b_info->u.hvm.spice.host, gListen->address) < 0)
+        if ((glisten = virDomainGraphicsGetListen(l_vfb, 0)) &&
+            glisten->address &&
+            VIR_STRDUP(b_info->u.hvm.spice.host, glisten->address) < 0)
             return -1;
 
         if (VIR_STRDUP(b_info->u.hvm.keymap, l_vfb->data.spice.keymap) < 0)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 55326c37e0723e6942bea2937f073f76494750bd..c35d2966ecd74c22bc28351581398e04137cbdd6 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7357,7 +7357,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
                                 const char *domainLibDir)
 {
     virBuffer opt = VIR_BUFFER_INITIALIZER;
-    virDomainGraphicsListenDefPtr gListen = NULL;
+    virDomainGraphicsListenDefPtr glisten = NULL;
     const char *listenAddr = NULL;
     char *netAddr = NULL;
     bool escapeAddr;
@@ -7390,18 +7390,18 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
             goto error;
         }
 
-        if ((gListen = virDomainGraphicsGetListen(graphics, 0))) {
+        if ((glisten = virDomainGraphicsGetListen(graphics, 0))) {
 
-            switch (gListen->type) {
+            switch (glisten->type) {
             case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
-                listenAddr = gListen->address;
+                listenAddr = glisten->address;
                 break;
 
             case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
-                if (!gListen->network)
+                if (!glisten->network)
                     break;
 
-                ret = networkGetNetworkAddress(gListen->network, &netAddr);
+                ret = networkGetNetworkAddress(glisten->network, &netAddr);
                 if (ret <= -2) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    "%s", _("network-based listen not possible, "
@@ -7414,7 +7414,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
                 listenAddr = netAddr;
                 /* store the address we found in the <graphics> element so it
                  * will show up in status. */
-                if (VIR_STRDUP(gListen->address, netAddr) < 0)
+                if (VIR_STRDUP(glisten->address, netAddr) < 0)
                     goto error;
                 break;
 
@@ -7512,7 +7512,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
                                   virDomainGraphicsDefPtr graphics)
 {
     virBuffer opt = VIR_BUFFER_INITIALIZER;
-    virDomainGraphicsListenDefPtr gListen = NULL;
+    virDomainGraphicsListenDefPtr glisten = NULL;
     const char *listenAddr = NULL;
     char *netAddr = NULL;
     int ret;
@@ -7551,18 +7551,18 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
     }
 
     if (port > 0 || tlsPort > 0) {
-        if ((gListen = virDomainGraphicsGetListen(graphics, 0))) {
+        if ((glisten = virDomainGraphicsGetListen(graphics, 0))) {
 
-            switch (gListen->type) {
+            switch (glisten->type) {
             case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
-                listenAddr = gListen->address;
+                listenAddr = glisten->address;
                 break;
 
             case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
-                if (!gListen->network)
+                if (!glisten->network)
                     break;
 
-                ret = networkGetNetworkAddress(gListen->network, &netAddr);
+                ret = networkGetNetworkAddress(glisten->network, &netAddr);
                 if (ret <= -2) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    "%s", _("network-based listen not possible, "
@@ -7575,7 +7575,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
                 listenAddr = netAddr;
                 /* store the address we found in the <graphics> element so it will
                  * show up in status. */
-                if (VIR_STRDUP(gListen->address, listenAddr) < 0)
+                if (VIR_STRDUP(glisten->address, listenAddr) < 0)
                     goto error;
                 break;
 

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 680c9ba5f83759b2ffb61f5e0849eff5200f7d31..25093ac2bf6d912bff2a82a8bcc0ec5f633ff661 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -319,7 +319,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr driver,
 {
     qemuMigrationCookieGraphicsPtr mig = NULL;
     const char *listenAddr;
-    virDomainGraphicsListenDefPtr gListen = virDomainGraphicsGetListen(def, 0);
+    virDomainGraphicsListenDefPtr glisten = virDomainGraphicsGetListen(def, 0);
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
 
     if (VIR_ALLOC(mig) < 0)
@@ -332,7 +332,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr driver,
     else
         mig->tlsPort = -1;
 
-    if (!gListen || !(listenAddr = gListen->address))
+    if (!glisten || !(listenAddr = glisten->address))
         listenAddr = cfg->spiceListen;
 
 #ifdef WITH_GNUTLS

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 13c3fec98d38ab9518cabdd57a7f8feed257fd0c..ee2b6ad6fc69310d3bc3b5f188b4aeefa8fc7179 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -1579,7 +1579,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
     char *guiDisplay = NULL;
     char *sdlDisplay = NULL;
     size_t i = 0;
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
 
     for (i = 0; i < def->ngraphics; i++) {
         IVRDxServer *VRDxServer = NULL;
@@ -1607,15 +1607,15 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
                     VIR_DEBUG("VRDP set to allow multiple connection");
                 }
 
-                if ((gListen = virDomainGraphicsGetListen(def->graphics[i], 0)) &&
-                    gListen->address) {
+                if ((glisten = virDomainGraphicsGetListen(def->graphics[i], 0)) &&
+                    glisten->address) {
                     PRUnichar *netAddressUtf16 = NULL;
 
-                    VBOX_UTF8_TO_UTF16(gListen->address, &netAddressUtf16);
+                    VBOX_UTF8_TO_UTF16(glisten->address, &netAddressUtf16);
                     gVBoxAPI.UIVRDxServer.SetNetAddress(data, VRDxServer,
                                                         netAddressUtf16);
                     VIR_DEBUG("VRDP listen address is set to: %s",
-                              gListen->address);
+                              glisten->address);
 
                     VBOX_UTF16_FREE(netAddressUtf16);
                 }

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 6505dd789fe8108d6a1a23579e9c2279526eaeb3..f729e5dc0327d71c96e76e39c8d6906cf270b7c0 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -3402,7 +3402,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
 int
 virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer)
 {
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
 
     if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
@@ -3424,10 +3424,10 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer)
                           def->data.vnc.port);
     }
 
-    if ((gListen = virDomainGraphicsGetListen(def, 0)) &&
-        gListen->address) {
+    if ((glisten = virDomainGraphicsGetListen(def, 0)) &&
+        glisten->address) {
         virBufferAsprintf(buffer, "RemoteDisplay.vnc.ip = \"%s\"\n",
-                          gListen->address);
+                          glisten->address);
     }
 
     if (def->data.vnc.keymap != NULL) {

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index e9c161cdab49466849374ec596ca2a76120dd5e3..a396d417e444ff7bca463e180171e9ccd5ec9523 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2705,7 +2705,7 @@ static int prlsdkCheckFSUnsupportedParams(virDomainFSDefPtr fs)
 static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
 {
     virDomainGraphicsDefPtr gr;
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
     PRL_RESULT pret;
     int ret  = -1;
 
@@ -2728,10 +2728,10 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
         prlsdkCheckRetGoto(pret, cleanup);
     }
 
-    if ((gListen = virDomainGraphicsGetListen(gr, 0))) {
-        if (!gListen->address)
+    if ((glisten = virDomainGraphicsGetListen(gr, 0))) {
+        if (!glisten->address)
             goto cleanup;
-        pret = PrlVmCfg_SetVNCHostName(sdkdom, gListen->address);
+        pret = PrlVmCfg_SetVNCHostName(sdkdom, glisten->address);
         prlsdkCheckRetGoto(pret, cleanup);
     }
 

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 5014bad728f4783a6881b69ab5ede85f231dd74a..a568666918d0a5475c0a5975af2fe8597565ec2b 100644 (file)
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1643,7 +1643,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
                                        def->graphics[0]->data.sdl.xauth) < 0)
                     return -1;
             } else {
-                virDomainGraphicsListenDefPtr gListen;
+                virDomainGraphicsListenDefPtr glisten;
 
                 if (xenConfigSetInt(conf, "sdl", 0) < 0)
                     return -1;
@@ -1660,9 +1660,9 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
                                     def->graphics[0]->data.vnc.port - 5900) < 0)
                     return -1;
 
-                if ((gListen = virDomainGraphicsGetListen(def->graphics[0], 0)) &&
-                    gListen->address &&
-                    xenConfigSetString(conf, "vnclisten", gListen->address) < 0)
+                if ((glisten = virDomainGraphicsGetListen(def->graphics[0], 0)) &&
+                    glisten->address &&
+                    xenConfigSetString(conf, "vnclisten", glisten->address) < 0)
                     return -1;
 
                 if (def->graphics[0]->data.vnc.auth.passwd &&
@@ -1689,7 +1689,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
                     virBufferAsprintf(&buf, ",xauthority=%s",
                                       def->graphics[0]->data.sdl.xauth);
             } else {
-                virDomainGraphicsListenDefPtr gListen
+                virDomainGraphicsListenDefPtr glisten
                     = virDomainGraphicsGetListen(def->graphics[0], 0);
 
                 virBufferAddLit(&buf, "type=vnc");
@@ -1698,8 +1698,8 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
                 if (!def->graphics[0]->data.vnc.autoport)
                     virBufferAsprintf(&buf, ",vncdisplay=%d",
                                       def->graphics[0]->data.vnc.port - 5900);
-                if (gListen && gListen->address)
-                    virBufferAsprintf(&buf, ",vnclisten=%s", gListen->address);
+                if (glisten && glisten->address)
+                    virBufferAsprintf(&buf, ",vnclisten=%s", glisten->address);
                 if (def->graphics[0]->data.vnc.auth.passwd)
                     virBufferAsprintf(&buf, ",vncpasswd=%s",
                                       def->graphics[0]->data.vnc.auth.passwd);

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 8b5e06326dc7dced68b83207c7507eeea802bfe2..6c7b2c7272b8ab879c09ff309b0735b0115aa412 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1523,7 +1523,7 @@ static int
 xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def,
                          virBufferPtr buf)
 {
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
 
     if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
         def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
@@ -1551,9 +1551,9 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def,
             virBufferAsprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900);
         }
 
-        if ((gListen = virDomainGraphicsGetListen(def, 0)) &&
-            gListen->address)
-            virBufferAsprintf(buf, "(vnclisten '%s')", gListen->address);
+        if ((glisten = virDomainGraphicsGetListen(def, 0)) &&
+            glisten->address)
+            virBufferAsprintf(buf, "(vnclisten '%s')", glisten->address);
         if (def->data.vnc.auth.passwd)
             virBufferAsprintf(buf, "(vncpasswd '%s')", def->data.vnc.auth.passwd);
         if (def->data.vnc.keymap)
@@ -1579,7 +1579,7 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def,
 static int
 xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf)
 {
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
 
     if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
         def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
@@ -1604,9 +1604,9 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf)
             virBufferAsprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900);
         }
 
-        if ((gListen = virDomainGraphicsGetListen(def, 0)) &&
-            gListen->address)
-            virBufferAsprintf(buf, "(vnclisten '%s')", gListen->address);
+        if ((glisten = virDomainGraphicsGetListen(def, 0)) &&
+            glisten->address)
+            virBufferAsprintf(buf, "(vnclisten '%s')", glisten->address);
         if (def->data.vnc.auth.passwd)
             virBufferAsprintf(buf, "(vncpasswd '%s')", def->data.vnc.auth.passwd);
         if (def->data.vnc.keymap)

diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index 15350f92bb9c2cc0dbe06a561d9ef12517e21d64..9b8306f39a54bf3b3e8c1ff56689763f39fc7ea4 100644 (file)
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -837,7 +837,7 @@ xenFormatXLDomainDisks(virConfPtr conf, virDomainDefPtr def)
 static int
 xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
 {
-    virDomainGraphicsListenDefPtr gListen;
+    virDomainGraphicsListenDefPtr glisten;
     virDomainGraphicsDefPtr graphics;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
@@ -854,9 +854,9 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
             if (xenConfigSetInt(conf, "spice", 1) < 0)
                 return -1;
 
-            if ((gListen = virDomainGraphicsGetListen(graphics, 0)) &&
-                gListen->address &&
-                xenConfigSetString(conf, "spicehost", gListen->address) < 0)
+            if ((glisten = virDomainGraphicsGetListen(graphics, 0)) &&
+                glisten->address &&
+                xenConfigSetString(conf, "spicehost", glisten->address) < 0)
                 return -1;
 
             if (xenConfigSetInt(conf, "spiceport",