Patchwork [v2,1/5] block: Add special error code for wrong format

login
register
mail settings
Submitter Stefan Weil
Date Jan. 17, 2013, 8:45 p.m.
Message ID <1358455528-29813-2-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/213362/
State Accepted
Headers show

Comments

Stefan Weil - Jan. 17, 2013, 8:45 p.m.
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>
---
 blockdev.c            |    9 +++++++--
 include/qemu-common.h |    3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index 9126587..34cde32 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