[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 01/20] block: Make bdrv_img_create() size selecti
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v7 01/20] block: Make bdrv_img_create() size selection easier to read |
Date: |
Tue, 12 Sep 2017 15:31:00 -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 6dd47e414e..ee6a48976e 100644
--- a/block.c
+++ b/block.c
@@ -4393,7 +4393,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 v7 00/20] make dirty-bitmap byte-based, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 01/20] block: Make bdrv_img_create() size selection easier to read,
Eric Blake <=
- [Qemu-block] [PATCH v7 02/20] hbitmap: Rename serialization_granularity to serialization_align, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 03/20] qcow2: Ensure bitmap serialization is aligned, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 05/20] dirty-bitmap: Check for size query failure during truncate, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 06/20] dirty-bitmap: Change bdrv_dirty_bitmap_size() to report bytes, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 04/20] dirty-bitmap: Drop unused functions, Eric Blake, 2017/09/12
- [Qemu-block] [PATCH v7 07/20] dirty-bitmap: Track bitmap size by bytes, Eric Blake, 2017/09/12