pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-07 19:51:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

viewer: generalize extract_port() into viewer_extract_xpath_string()

Browse Source
This commit is contained in:
Marc-André Lureau 2010-11-19 18:09:42 +01:00
parent 07f2682884
commit 882ac10d52
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewer.c
View File

@ -728,7 +728,7 @@ static int viewer_matches_domain(VirtViewer *viewer,
return 0;
}
static char * viewer_extract_vnc_port(virDomainPtr dom)
static char * viewer_extract_xpath_string(virDomainPtr dom, const gchar *xpath)
{
char *xmldesc = virDomainGetXMLDesc(dom, 0);
xmlDocPtr xml = NULL;
@ -752,7 +752,7 @@ static char * viewer_extract_vnc_port(virDomainPtr dom)
if (!ctxt)
goto error;
obj = xmlXPathEval((const xmlChar *)"string(/domain/devices/graphics[@type='vnc']/@port)", ctxt);
obj = xmlXPathEval((const xmlChar *)xpath, ctxt);
if (!obj || obj->type != XPATH_STRING || !obj->stringval || !obj->stringval[0])
goto error;
if (!strcmp((const char*)obj->stringval, "-1"))
@ -908,7 +908,7 @@ static int viewer_activate(VirtViewer *viewer,
viewer_init_vnc_display(viewer);
if ((vncport = viewer_extract_vnc_port(dom)) == NULL) {
if ((vncport = viewer_extract_xpath_string(dom, "string(/domain/devices/graphics[@type='vnc']/@port)")) == NULL) {
viewer_simple_message_dialog(viewer->window, _("Cannot determine the VNC port for the guest %s"),
viewer->domkey);
goto cleanup;