[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 01/18] block: Make bdrv_img_create() size selecti
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v6 01/18] block: Make bdrv_img_create() size selection easier to read |
Date: |
Wed, 30 Aug 2017 16:05:25 -0500 |
All callers of bdrv_img_create() pass in a size, or -1 to read the
size from the backing file. We then set that size as the QemuOpt
default, which means we will reuse that default rather than the
final parameter to qemu_opt_get_size() several lines later. But
it is rather confusing to read subsequent checks of 'size == -1'
when it looks (without seeing the full context) like size defaults
to 0; it also doesn't help that a size of 0 is valid (for some
formats).
Rework the logic to make things more legible.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
v6: Combine into a series rather than being a standalone patch (more for
ease of tracking than for being on topic)
---
block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 3308814bba..3f84d141a7 100644
--- a/block.c
+++ b/block.c
@@ -4392,7 +4392,7 @@ void bdrv_img_create(const char *filename, const char
*fmt,
/* The size for the image must always be specified, unless we have a
backing
* file and we have not been forbidden from opening it. */
- size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 0);
+ size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, img_size);
if (backing_file && !(flags & BDRV_O_NO_BACKING)) {
BlockDriverState *bs;
char *full_backing = g_new0(char, PATH_MAX);
--
2.13.5
- [Qemu-block] [PATCH v6 00/18] make dirty-bitmap byte-based, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 01/18] block: Make bdrv_img_create() size selection easier to read,
Eric Blake <=
- [Qemu-block] [PATCH v6 02/18] hbitmap: Rename serialization_granularity to serialization_align, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 03/18] qcow2: Ensure bitmap serialization is aligned, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 04/18] dirty-bitmap: Drop unused functions, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 05/18] dirty-bitmap: Change bdrv_dirty_bitmap_size() to report bytes, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 06/18] dirty-bitmap: Change bdrv_dirty_bitmap_*serialize*() to take bytes, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 07/18] qcow2: Switch sectors_covered_by_bitmap_cluster() to byte-based, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 09/18] dirty-bitmap: Change bdrv_dirty_iter_next() to report byte offset, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 08/18] dirty-bitmap: Set iterator start by offset, not sector, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 10/18] dirty-bitmap: Change bdrv_get_dirty_count() to report bytes, Eric Blake, 2017/08/30
- [Qemu-block] [PATCH v6 11/18] dirty-bitmap: Change bdrv_get_dirty_locked() to take bytes, Eric Blake, 2017/08/30