[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] block: Create bdrv_inherited_flags()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 1/6] block: Create bdrv_inherited_flags() |
Date: |
Fri, 25 Apr 2014 19:51:07 +0200 |
Instead of having bdrv_open_flags() as a function that creates flags for
several unrelated places and then adding open-coded flags on top, create
a new function that derives the flags for bs->file from the flags for bs.
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index fc2edd3..eb2f39c 100644
--- a/block.c
+++ b/block.c
@@ -774,6 +774,30 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs)
bs->copy_on_read--;
}
+/*
+ * Returns the flags that bs->file should get, based on the given flags for
+ * the parent BDS
+ */
+static int bdrv_inherited_flags(int flags)
+{
+ /* Enable protocol handling, disable format probing for bs->file */
+ flags |= BDRV_O_PROTOCOL;
+
+ /* Our block drivers take care to send flushes and respect unmap policy,
+ * so we can enable both unconditionally on lower layers. */
+ flags |= BDRV_O_CACHE_WB | BDRV_O_UNMAP;
+
+ /* The backing file of a temporary snapshot is read-only */
+ if (flags & BDRV_O_SNAPSHOT) {
+ flags &= ~BDRV_O_RDWR;
+ }
+
+ /* Clear flags that only apply to the top layer */
+ flags &= ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
+
+ return flags;
+}
+
static int bdrv_open_flags(BlockDriverState *bs, int flags)
{
int open_flags = flags | BDRV_O_CACHE_WB;
@@ -1330,8 +1354,8 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
assert(file == NULL);
ret = bdrv_open_image(&file, filename, options, "file",
- bdrv_open_flags(bs, flags | BDRV_O_UNMAP) |
- BDRV_O_PROTOCOL, true, &local_err);
+ bdrv_inherited_flags(flags),
+ true, &local_err);
if (ret < 0) {
goto unlink_and_fail;
}
--
1.8.3.1
- [Qemu-devel] [PATCH 0/6] block: bdrv_open() fixes and cleanups, Kevin Wolf, 2014/04/25
- [Qemu-devel] [PATCH 1/6] block: Create bdrv_inherited_flags(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 4/6] block: Unlink temporary files in raw-posix/win32, Kevin Wolf, 2014/04/25
- [Qemu-devel] [PATCH 5/6] Revert "block: another bdrv_append fix", Kevin Wolf, 2014/04/25
- [Qemu-devel] [PATCH 2/6] block: Create bdrv_backing_flags(), Kevin Wolf, 2014/04/25
- [Qemu-devel] [PATCH 3/6] block: Remove BDRV_O_COPY_ON_READ for bs->file, Kevin Wolf, 2014/04/25
- [Qemu-devel] [PATCH 6/6] block: Fix open_flags in bdrv_reopen(), Kevin Wolf, 2014/04/25