[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v3 14/14] vnc: add support for listen type none



Signed-off-by: Pavel Hrdina <phrdina redhat com>
---
 docs/formatdomain.html.in | 3 ++-
 src/conf/domain_conf.c    | 3 ++-
 src/qemu/qemu_command.c   | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index d217ae0..d1d5915 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5383,7 +5383,8 @@ qemu-kvm -net nic,model=? /dev/null
           virDomainOpenGraphicsFD(). No other listen types are allowed if this
           one is used and the graphics device doesn't listen anywhere. You need
           to use one of the two APIs to pass a FD to QEMU in order to connect to
-          this graphics device. Supported only by <code>spice</code>.
+          this graphics device. Supported only by <code>vnc</code> and
+          <code>spice</code>.
         </p>
       </dd>
     </dl>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0963f4a..96ccff2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10840,7 +10840,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
         }
         break;
     case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
-        if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
+        if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
+            graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("listen type 'none' is not available for "
                              "graphics type '%s'"), graphicsType);
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 17651c4..a58d0e9 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7465,6 +7465,9 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
         break;
 
     case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
+        virBufferAddLit(&opt, "none");
+        break;
+
     case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
         break;
     }
-- 
2.8.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]