]> xenbits.xensource.com Git - qemu-xen-4.2-testing.git/commit
vnc, xen: write vnc address and password to xenstore xen-4.1.0-rc4
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 1 Feb 2011 17:32:38 +0000 (17:32 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 4 Feb 2011 18:42:33 +0000 (18:42 +0000)
commitad7d28519de7cdc604efefac5c22fe9f88040586
tree6f41d2c5bf13c5bf9c3837863b894bd2bc0296e3
parent6a42c2f74e7dcd0bf57761bd5dd3af69b272a827
vnc, xen: write vnc address and password to xenstore

The xend protocol as actually implemented is:
  * xend writes:
     /vm/UUID/vncpasswd = "PASS"   (n0,rDOMID)
     /local/domain/0/backend/vfb/DOMID/0/vncunused = "0"   (n0,rDOMID)
     /local/domain/0/backend/vfb/DOMID/0/vnc = "1"   (n0,rDOMID)
     /local/domain/0/backend/vfb/DOMID/0/vnclisten = "ADDR"   (n0,rDOMID)
     /local/domain/0/backend/vfb/DOMID/0/vncdisplay = "PORT"   (n0,rDOMID)
     /local/domain/0/backend/vfb/DOMID/0/vncpasswd = "PASS"   (n0,rDOMID)
  * qemu reads /vm/UUID/vncpasswd and overwrites it with "\0"
  * qemu writes
     /local/domain/DOMID/console/vnc-port = "PORT"   (n0,rDOMID)
  * xm vncviewer reads entries from backend/vfb,
    as well as console/vnc-port.
Much of this is insane.

xl quite properly does not create anything in backend/vfb for an HVM
domain with no vfb.  But xl vncviewer needs to know the port number
and the address and the password.

So, for now, have qemu write these nodes too:
     /local/domain/DOMID/console/vnc-listen = "ADDR"   (n0,rDOMID)
     /local/domain/DOMID/console/vnc-pass = "PASS"   (n0,rDOMID)
This corresponds to the protocol actually currently implemented in
libxl.

We will revisit this after the 4.1 release and invent a non-insane
protocol.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
qemu-common.h
qemu-xen.h
vl.c
vnc.c
xenstore.c