From 99089f80cd0e8694268a47a1c9abfe7b20896426 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Jun 2007 19:08:09 +0000 Subject: [PATCH] Tue Jun 19 20:07:00 BST 2007 Richard W.M. Jones * src/xend_internal.c: Recognise xen:/// as the standard URI for connecting to a local Xen hypervisor. --- ChangeLog | 5 +++++ src/xend_internal.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6911f8f80..5e0ca2a229 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 19 20:07:00 BST 2007 Richard W.M. Jones + + * src/xend_internal.c: Recognise xen:/// as the standard + URI for connecting to a local Xen hypervisor. + Tue Jun 19 17:02:00 BST 2007 Richard W.M. Jones * docs/libvir.html docs/remote.html docs/uri.html: Documented diff --git a/src/xend_internal.c b/src/xend_internal.c index be51ce084f..61babe179e 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1943,11 +1943,12 @@ xenDaemonOpen(virConnectPtr conn, const char *name, xmlURIPtr uri = NULL; int ret; - /* If the name is just "xen" (it might originally have been NULL, see - * xenUnifiedOpen) then try default paths and methods to get to the - * xend socket. + /* If the name is just "xen" (it might originally have been NULL, + * see xenUnifiedOpen) or any URI beginning with "xen:///" then + * try default paths and methods to get to the xend socket. */ - if (strcasecmp (name, "xen") == 0) { + if (strcasecmp (name, "xen") == 0 || + strncasecmp (name, "xen:///", 7) == 0) { /* * try first to open the unix socket */