From 6db956039db8a6333265d458be561dc1bc2b4481 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 5 Apr 2010 16:53:57 +0200 Subject: block: get rid of the BDRV_O_FILE flag BDRV_O_FILE is only used to communicate between bdrv_file_open and bdrv_open. It affects two things: first bdrv_open only searches for protocols using find_protocol instead of all image formats and host drivers. We can easily move that to the caller and pass the found driver to bdrv_open. Second it is used to not force a read-write open of a snapshot file. But we never use bdrv_file_open to open snapshots and this behaviour doesn't make sense to start with. qemu-io abused the BDRV_O_FILE for it's growable option, switch it to using bdrv_file_open to make sure we only open files as growable were we can actually support that. This patch requires Kevin's "[PATCH] Replace calls of old bdrv_open" to be applied first. Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf --- block.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'block.c') diff --git a/block.c b/block.c index e74264d80b..ed4c819f04 100644 --- a/block.c +++ b/block.c @@ -335,10 +335,16 @@ static BlockDriver *find_image_format(const char *filename) int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags) { BlockDriverState *bs; + BlockDriver *drv; int ret; + drv = find_protocol(filename); + if (!drv) { + return -ENOENT; + } + bs = bdrv_new(""); - ret = bdrv_open(bs, filename, flags | BDRV_O_FILE, NULL); + ret = bdrv_open(bs, filename, flags, drv); if (ret < 0) { bdrv_delete(bs); return ret; @@ -416,9 +422,8 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, } pstrcpy(bs->filename, sizeof(bs->filename), filename); - if (flags & BDRV_O_FILE) { - drv = find_protocol(filename); - } else if (!drv) { + + if (!drv) { drv = find_hdev_driver(filename); if (!drv) { drv = find_image_format(filename); @@ -450,14 +455,12 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, * Clear flags that are internal to the block layer before opening the * image. */ - open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING); + open_flags = flags & ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING); /* * Snapshots should be writeable. - * - * XXX(hch): and what is the point of a snapshot during a read-only open? */ - if (!(flags & BDRV_O_FILE) && bs->is_temporary) { + if (bs->is_temporary) { open_flags |= BDRV_O_RDWR; } -- cgit v1.2.3