|
 |
1efd99 |
From 2b271402aaeee7d7948493362bc6d152a7422856 Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
1efd99 |
Date: Fri, 7 Apr 2017 12:05:17 +0200
|
|
|
1efd99 |
Subject: [PATCH virt-viewer 31/32] virt-viewer: Support newer libvirt xml
|
|
|
1efd99 |
format
|
|
|
1efd99 |
To: virt-tools-list@redhat.com
|
|
|
1efd99 |
|
|
|
1efd99 |
Since libvirt 0.9.4 there is a new listen element which can be used
|
|
|
1efd99 |
to specify address instead of using the attributes of graphics element.
|
|
|
1efd99 |
|
|
|
1efd99 |
Also add support for listen type socket - available for Qemu since
|
|
|
1efd99 |
libvirt 2.0.0
|
|
|
1efd99 |
|
|
|
1efd99 |
Resolves: rhbz#1411765
|
|
|
1efd99 |
|
|
|
1efd99 |
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
1efd99 |
(cherry picked from commit effa832ca5bd51b1f450f630e1fe3cd7deacb887)
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/virt-viewer.c | 14 ++++++++++++--
|
|
|
1efd99 |
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
|
1efd99 |
index 65c0546..fe10229 100644
|
|
|
1efd99 |
--- a/src/virt-viewer.c
|
|
|
1efd99 |
+++ b/src/virt-viewer.c
|
|
|
1efd99 |
@@ -565,11 +565,21 @@ virt_viewer_extract_connect_info(VirtViewer *self,
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
if (gport || gtlsport) {
|
|
|
1efd99 |
- xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@listen)", type);
|
|
|
1efd99 |
+ xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/listen/@address)", type);
|
|
|
1efd99 |
ghost = virt_viewer_extract_xpath_string(xmldesc, xpath);
|
|
|
1efd99 |
+ if (ghost == NULL) { /* try old xml format - listen attribute in the graphics node */
|
|
|
1efd99 |
+ g_free(xpath);
|
|
|
1efd99 |
+ xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@listen)", type);
|
|
|
1efd99 |
+ ghost = virt_viewer_extract_xpath_string(xmldesc, xpath);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
} else {
|
|
|
1efd99 |
- xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type);
|
|
|
1efd99 |
+ xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/listen/@socket)", type);
|
|
|
1efd99 |
unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath);
|
|
|
1efd99 |
+ if (unixsock == NULL) { /* try old xml format - socket attribute in the graphics node */
|
|
|
1efd99 |
+ g_free(xpath);
|
|
|
1efd99 |
+ xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type);
|
|
|
1efd99 |
+ unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
if (ghost && gport) {
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.12.2
|
|
|
1efd99 |
|