openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix vncdisplay command in virsh

This commit is contained in:
Daniel P. Berrange 2007-03-02 14:22:33 +00:00
parent 3f9380fdbb
commit 6e760fb6d7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
Thu Mar 01 18;22:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
Fri Mar 02 09:21:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/virsh.c: Fix output of VNC display in the case where
there is no explicit listen attribute in the XML
Thu Mar 01 18:22:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/xend_internal.c: Instead of looking for string 'Cannot'
in POST response, look for 'xend.err' which is likely to catch

6
src/virsh.c
View File

@ -2313,10 +2313,8 @@ cmdVNCDisplay(vshControl * ctl, vshCmd * cmd)
obj = xmlXPathEval(BAD_CAST "string(/domain/devices/graphics[@type='vnc']/@listen)", ctxt);
if ((obj == NULL) || (obj->type != XPATH_STRING) ||
(obj->stringval == NULL) || (obj->stringval[0] == 0)) {
goto cleanup;
}
if (!strcmp((const char*)obj->stringval, "0.0.0.0")) {
(obj->stringval == NULL) || (obj->stringval[0] == 0) ||
!strcmp((const char*)obj->stringval, "0.0.0.0")) {
vshPrint(ctl, ":%d\n", port-5900);
} else {
vshPrint(ctl, "%s:%d\n", (const char *)obj->stringval, port-5900);