[Xen-changelog] [xen-unstable] Revert 15471:7ac7f147241405af83e7a9d748cf7b01279734fc

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1183730480 -3600
# Node ID 538c3d8aa4b14833174423ec506284279d5a33ab
# Parent  daa07db3ca845c9b08415d19a4d888902abf8321
Revert 15471:7ac7f147241405af83e7a9d748cf7b01279734fc

Block-device specifiers in ioemu can contain colons, so skipping
always past the first colon is not a good idea. Better solutions are
in the pipeline to solve the blktap issues.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/ioemu/xenstore.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff -r daa07db3ca84 -r 538c3d8aa4b1 tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c    Fri Jul 06 14:45:02 2007 +0100
+++ b/tools/ioemu/xenstore.c    Fri Jul 06 15:01:20 2007 +0100
@@ -173,12 +173,10 @@ void xenstore_parse_domain_config(int do
         }
         /* open device now if media present */
         if (params[0]) {
-            char *p = strchr(params, ':');
-            p = p ? p+1 : params; /* skip colon separator if present */
             if (bdrv_open(bs_table[hd_index + (is_scsi ? MAX_DISKS : 0)],
-                          p, 0 /* snapshot */) < 0)
+                          params, 0 /* snapshot */) < 0)
                 fprintf(stderr, "qemu: could not open hard disk image '%s'\n",
-                        p);
+                        params);
         }
     }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog