From 406d89636394a94725a55fd9c944e6a0e59dabb8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 10 Jun 2008 14:39:58 +0000
Subject: [PATCH] Pass syntax check for XM block devices over to XenD 	*
 src/xm_internal.c: Pass responsibility for checking syntax 	  of XM block
 devices over the XenD (see also Xen cset 17617). 	  (Hiroyuki Kaguchi).

---
 ChangeLog           |  7 +++++++
 docs/hvsupport.html | 14 +++++++++++---
 src/xm_internal.c   |  6 ++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f4b795978..0c81879d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 10 15:33:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	Pass syntax check for XM block devices over to XenD
+	* src/xm_internal.c: Pass responsibility for checking syntax
+	  of XM block devices over the XenD (see also Xen cset 17617).
+	  (Hiroyuki Kaguchi).
+
 Tue Jun 10 11:34:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	virDomainMemoryPeek API
diff --git a/docs/hvsupport.html b/docs/hvsupport.html
index 11611db9a5..54a9460df3 100644
--- a/docs/hvsupport.html
+++ b/docs/hvsupport.html
@@ -281,9 +281,9 @@ updated on <i>2008-06-05</i>.
           <tr>
             <td> virDomainBlockPeek </td>
             <td> 0.4.3 </td>
-            <td> x </td>
-            <td> x </td>
-            <td> x </td>
+            <td> 0.4.3 </td>
+            <td> 0.4.3 </td>
+            <td> 0.4.3 </td>
             <td> x </td>
           </tr>
           <tr>
@@ -622,6 +622,14 @@ updated on <i>2008-06-05</i>.
             <td> 0.1.0 </td>
             <td colspan="4"> not a HV function </td>
           </tr>
+          <tr>
+            <td> virDomainMemoryPeek </td>
+            <td> 0.4.3 </td>
+            <td> x </td>
+            <td> 0.4.3 </td>
+            <td> 0.4.3 </td>
+            <td> x </td>
+          </tr>
           <tr>
             <td> virNodeGetInfo </td>
             <td> 0.1.0 </td>
diff --git a/src/xm_internal.c b/src/xm_internal.c
index ea7b6e102c..2e2b20fa58 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -767,9 +767,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
             if (!src[0]) {
                 strcpy(drvName, "phy");
                 tmp = &src[0];
-            } else if (!(tmp = strchr(src, ':')) || !tmp[0]) {
-                    goto skipdisk;
-            } else {
+            } else if ((tmp = strchr(src, ':')) != NULL) {
                 strncpy(drvName, src, (tmp-src));
                 drvName[tmp-src] = '\0';
             }
@@ -782,7 +780,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
                 memmove(src, src+(tmp1-src)+1, strlen(src)-(tmp1-src));
             } else {
                 drvType[0] = '\0';
-                if (src[0])
+                if (src[0] && tmp)
                         memmove(src, src+(tmp-src)+1, strlen(src)-(tmp-src));
             }