From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 8 Jun 2016 11:24:52 +0000 (+0200)
Subject: vnc: rename socketAutogenerated to socketFromConfig
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=17271d04e70347def50b7a28177b7aa2017ae28b;p=libvirt.git

vnc: rename socketAutogenerated to socketFromConfig

Even though it's auto-generated it's based on qemu.conf option and listen type
address already uses "fromConfig" to carry this information.  Following commits
will convert the socket to listen element so this rename is required because
there will be also an option to get socket auto-generated independently on the
qemu.conf option.

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e8942f19fa..133c2a3ea9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21765,7 +21765,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
     switch (def->type) {
     case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
         if (def->data.vnc.socket) {
-            if (!def->data.vnc.socketAutogenerated ||
+            if (!def->data.vnc.socketFromConfig ||
                 !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) {
                 virBufferEscapeString(buf, " socket='%s'",
                                       def->data.vnc.socket);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c032c51433..d1fc4b7567 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1452,7 +1452,7 @@ struct _virDomainGraphicsDef {
             bool autoport;
             char *keymap;
             char *socket;
-            bool socketAutogenerated;
+            bool socketFromConfig;
             virDomainGraphicsAuthDef auth;
             int sharePolicy;
         } vnc;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9c88f58a7d..16def839b7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7233,7 +7233,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
                             "%s/vnc.sock", domainLibDir) < 0)
                 goto error;
 
-            graphics->data.vnc.socketAutogenerated = true;
+            graphics->data.vnc.socketFromConfig = true;
         }
 
         virBufferAddLit(&opt, "unix:");
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1f2d22fb5f..f74b4b3a0c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2098,7 +2098,7 @@ qemuDomainRecheckInternalPaths(virDomainDefPtr def,
                     return -1;
             }
             else
-                graphics->data.vnc.socketAutogenerated = true;
+                graphics->data.vnc.socketFromConfig = true;
         }
     }