From f1f25a2e2ea0cd3cdc7d01f2e0afbc4aef6fb853 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 25 Apr 2014 19:04:55 +0200 Subject: [PATCH] block: Fix open_flags in bdrv_reopen() 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 Reviewed-by: Max Reitz --- block.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 9f6f07e75c..b749d31ad4 100644 --- a/block.c +++ b/block.c @@ -1525,8 +1525,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); -- 2.11.4.GIT