From nobody Mon Feb 9 19:52:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153070230667520.91572529436371; Wed, 4 Jul 2018 04:05:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45FD536887; Wed, 4 Jul 2018 11:05:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3D33413E; Wed, 4 Jul 2018 11:05:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5A1954A460; Wed, 4 Jul 2018 11:05:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w64B50JC013506 for ; Wed, 4 Jul 2018 07:05:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A0866017C; Wed, 4 Jul 2018 11:05:00 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E7DC6017A for ; Wed, 4 Jul 2018 11:04:57 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA5F64E028 for ; Wed, 4 Jul 2018 11:04:55 +0000 (UTC) Received: from vz-out.virtuozzo.com ([185.231.240.5] helo=dim-vz7.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fafaf-000096-PC for libvir-list@redhat.com; Wed, 04 Jul 2018 14:04:53 +0300 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Wed, 4 Jul 2018 14:03:41 +0300 Message-Id: <1530702221-451603-6-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1530702221-451603-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1530702221-451603-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Greylist: Sender passed SPF test, ACL 227 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 04 Jul 2018 11:04:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 04 Jul 2018 11:04:56 +0000 (UTC) for IP:'185.231.240.75' DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: -0.001 (SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75 relay.sw.ru X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/5] qemu: keep websocketGenerated on libvirtd restarts X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 04 Jul 2018 11:05:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: John Ferlan --- src/conf/domain_conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f4e59f6..e27a125 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13574,6 +13574,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDe= fPtr def, { char *port =3D virXMLPropString(node, "port"); char *websocket =3D virXMLPropString(node, "websocket"); + char *websocketGenerated =3D virXMLPropString(node, "websocketGenerate= d"); char *sharePolicy =3D virXMLPropString(node, "sharePolicy"); char *autoport =3D virXMLPropString(node, "autoport"); int ret =3D -1; @@ -13618,6 +13619,9 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDe= fPtr def, } } =20 + if (websocketGenerated && STREQ(websocketGenerated, "yes")) + def->data.vnc.websocketGenerated =3D true; + if (sharePolicy) { int policy =3D virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy); @@ -13643,6 +13647,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDe= fPtr def, VIR_FREE(port); VIR_FREE(autoport); VIR_FREE(websocket); + VIR_FREE(websocketGenerated); VIR_FREE(sharePolicy); return ret; } @@ -26245,6 +26250,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, else if (def->data.vnc.websocket) virBufferAsprintf(buf, " websocket=3D'%d'", def->data.vnc.= websocket); =20 + if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) + virBufferAsprintf(buf, " websocketGenerated=3D'%s'", + def->data.vnc.websocketGenerated ? "yes"= : "no"); + virDomainGraphicsListenDefFormatAddr(buf, glisten, flags); break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list