|
 |
7711c0 |
From e5cb59a02593db3efcb88f1dd0cc592cf5bb34b7 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Date: Fri, 23 Nov 2018 10:41:54 +0100
|
|
|
7711c0 |
Subject: [PATCH 13/34] block: Fix update of BDRV_O_AUTO_RDONLY in
|
|
|
7711c0 |
update_flags_from_options()
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Message-id: <20181123104154.13541-13-kwolf@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 83122
|
|
|
7711c0 |
O-Subject: [RHEL-7.7/7.6.z qemu-kvm-rhev PATCH v2 12/12] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()
|
|
|
7711c0 |
Bugzilla: 1623986
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Alberto Garcia <berto@igalia.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Commit e35bdc123a4ace9f4d3fcca added the auto-read-only option and the
|
|
|
7711c0 |
code to update its corresponding flag in update_flags_from_options(),
|
|
|
7711c0 |
but forgot to clear the flag if auto-read-only is false.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Alberto Garcia <berto@igalia.com>
|
|
|
7711c0 |
Reported-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 2a3d4331fa2d40708188b8000f98ff1f7dcd33bc)
|
|
|
7711c0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
block.c | 4 +---
|
|
|
7711c0 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/block.c b/block.c
|
|
|
7711c0 |
index 6e3b574..037d2b0 100644
|
|
|
7711c0 |
--- a/block.c
|
|
|
7711c0 |
+++ b/block.c
|
|
|
7711c0 |
@@ -1112,7 +1112,7 @@ static int bdrv_open_flags(BlockDriverState *bs, int flags)
|
|
|
7711c0 |
|
|
|
7711c0 |
static void update_flags_from_options(int *flags, QemuOpts *opts)
|
|
|
7711c0 |
{
|
|
|
7711c0 |
- *flags &= ~BDRV_O_CACHE_MASK;
|
|
|
7711c0 |
+ *flags &= ~(BDRV_O_CACHE_MASK | BDRV_O_RDWR | BDRV_O_AUTO_RDONLY);
|
|
|
7711c0 |
|
|
|
7711c0 |
assert(qemu_opt_find(opts, BDRV_OPT_CACHE_NO_FLUSH));
|
|
|
7711c0 |
if (qemu_opt_get_bool(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
|
|
|
7711c0 |
@@ -1124,8 +1124,6 @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
|
|
|
7711c0 |
*flags |= BDRV_O_NOCACHE;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
|
|
|
7711c0 |
- *flags &= ~BDRV_O_RDWR;
|
|
|
7711c0 |
-
|
|
|
7711c0 |
assert(qemu_opt_find(opts, BDRV_OPT_READ_ONLY));
|
|
|
7711c0 |
if (!qemu_opt_get_bool(opts, BDRV_OPT_READ_ONLY, false)) {
|
|
|
7711c0 |
*flags |= BDRV_O_RDWR;
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|