[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/55] block: set bs->read_only before .bdrv_open()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 15/55] block: set bs->read_only before .bdrv_open() |
Date: |
Mon, 31 Oct 2011 14:29:50 +0100 |
From: Stefan Hajnoczi <address@hidden>
Several block drivers set bs->read_only in .bdrv_open() but
block.c:bdrv_open_common() clobbers its value. Additionally, QED uses
bdrv_is_read_only() in .bdrv_open() to decide whether to perform
consistency checks.
The correct ordering is to initialize bs->read_only from the open flags
before calling .bdrv_open(). This way block drivers can override it if
necessary and can use bdrv_is_read_only() in .bdrv_open().
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index d5ec0be..cb37086 100644
--- a/block.c
+++ b/block.c
@@ -500,6 +500,8 @@ static int bdrv_open_common(BlockDriverState *bs, const
char *filename,
open_flags |= BDRV_O_RDWR;
}
+ bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR);
+
/* Open the image, either directly or using a protocol */
if (drv->bdrv_file_open) {
ret = drv->bdrv_file_open(bs, filename, open_flags);
@@ -514,8 +516,6 @@ static int bdrv_open_common(BlockDriverState *bs, const
char *filename,
goto free_and_fail;
}
- bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR);
-
ret = refresh_total_sectors(bs, bs->total_sectors);
if (ret < 0) {
goto free_and_fail;
--
1.7.6.4
- [Qemu-devel] [PATCH 05/55] block: Remove dead code, (continued)
- [Qemu-devel] [PATCH 05/55] block: Remove dead code, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 06/55] block: Fix bdrv_open use after free, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 07/55] qcow: Fix bdrv_write_compressed error handling, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 09/55] vmdk: Fix use of uninitialised value, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 08/55] ide: Fix off-by-one error in array index check, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 12/55] Documentation: Describe NBD URL syntax, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 13/55] block: fix qcow2_co_flush deadlock, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 10/55] vmdk: Improve error handling, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 11/55] vmdk: Fix possible segfaults, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 14/55] qemu-io: delete bs instead of leaking it, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 15/55] block: set bs->read_only before .bdrv_open(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 17/55] Documentation: Add syntax for using sheepdog devices, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 16/55] block: reinitialize across bdrv_close()/bdrv_open(), Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 18/55] scsi: pass correct sense code for ENOMEDIUM, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 35/55] scsi: allow arbitrary LUNs, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 33/55] scsi: remove devs array from SCSIBus, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 38/55] scsi-disk: fix retrying a flush, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 37/55] scsi-disk: fail READ CAPACITY if LBA != 0 but PMI == 0, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 45/55] scsi-disk: remove cluster_size, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 44/55] scsi-disk: do not duplicate BlockDriverState member, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 46/55] scsi-disk: small clean up to INQUIRY, Kevin Wolf, 2011/10/31