diff options
author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-02-04 18:47:20 +0000 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-02-04 18:47:20 +0000 |
commit | 2cc64e2e7c43b8dceb5bcde1ec9fa838069a860c (patch) | |
tree | 61291d1079756a140df31e8b54d22eacdd2ed228 | |
parent | e887904db62c8d085cf6a1c829c9f615d049eb9c (diff) | |
download | xen-2cc64e2e7c43b8dceb5bcde1ec9fa838069a860c.tar.gz xen-2cc64e2e7c43b8dceb5bcde1ec9fa838069a860c.tar.bz2 xen-2cc64e2e7c43b8dceb5bcde1ec9fa838069a860c.zip |
libxl: vncviewer: unconditionally read listen port address and password
The /local/domain/DOMID/device/vfb/0/backend path is irrelevant.
libxl does not create it, so the branch would never be taken.
Instead, simply read the target paths of interest.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | tools/libxl/libxl.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0ca21e65db..c6723385a5 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -791,7 +791,7 @@ int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm) int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) { libxl__gc gc = LIBXL_INIT_GC(ctx); - const char *vnc_port, *vfb_back; + const char *vnc_port; const char *vnc_listen = NULL, *vnc_pass = NULL; int port = 0, autopass_fd = -1; char *vnc_bin, *args[] = { @@ -807,18 +807,14 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) if ( vnc_port ) port = atoi(vnc_port) - 5900; - vfb_back = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, - "/local/domain/%d/device/vfb/0/backend", domid)); - if ( vfb_back ) { - vnc_listen = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, + vnc_listen = libxl__xs_read(&gc, XBT_NULL, + libxl__sprintf(&gc, "/local/domain/%d/console/vnc-listen", domid)); - if ( autopass ) - vnc_pass = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, + + if ( autopass ) + vnc_pass = libxl__xs_read(&gc, XBT_NULL, + libxl__sprintf(&gc, "/local/domain/%d/console/vnc-pass", domid)); - } if ( NULL == vnc_listen ) vnc_listen = "localhost"; |