[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] block: Fix open_flags in bdrv_reopen()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 6/6] block: Fix open_flags in bdrv_reopen() |
Date: |
Fri, 25 Apr 2014 19:51:12 +0200 |
Use the same function as bdrv_open() for determining what the right
flags for bs->file are. Without doing this, a reopen means that
bs->file loses BDRV_O_CACHE_WB or BDRV_O_UNMAP if bs doesn't have it as
well.
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 341ee5d..f376a6c 100644
--- a/block.c
+++ b/block.c
@@ -1522,8 +1522,11 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue
*bs_queue,
QSIMPLEQ_INIT(bs_queue);
}
+ /* bdrv_open() masks this flag out */
+ flags &= ~BDRV_O_PROTOCOL;
+
if (bs->file) {
- bdrv_reopen_queue(bs_queue, bs->file, flags);
+ bdrv_reopen_queue(bs_queue, bs->file, bdrv_inherited_flags(flags));
}
bs_entry = g_new0(BlockReopenQueueEntry, 1);
--
1.8.3.1
- [Qemu-devel] [PATCH 1/6] block: Create bdrv_inherited_flags(), (continued)
- [Qemu-devel] [PATCH 1/6] block: Create bdrv_inherited_flags(), Kevin Wolf, 2014/04/25
- [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 <=