aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-10-10 11:45:55 +0200
committerKevin Wolf <kwolf@redhat.com>2013-10-11 16:50:00 +0200
commit8f94a6e40e46cbc8e8014da825d25824b1803b34 (patch)
tree9e165d5ed0fcc5b9ce8714ae1645d7d919a004ff /blockdev.c
parent00c49b21e7af1dd8d2167c1b019619ac186dad14 (diff)
downloadqemu-8f94a6e40e46cbc8e8014da825d25824b1803b34.zip
qemu-8f94a6e40e46cbc8e8014da825d25824b1803b34.tar.gz
qemu-8f94a6e40e46cbc8e8014da825d25824b1803b34.tar.bz2
block: Improve driver whitelist checks
The main intent of this patch is to consolidate the whitelist checks to a single point in the code instead of spreading it everywhere. This adds a nicer error message for read-only whitelisting, too, in places where it was still missing. The patch also contains a bonus bug fix: By finding the format first in bdrv_open() and then independently checking against the whitelist only later, we avoid the case that use of a non-whitelisted format results in probing rather than an error message. Previously, this could happen when using the driver=... option. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/blockdev.c b/blockdev.c
index a91d5a8..ab79df7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -468,13 +468,9 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
return NULL;
}
- drv = bdrv_find_whitelisted_format(buf, ro);
+ drv = bdrv_find_format(buf);
if (!drv) {
- if (!ro && bdrv_find_whitelisted_format(buf, !ro)) {
- error_report("'%s' can be only used as read-only device.", buf);
- } else {
- error_report("'%s' invalid format", buf);
- }
+ error_report("'%s' invalid format", buf);
return NULL;
}
}