qemu: keep websocketGenerated on libvirtd restarts

Otherwise after libvirtd restart we come back to issues fixed by
introducing this flag in [1].

[1] 61a0026a : qemu: Fix xml dump of autogenerated websocket

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 409a2291ffa36de07685334f0316f4e978a5e340..88b0ad45f88e9e70db7ddbc8362d116f89682111 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13498,6 +13498,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
 {
     char *port = virXMLPropString(node, "port");
     char *websocket = virXMLPropString(node, "websocket");
+    char *websocketGenerated = virXMLPropString(node, "websocketGenerated");
     char *sharePolicy = virXMLPropString(node, "sharePolicy");
     char *autoport = virXMLPropString(node, "autoport");
     int ret = -1;
@@ -13542,6 +13543,9 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
         }
     }
 
+    if (websocketGenerated && STREQ(websocketGenerated, "yes"))
+        def->data.vnc.websocketGenerated = true;
+
     if (sharePolicy) {
         int policy =
            virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy);
@@ -13567,6 +13571,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
     VIR_FREE(port);
     VIR_FREE(autoport);
     VIR_FREE(websocket);
+    VIR_FREE(websocketGenerated);
     VIR_FREE(sharePolicy);
     return ret;
 }
@@ -26399,6 +26404,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
             else if (def->data.vnc.websocket)
                 virBufferAsprintf(buf, " websocket='%d'", def->data.vnc.websocket);
 
+            if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)
+                virBufferAsprintf(buf, " websocketGenerated='%s'",
+                                  def->data.vnc.websocketGenerated ? "yes" : "no");
+
             virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
             break;
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: