aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-01-17 21:45:24 +0100
committerKevin Wolf <kwolf@redhat.com>2013-01-25 18:18:35 +0100
commit02582abd48aa3d860015e9a8fcd0d7ec1c34ec62 (patch)
treec943fd4b33d7a1fec2854086c00bbd29f7617159
parent884fea4e87fbc6daf4e6df618bb3cadc188dcc6b (diff)
downloadqemu-02582abd48aa3d860015e9a8fcd0d7ec1c34ec62.zip
qemu-02582abd48aa3d860015e9a8fcd0d7ec1c34ec62.tar.gz
qemu-02582abd48aa3d860015e9a8fcd0d7ec1c34ec62.tar.bz2
block: Add special error code for wrong format
The block drivers need a special error code for "wrong format". From the available error codes EMEDIUMTYPE fits best. It is not available on all platforms, so a definition in qemu-common.h and a specific error report are needed. Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--blockdev.c9
-rw-r--r--include/qemu-common.h3
2 files changed, 10 insertions, 2 deletions
diff --git a/blockdev.c b/blockdev.c
index ad25b9b..ac396f3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -617,8 +617,13 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
ret = bdrv_open(dinfo->bdrv, file, bdrv_flags, drv);
if (ret < 0) {
- error_report("could not open disk image %s: %s",
- file, strerror(-ret));
+ if (ret == -EMEDIUMTYPE) {
+ error_report("could not open disk image %s: not in %s format",
+ file, drv->format_name);
+ } else {
+ error_report("could not open disk image %s: %s",
+ file, strerror(-ret));
+ }
goto err;
}
diff --git a/include/qemu-common.h b/include/qemu-common.h
index ca464bb..af2379f 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -68,6 +68,9 @@
#if !defined(ECANCELED)
#define ECANCELED 4097
#endif
+#if !defined(EMEDIUMTYPE)
+#define EMEDIUMTYPE 4098
+#endif
#ifndef TIME_MAX
#define TIME_MAX LONG_MAX
#endif