Tue Jun 19 20:07:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

        * src/xend_internal.c: Recognise xen:/// as the standard
          URI for connecting to a local Xen hypervisor.

diff --git a/ChangeLog b/ChangeLog
index f6911f8f80efdd73ece7e202356f32e9b6a578cf..5e0ca2a2293b5b55ca14b887c30e8cd1fbd99410 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 19 20:07:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * 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 <rjones@redhat.com>
 
        * docs/libvir.html docs/remote.html docs/uri.html: Documented

diff --git a/src/xend_internal.c b/src/xend_internal.c
index be51ce084ffc799e11e26b2003d909753fffff02..61babe179efd8662b6b1f47e9f9e443e4f9cb199 100644 (file)
--- 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
          */