# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1210860605 -3600
# Node ID e3b13e1ecf6ca61b84c8bdf5ae3e961268c920f5
# Parent 8d18e52a1b23c40cb81ae51df8c703175819c504
ioemu: Do not try to guess backing file format when using qcow vbds.
Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
tools/ioemu/block.c | 32 ++++++++++++++++++++++++++------
tools/ioemu/xenstore.c | 4 +++-
2 files changed, 29 insertions(+), 7 deletions(-)
diff -r 8d18e52a1b23 -r e3b13e1ecf6c tools/ioemu/block.c
--- a/tools/ioemu/block.c Thu May 15 11:09:16 2008 +0100
+++ b/tools/ioemu/block.c Thu May 15 15:10:05 2008 +0100
@@ -240,8 +240,28 @@ static int is_windows_drive(const char *
}
#endif
+static int bdrv_invalid_protocol_open(BlockDriverState *bs,
+ const char *filename, int flags) {
+ return -ENOENT;
+}
+
+static BlockDriver bdrv_invalid_protocol = {
+ "invalid_protocol",
+ .bdrv_open = bdrv_invalid_protocol_open,
+};
+
static BlockDriver *find_protocol(const char *filename)
{
+ /* Return values:
+ * &bdrv_xxx
+ * filename specifies protocol xxx
+ * caller should use that
+ * NULL filename does not specify any protocol
+ * caller may apply their own default
+ * &bdrv_invalid_protocol filename speciies an unknown protocol
+ * caller should return -ENOENT; or may just try to open with
+ * that bdrv, which always fails that way.
+ */
BlockDriver *drv1;
char protocol[128];
int len;
@@ -254,7 +274,7 @@ static BlockDriver *find_protocol(const
#endif
p = strchr(filename, ':');
if (!p)
- return NULL; /* do not ever guess raw, it is a security problem! */
+ return NULL;
len = p - filename;
if (len > sizeof(protocol) - 1)
len = sizeof(protocol) - 1;
@@ -265,7 +285,7 @@ static BlockDriver *find_protocol(const
!strcmp(drv1->protocol_name, protocol))
return drv1;
}
- return NULL;
+ return &bdrv_invalid_protocol;
}
/* XXX: force raw format if block or character device ? It would
@@ -295,8 +315,8 @@ static BlockDriver *find_image_format(co
#endif
drv = find_protocol(filename);
- /* no need to test disk image formats for vvfat */
- if (drv == &bdrv_vvfat)
+ /* no need to test disk image format if the filename told us */
+ if (drv != NULL)
return drv;
ret = bdrv_file_open(&bs, filename, BDRV_O_RDONLY);
@@ -390,7 +410,7 @@ int bdrv_open2(BlockDriverState *bs, con
if (flags & BDRV_O_FILE) {
drv = find_protocol(filename);
if (!drv)
- return -ENOENT;
+ drv = &bdrv_raw;
} else {
if (!drv) {
drv = find_image_format(filename);
@@ -438,7 +458,7 @@ int bdrv_open2(BlockDriverState *bs, con
}
path_combine(backing_filename, sizeof(backing_filename),
filename, bs->backing_file);
- if (bdrv_open(bs->backing_hd, backing_filename, 0) < 0)
+ if (bdrv_open2(bs->backing_hd, backing_filename, 0, &bdrv_raw) < 0)
goto fail;
}
diff -r 8d18e52a1b23 -r e3b13e1ecf6c tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c Thu May 15 11:09:16 2008 +0100
+++ b/tools/ioemu/xenstore.c Thu May 15 15:10:05 2008 +0100
@@ -260,6 +260,8 @@ void xenstore_parse_domain_config(int hv
/* autoguess qcow vs qcow2 */
} else if (!strcmp(drv,"file") || !strcmp(drv,"phy")) {
format = &bdrv_raw;
+ } else if (!strcmp(drv,"phy")) {
+ format = &bdrv_raw;
} else {
format = bdrv_find_format(drv);
if (!format) {
@@ -269,7 +271,7 @@ void xenstore_parse_domain_config(int hv
}
}
if (bdrv_open2(bs, params, 0 /* snapshot */, format) < 0)
- fprintf(stderr, "qemu: could not open vbd '%s' or hard disk
image '%s' (drv '%s')\n", buf, params, drv ? drv : "?");
+ fprintf(stderr, "qemu: could not open vbd '%s' or hard disk
image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ?
format->format_name : "0");
}
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home