mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Add special error code for wrong format

Browse Source 
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>
This commit is contained in:
Stefan Weil 2013-01-17 21:45:24 +01:00 committed by Kevin Wolf
parent 884fea4e87
commit 02582abd48
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
blockdev.c
View File

@ -617,8 +617,13 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
ret = bdrv_open(dinfo->bdrv, file, bdrv_flags, drv); ret = bdrv_open(dinfo->bdrv, file, bdrv_flags, drv);
if (ret < 0) { if (ret < 0) {
error_report("could not open disk image %s: %s", if (ret == -EMEDIUMTYPE) {
file, strerror(-ret)); 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; goto err;
} }

3
include/qemu-common.h
View File

@ -68,6 +68,9 @@
#if !defined(ECANCELED) #if !defined(ECANCELED)
#define ECANCELED 4097 #define ECANCELED 4097
#endif #endif
#if !defined(EMEDIUMTYPE)
#define EMEDIUMTYPE 4098
#endif
#ifndef TIME_MAX #ifndef TIME_MAX
#define TIME_MAX LONG_MAX #define TIME_MAX LONG_MAX
#endif #endif