[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag |
Date: |
Fri, 23 Apr 2010 17:30:42 +0200 |
From: Christoph Hellwig <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 19 +++++++++++--------
block.h | 4 ----
qemu-io.c | 28 ++++++++++++++--------------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/block.c b/block.c
index e74264d..ed4c819 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;
}
diff --git a/block.h b/block.h
index c5900c8..4a57dd5 100644
--- a/block.h
+++ b/block.h
@@ -29,10 +29,6 @@ typedef struct QEMUSnapshotInfo {
#define BDRV_O_RDWR 0x0002
#define BDRV_O_SNAPSHOT 0x0008 /* open the file read only and save writes
in a snapshot */
-#define BDRV_O_FILE 0x0010 /* open as a raw file (do not try to
- use a disk image format on top of
- it (default for
- bdrv_file_open()) */
#define BDRV_O_NOCACHE 0x0020 /* do not use the host page cache */
#define BDRV_O_CACHE_WB 0x0040 /* use write-back caching */
#define BDRV_O_NATIVE_AIO 0x0080 /* use native AIO instead of the thread pool
*/
diff --git a/qemu-io.c b/qemu-io.c
index ffb5817..8517b90 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -1276,23 +1276,23 @@ static int openfile(char *name, int flags, int growable)
return 1;
}
- bs = bdrv_new("hda");
- if (!bs)
- return 1;
-
if (growable) {
- flags |= BDRV_O_FILE;
- }
-
- if (bdrv_open(bs, name, flags, NULL) < 0) {
- fprintf(stderr, "%s: can't open device %s\n", progname, name);
- bs = NULL;
- return 1;
+ if (bdrv_file_open(&bs, name, flags)) {
+ fprintf(stderr, "%s: can't open device %s\n", progname,
name);
+ return 1;
+ }
+ } else {
+ bs = bdrv_new("hda");
+ if (!bs)
+ return 1;
+
+ if (bdrv_open(bs, name, flags, NULL) < 0) {
+ fprintf(stderr, "%s: can't open device %s\n", progname,
name);
+ bs = NULL;
+ return 1;
+ }
}
- if (growable) {
- bs->growable = 1;
- }
return 0;
}
--
1.6.6.1
- [Qemu-devel] [PULL 00/26] Block patches, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 01/26] qemu-config: qemu_read_config_file() reads the normal config file, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 02/26] qemu-config: Make qemu_config_parse more generic, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 04/26] blkdebug: Inject errors, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 03/26] blkdebug: Basic request passthrough, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 05/26] Make qemu-config available for tools, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 06/26] blkdebug: Add events and rules, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 08/26] qcow2: Fix creation of large images, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 09/26] Replace calls of old bdrv_open, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 13/26] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag,
Kevin Wolf <=
- [Qemu-devel] [PATCH 12/26] qcow2: Return 0/-errno in write_l2_entries, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 07/26] qcow2: Trigger blkdebug events, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 11/26] block: split raw_getlength, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 15/26] qcow2: Return 0/-errno in l2_allocate, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 17/26] block: Do not export bdrv_first, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 16/26] cleanup block driver option handling in vl.c, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 18/26] block: Convert bdrv_first to QTAILQ, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 21/26] block: Convert first_drv to QLIST, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 19/26] Remove un-needed code, Kevin Wolf, 2010/04/23