From 8101d434336a2ad89f6d2dbfbff54f79b3eb6890 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Tue, 24 Jul 2012 16:00:14 +0200 Subject: [PATCH] virsh: fixed domdisplay command The 'domdisplay' command didn't properly evaluate '--include-password' option. --- tools/virsh.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6bb0fc8a99..6d65036360 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13870,6 +13870,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) const char *scheme[] = { "vnc", "spice", "rdp", NULL }; int iter = 0; int tmp; + int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -13882,7 +13883,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - doc = virDomainGetXMLDesc(dom, 0); + if (vshCommandOptBool(cmd, "include-password")) + flags |= VIR_DOMAIN_XML_SECURE; + + doc = virDomainGetXMLDesc(dom, flags); + if (!doc) goto cleanup; @@ -13944,7 +13949,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (vshCommandOptBool(cmd, "daemon")) { + if (vshCommandOptBool(cmd, "include-password")) { /* Create our XPATH lookup for the SPICE password */ virAsprintf(&xpath, "string(/domain/devices/graphics" "[@type='%s']/@passwd)", scheme[iter]);