[libvirt] [PATCH 5/7] conf: spice: Do more automation if autoport is requested

Peter Krempa pkrempa at redhat.com
Tue Apr 23 13:46:12 UTC 2013


With autoport enabled, both ports were alocated. With enabling
defaultMode or setting separate channel modes one of the ports may not
be needed. This will allow later on doing this kind of change.
---
 docs/formatdomain.html.in | 2 +-
 src/conf/domain_conf.c    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 888c005..bb75943 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3470,7 +3470,7 @@ qemu-kvm -net nic,model=? /dev/null
               while <code>tlsPort</code> gives an alternative secure
               port number. The <code>autoport</code> attribute is the
               new preferred syntax for indicating autoallocation of
-              both port numbers.  The <code>listen</code> attribute is
+              needed port numbers.  The <code>listen</code> attribute is
               an IP address for the server to listen
               on. The <code>passwd</code> attribute provides a SPICE
               password in clear text. The <code>keymap</code>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dc0ecaa..86a444c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7595,11 +7595,6 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
             VIR_FREE(defaultMode);
         }

-        if (def->data.spice.port == -1 && def->data.spice.tlsPort == -1) {
-            /* Legacy compat syntax, used -1 for auto-port */
-            def->data.spice.autoport = true;
-        }
-
         if (def->data.spice.autoport && (flags & VIR_DOMAIN_XML_INACTIVE)) {
             def->data.spice.port = 0;
             def->data.spice.tlsPort = 0;
-- 
1.8.2.1




More information about the libvir-list mailing list