From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 5 Jul 2007 13:49:17 +0000 (+0000)
Subject: move conversion of NULL & xen URIs into libvirt.c
X-Git-Tag: LIBVIRT_0_3_0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34908a6a1ed7c6d0946ff27b56f9bb9c0c0011c1;p=thirdparty%2Flibvirt.git

move conversion of NULL & xen URIs into libvirt.c
---

diff --git a/ChangeLog b/ChangeLog
index ed9f753972..ddd9502a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul  5 09:47:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/libvirt.c, src/xen_unified.c: Move code converting NULL
+	and 'xen' into 'xen://' from the Xen driver into the main libvirt.c
+	entry point. We need this conversion done at the top level, so that
+	the network driver open func gets a valid URI in Xen case
+
 Thu Jul  5 09:46:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/remote_internal.c: Fixed typo in setting flags for network
diff --git a/src/libvirt.c b/src/libvirt.c
index 876d4cd08c..0ffbf0ad95 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -372,6 +372,14 @@ do_open (const char *name, int flags)
     int i, res;
     virConnectPtr ret = NULL;
 
+    /* Convert NULL or "" to xen:/// for back compat */
+    if (!name || name[0] == '\0')
+        name = "xen:///";
+
+    /* Convert xen -> xen:/// for back compat */
+    if (!strcasecmp(name, "xen"))
+        name = "xen:///";
+
     if (!initialized)
         if (virInitialize() < 0)
 	    return NULL;
diff --git a/src/xen_unified.c b/src/xen_unified.c
index ba1e7606fe..1f3628dcad 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -90,14 +90,6 @@ xenUnifiedOpen (virConnectPtr conn, const char *name, int flags)
     xenUnifiedPrivatePtr priv;
     xmlURIPtr uri;
 
-    /* Convert NULL or "" to xen:/// for back compat */
-    if (!name || name[0] == '\0')
-        name = "xen:///";
-
-    /* Convert xen -> xen:/// for back compat */
-    if (!strcasecmp(name, "xen"))
-        name = "xen:///";
-
     uri = xmlParseURI(name);
     if (uri == NULL) {
         return VIR_DRV_OPEN_DECLINED;