[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 12/21] block: define get_block_status return valu
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v5 12/21] block: define get_block_status return value |
Date: |
Wed, 4 Sep 2013 19:00:29 +0200 |
Define the return value of get_block_status. Bits 0, 1, 2 and 9-62
are valid; bit 63 (the sign bit) is reserved for errors. Bits 3-8
are left for future extensions.
The return code is compatible with the old is_allocated API: if a driver
only returns 0 or 1 (aka BDRV_BLOCK_DATA) like is_allocated used to,
clients of is_allocated will not have any change in behavior. Still,
we will return more precise information in the next patches and the
new definition of bdrv_is_allocated is already prepared for this.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 10 ++++++++--
include/block/block.h | 26 ++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 47a5d63..0eb5e43 100644
--- a/block.c
+++ b/block.c
@@ -3073,7 +3073,7 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
if (!bs->drv->bdrv_co_get_block_status) {
*pnum = nb_sectors;
- return 1;
+ return BDRV_BLOCK_DATA;
}
return bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);
@@ -3123,7 +3123,13 @@ int64_t bdrv_get_block_status(BlockDriverState *bs,
int64_t sector_num,
int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, int *pnum)
{
- return bdrv_get_block_status(bs, sector_num, nb_sectors, pnum);
+ int64_t ret = bdrv_get_block_status(bs, sector_num, nb_sectors, pnum);
+ if (ret < 0) {
+ return ret;
+ }
+ return
+ (ret & BDRV_BLOCK_DATA) ||
+ ((ret & BDRV_BLOCK_ZERO) && !bdrv_has_zero_init(bs));
}
/*
diff --git a/include/block/block.h b/include/block/block.h
index c73e679..578941f 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -81,6 +81,32 @@ typedef struct BlockDevOps {
#define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS)
#define BDRV_SECTOR_MASK ~(BDRV_SECTOR_SIZE - 1)
+/* BDRV_BLOCK_DATA: data is read from bs->file or another file
+ * BDRV_BLOCK_ZERO: sectors read as zero
+ * BDRV_BLOCK_OFFSET_VALID: sector stored in bs->file as raw data
+ *
+ * If BDRV_BLOCK_OFFSET_VALID is set, bits 9-62 represent the offset in
+ * bs->file where sector data can be read from as raw data.
+ *
+ * DATA == 0 && ZERO == 0 means that data is read from backing_hd if present.
+ *
+ * DATA ZERO OFFSET_VALID
+ * t t t sectors read as zero, bs->file is zero at offset
+ * t f t sectors read as valid from bs->file at offset
+ * f t t sectors preallocated, read as zero, bs->file not
+ * necessarily zero at offset
+ * f f t sectors preallocated but read from backing_hd,
+ * bs->file contains garbage at offset
+ * t t f sectors preallocated, read as zero, unknown offset
+ * t f f sectors read from unknown file or offset
+ * f t f not allocated or unknown offset, read as zero
+ * f f f not allocated or unknown offset, read from backing_hd
+ */
+#define BDRV_BLOCK_DATA 1
+#define BDRV_BLOCK_ZERO 2
+#define BDRV_BLOCK_OFFSET_VALID 4
+#define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK
+
typedef enum {
BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP
} BlockErrorAction;
--
1.8.3.1
- [Qemu-devel] [PATCH v5 01/21] cow: make reads go at a decent speed, (continued)
- [Qemu-devel] [PATCH v5 01/21] cow: make reads go at a decent speed, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 02/21] cow: make writes go at a less indecent speed, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 03/21] cow: do not call bdrv_co_is_allocated, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 04/21] block: keep bs->total_sectors up to date even for growable block devices, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 06/21] block: do not use ->total_sectors in bdrv_co_is_allocated, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 05/21] block: make bdrv_co_is_allocated static, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 08/21] block: expect errors from bdrv_co_is_allocated, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 07/21] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 10/21] block: make bdrv_has_zero_init return false for copy-on-write-images, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 11/21] block: introduce bdrv_get_block_status API, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 12/21] block: define get_block_status return value,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v5 13/21] block: return get_block_status data and flags for formats, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 09/21] qemu-img: always probe the input image for allocated sectors, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 14/21] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 16/21] qemu-img: add a "map" subcommand, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 15/21] block: return BDRV_BLOCK_ZERO past end of backing file, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 17/21] docs, qapi: document qemu-img map, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 18/21] raw-posix: return get_block_status data and flags, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 19/21] raw-posix: report unwritten extents as zero, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 20/21] block: add default get_block_status implementation for protocols, Paolo Bonzini, 2013/09/04
- [Qemu-devel] [PATCH v5 21/21] block: look for zero blocks in bs->file, Paolo Bonzini, 2013/09/04