Series comparison

-[Qemu-devel] [PULL 00/23] Block layer patches
+[PULL 0/3] Block layer patches
-The following changes since commit 07f426c35eddd79388a23d11cb278600d7e3831d:
+The following changes since commit 0a301624c2f4ced3331ffd5bce85b4274fe132af:
-  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180926' into staging (2018-09-28 18:56:09 +0100)
+  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20220208' into staging (2022-02-08 11:40:08 +0000)
-are available in the git repository at:
+are available in the Git repository at:
-  git://repo.or.cz/qemu/kevin.git tags/for-upstream
+  https://gitlab.com/kmwolf/qemu.git tags/for-upstream
-for you to fetch changes up to dd353157942a59c21da07da5ac8749a871f7c3ed:
+for you to fetch changes up to fdb8541b2e4f6ff60f435fbb5a5e1df20c275a86:
-  tests/test-bdrv-drain: Fix too late qemu_event_reset() (2018-10-01 19:13:55 +0200)
+  hw/block/fdc-isa: Respect QOM properties when building AML (2022-02-11 17:37:26 +0100)
 ----------------------------------------------------------------
-Block layer patches:
+Block layer patches
-- qcow2 cache option default changes (Linux: 32 MB maximum, limited by
+- Fix crash in blockdev-reopen with iothreads
-  whatever cache size can be made use of with the specific image;
+- fdc-isa: Respect QOM properties when building AML
   default cache-clean-interval of 10 minutes)
 - reopen: Allow specifying unchanged child node references, and changing
   a few generic options (discard, detect-zeroes)
 - Fix werror/rerror defaults for -device drive=<node-name>
 - Test case fixes
 ----------------------------------------------------------------
-Alberto Garcia (9):
+Bernhard Beschow (1):
-      qemu-io: Fix writethrough check in reopen
+      hw/block/fdc-isa: Respect QOM properties when building AML
       file-posix: x-check-cache-dropped should default to false on reopen
       block: Remove child references from bs->{options,explicit_options}
       block: Don't look for child references in append_open_options()
       block: Allow child references on reopen
       block: Forbid trying to change unsupported options during reopen
       file-posix: Forbid trying to change unsupported options during reopen
       block: Allow changing 'discard' on reopen
       block: Allow changing 'detect-zeroes' on reopen
-Fam Zheng (1):
+Kevin Wolf (2):
-      file-posix: Include filename in locking error message
+      block: Lock AioContext for drain_end in blockdev-reopen
       iotests: Test blockdev-reopen with iothreads and throttling
-Kevin Wolf (3):
+ blockdev.c                 | 11 ++++++++++-
-      block-backend: Set werror/rerror defaults in blk_new()
+ hw/block/fdc-isa.c         | 11 +++++++----
-      test-replication: Lock AioContext around blk_unref()
+ tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
-      tests/test-bdrv-drain: Fix too late qemu_event_reset()
+ tests/qemu-iotests/245.out |  4 ++--
 files changed, 52 insertions(+), 10 deletions(-)
-Leonid Bloch (10):
-      qcow2: Options' documentation fixes
-      include: Add a lookup table of sizes
-      qcow2: Make sizes more humanly readable
-      qcow2: Avoid duplication in setting the refcount cache size
-      qcow2: Assign the L2 cache relatively to the image size
-      qcow2: Increase the default upper limit on the L2 cache size
-      qcow2: Resize the cache upon image resizing
-      qcow2: Set the default cache-clean-interval to 10 minutes
-      qcow2: Explicit number replaced by a constant
-      qcow2: Fix cache-clean-interval documentation
- qapi/block-core.json       |   4 +-
- docs/qcow2-cache.txt       |  59 ++++++++++++--------
- block/qcow2.h              |  19 ++++---
- include/block/block.h      |   1 +
- include/qemu/units.h       |  55 ++++++++++++++++++
- block.c                    | 135 +++++++++++++++++++++++++++++----------------
- block/block-backend.c      |   3 +
- block/file-posix.c         |  19 +++++--
- block/qcow2.c              |  43 +++++++++------
- qemu-io-cmds.c             |   2 +-
- tests/test-bdrv-drain.c    |   4 +-
- tests/test-replication.c   |  11 ++++
- qemu-options.hx            |  12 ++--
- tests/qemu-iotests/067.out |   1 +
- tests/qemu-iotests/137     |   8 ++-
- tests/qemu-iotests/137.out |   4 +-
- tests/qemu-iotests/153.out |  76 ++++++++++++-------------
- tests/qemu-iotests/182.out |   2 +-
-files changed, 307 insertions(+), 151 deletions(-)

-[Qemu-devel] [PULL 01/23] file-posix: Include filename in locking error message
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-Image locking errors happening at device initialization time doesn't say
-which file cannot be locked, for instance,
-    -device scsi-disk,drive=drive-1: Failed to get shared "write" lock
-    Is another process using the image?
-could refer to either the overlay image or its backing image.
-Hoist the error_append_hint to the caller of raw_check_lock_bytes where
-file name is known, and include it in the error hint.
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/file-posix.c         | 10 +++---
- tests/qemu-iotests/153.out | 76 +++++++++++++++++++++++-----------------------
- tests/qemu-iotests/182.out |  2 +-
-files changed, 45 insertions(+), 43 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,
-                            "Failed to get \"%s\" lock",
-                            perm_name);
-                 g_free(perm_name);
--                error_append_hint(errp,
--                                  "Is another process using the image?\n");
-                 return ret;
-             }
-         }
-@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,
-                            "Failed to get shared \"%s\" lock",
-                            perm_name);
-                 g_free(perm_name);
--                error_append_hint(errp,
--                                  "Is another process using the image?\n");
-                 return ret;
-             }
-         }
-@@ -XXX,XX +XXX,XX @@ static int raw_handle_perm_lock(BlockDriverState *bs,
-             if (!ret) {
-                 return 0;
-             }
-+            error_append_hint(errp,
-+                              "Is another process using the image [%s]?\n",
-+                              bs->filename);
-         }
-         op = RAW_PL_ABORT;
-         /* fall through to unlock bytes. */
-@@ -XXX,XX +XXX,XX @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
-     /* Step two: Check that nobody else has taken conflicting locks */
-     result = raw_check_lock_bytes(fd, perm, shared, errp);
-     if (result < 0) {
-+        error_append_hint(errp,
-+                          "Is another process using the image [%s]?\n",
-+                          file_opts->filename);
-         goto out_unlock;
-     }
-diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/153.out
-+++ b/tests/qemu-iotests/153.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t
- == Launching another QEMU, opts: '' ==
- QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Launching another QEMU, opts: 'read-only=on' ==
- QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,read-only=on: Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Launching another QEMU, opts: 'read-only=on,force-share=on' ==
-@@ -XXX,XX +XXX,XX @@ Is another process using the image?
- _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
- can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
- can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
- _qemu_img_wrapper info TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper check TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper map TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper amend -o  TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper commit TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper resize TEST_DIR/t.qcow2 32M
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper dd if=TEST_DIR/t.qcow2 of=TEST_DIR/t.qcow2.convert bs=512 count=1
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- file format: IMGFMT
- == Running utility commands -U ==
-@@ -XXX,XX +XXX,XX @@ Try 'qemu-img --help' for more information
- _qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t
- == Launching another QEMU, opts: '' ==
- QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Launching another QEMU, opts: 'read-only=on' ==
-@@ -XXX,XX +XXX,XX @@ Is another process using the image?
- _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
- _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
-@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper map TEST_DIR/t.qcow2
- _qemu_img_wrapper amend -o  TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper commit TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper resize TEST_DIR/t.qcow2 32M
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2
-@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2
- _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- file format: IMGFMT
- == Running utility commands -U ==
-@@ -XXX,XX +XXX,XX @@ Try 'qemu-img --help' for more information
- _qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
- qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2
-@@ -XXX,XX +XXX,XX @@ Round done
- == Two devices with the same image (read-only=off - read-only=off) ==
- QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=off: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Two devices with the same image (read-only=off - read-only=on) ==
- QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=on: Failed to get shared "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Two devices with the same image (read-only=off - read-only=on,force-share=on) ==
- == Two devices with the same image (read-only=on - read-only=off) ==
- QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=off: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Two devices with the same image (read-only=on - read-only=on) ==
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.c', fmt=IMGFMT size=33554432 backing_file=TEST_DIR
- == Backing image also as an active device ==
- QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Backing image also as an active device (ro) ==
- == Symbolic link ==
- QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- == Active commit to intermediate layer should work when base in use ==
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ Adding drive
- _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- Creating overlay with qemu-img when the guest is running should be allowed
- _qemu_img_wrapper create -f qcow2 -b TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.overlay
-@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
- _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
- can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- Closing the other
- _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/182.out
-+++ b/tests/qemu-iotests/182.out
-@@ -XXX,XX +XXX,XX @@ Starting QEMU
- Starting a second QEMU using the same image should fail
- QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,id=drive0,file.locking=on: Failed to get "write" lock
--Is another process using the image?
-+Is another process using the image [TEST_DIR/t.qcow2]?
- *** done
---
-.13.6

-[Qemu-devel] [PULL 02/23] qemu-io: Fix writethrough check in reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-"qemu-io reopen" doesn't allow changing the writethrough setting of
-the cache, but the check is wrong, causing an error even on a simple
-reopen with the default parameters:
-   $ qemu-img create -f qcow2 hd.qcow2 1M
-   $ qemu-system-x86_64 -monitor stdio -drive if=virtio,file=hd.qcow2
-   (qemu) qemu-io virtio0 reopen
-   Cannot change cache.writeback: Device attached
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qemu-io-cmds.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-io-cmds.c
-+++ b/qemu-io-cmds.c
-@@ -XXX,XX +XXX,XX @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
-         return -EINVAL;
-     }
--    if (writethrough != blk_enable_write_cache(blk) &&
-+    if (!writethrough != blk_enable_write_cache(blk) &&
-         blk_get_attached_dev(blk))
-     {
-         error_report("Cannot change cache.writeback: Device attached");
---
-.13.6

-[Qemu-devel] [PULL 03/23] file-posix: x-check-cache-dropped should default to false on reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The default value of x-check-cache-dropped is false. There's no reason
-to use the previous value as a default in raw_reopen_prepare() because
-bdrv_reopen_queue_child() already takes care of putting the old
-options in the BDRVReopenState.options QDict.
-If x-check-cache-dropped was previously set but is now missing from
-the reopen QDict then it should be reset to false.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/file-posix.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
-     }
-     rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
--                                                s->check_cache_dropped);
-+                                                false);
-     if (s->type == FTYPE_CD) {
-         rs->open_flags |= O_NONBLOCK;
---
-.13.6

-[Qemu-devel] [PULL 04/23] block: Remove child references from bs->{options, explicit_options}
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-Block drivers allow opening their children using a reference to an
-existing BlockDriverState. These references remain stored in the
-'options' and 'explicit_options' QDicts, but we don't need to keep
-them once everything is open.
-What is more important, these values can become wrong if the children
-change:
-    $ qemu-img create -f qcow2 hd0.qcow2 10M
-    $ qemu-img create -f qcow2 hd1.qcow2 10M
-    $ qemu-img create -f qcow2 hd2.qcow2 10M
-    $ $QEMU -drive if=none,file=hd0.qcow2,node-name=hd0 \
-            -drive if=none,file=hd1.qcow2,node-name=hd1,backing=hd0 \
-            -drive file=hd2.qcow2,node-name=hd2,backing=hd1
-After this hd2 has hd1 as its backing file. Now let's remove it using
-block_stream:
-    (qemu) block_stream hd2 0 hd0.qcow2
-Now hd0 is the backing file of hd2, but hd2's options QDicts still
-contain backing=hd1.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 13 ++++++++++++-
-file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
-         }
-     }
--    /* Remove all children options from bs->options and bs->explicit_options */
-+    /* Remove all children options and references
-+     * from bs->options and bs->explicit_options */
-     QLIST_FOREACH(child, &bs->children, next) {
-         char *child_key_dot;
-         child_key_dot = g_strdup_printf("%s.", child->name);
-         qdict_extract_subqdict(bs->explicit_options, NULL, child_key_dot);
-         qdict_extract_subqdict(bs->options, NULL, child_key_dot);
-+        qdict_del(bs->explicit_options, child->name);
-+        qdict_del(bs->options, child->name);
-         g_free(child_key_dot);
-     }
-@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
- {
-     BlockDriver *drv;
-     BlockDriverState *bs;
-+    BdrvChild *child;
-     bool old_can_write, new_can_write;
-     assert(reopen_state != NULL);
-@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
-     bs->open_flags         = reopen_state->flags;
-     bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
-+    /* Remove child references from bs->options and bs->explicit_options.
-+     * Child options were already removed in bdrv_reopen_queue_child() */
-+    QLIST_FOREACH(child, &bs->children, next) {
-+        qdict_del(bs->explicit_options, child->name);
-+        qdict_del(bs->options, child->name);
-+    }
-+
-     bdrv_refresh_limits(bs, NULL);
-     bdrv_set_perm(reopen_state->bs, reopen_state->perm,
---
-.13.6

-[Qemu-devel] [PULL 05/23] block: Don't look for child references in append_open_options()
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-In the previous patch we removed child references from bs->options, so
-there's no need to look for them here anymore.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 13 +------------
-file changed, 1 insertion(+), 12 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static bool append_open_options(QDict *d, BlockDriverState *bs)
- {
-     const QDictEntry *entry;
-     QemuOptDesc *desc;
--    BdrvChild *child;
-     bool found_any = false;
-     for (entry = qdict_first(bs->options); entry;
-          entry = qdict_next(bs->options, entry))
-     {
--        /* Exclude node-name references to children */
--        QLIST_FOREACH(child, &bs->children, next) {
--            if (!strcmp(entry->key, child->name)) {
--                break;
--            }
--        }
--        if (child) {
--            continue;
--        }
--
--        /* And exclude all non-driver-specific options */
-+        /* Exclude all non-driver-specific options */
-         for (desc = bdrv_runtime_opts.desc; desc->name; desc++) {
-             if (!strcmp(qdict_entry_key(entry), desc->name)) {
-                 break;
---
-.13.6

-[Qemu-devel] [PULL 06/23] block: Allow child references on reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-In the previous patches we removed all child references from
-bs->{options,explicit_options} because keeping them is useless and
-wrong.
-Because of this, any attempt to reopen a BlockDriverState using a
-child reference as one of its options would result in a failure,
-because bdrv_reopen_prepare() would detect that there's a new option
-(the child reference) that wasn't present in bs->options.
-But passing child references on reopen can be useful. It's a way to
-specify a BDS's child without having to pass recursively all of the
-child's options, and if the reference points to a different BDS then
-this can allow us to replace the child.
-However, replacing the child is something that needs to be implemented
-case by case and only when it makes sense. For now, this patch allows
-passing a child reference as long as it points to the current child of
-the BlockDriverState.
-It's also important to remember that, as a consequence of the
-previous patches, this child reference will be removed from
-bs->{options,explicit_options} after the reopening has been completed.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 18 ++++++++++++++++++
-file changed, 18 insertions(+)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-             QObject *new = entry->value;
-             QObject *old = qdict_get(reopen_state->bs->options, entry->key);
-+            /* Allow child references (child_name=node_name) as long as they
-+             * point to the current child (i.e. everything stays the same). */
-+            if (qobject_type(new) == QTYPE_QSTRING) {
-+                BdrvChild *child;
-+                QLIST_FOREACH(child, &reopen_state->bs->children, next) {
-+                    if (!strcmp(child->name, entry->key)) {
-+                        break;
-+                    }
-+                }
-+
-+                if (child) {
-+                    const char *str = qobject_get_try_str(new);
-+                    if (!strcmp(child->bs->node_name, str)) {
-+                        continue; /* Found child with this name, skip option */
-+                    }
-+                }
-+            }
-+
-             /*
-              * TODO: When using -drive to specify blockdev options, all values
-              * will be strings; however, when using -blockdev, blockdev-add or
---
-.13.6

-[Qemu-devel] [PULL 07/23] block: Forbid trying to change unsupported options during reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The bdrv_reopen_prepare() function checks all options passed to each
-BlockDriverState (in the reopen_state->options QDict) and makes all
-necessary preparations to apply the option changes requested by the
-user.
-Options are removed from the QDict as they are processed, so at the
-end of bdrv_reopen_prepare() only the options that can't be changed
-are left. Then a loop goes over all remaining options and verifies
-that the old and new values are identical, returning an error if
-they're not.
-The problem is that at the moment there are options that are removed
-from the QDict although they can't be changed. The consequence of this
-is any modification to any of those options is silently ignored:
-   (qemu) qemu-io virtio0 "reopen -o discard=on"
-This happens when all options from bdrv_runtime_opts are removed
-from the QDict but then only a few of them are processed. Since
-it's especially important that "node-name" and "driver" are not
-changed, the code puts them back into the QDict so they are checked
-at the end of the function. Instead of putting only those two options
-back into the QDict, this patch puts all unprocessed options using
-qemu_opts_to_qdict().
-update_flags_from_options() also needs to be modified to prevent
-BDRV_OPT_CACHE_NO_FLUSH, BDRV_OPT_CACHE_DIRECT and BDRV_OPT_READ_ONLY
-from going back to the QDict.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 22 +++++++---------------
-file changed, 7 insertions(+), 15 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
-     *flags &= ~BDRV_O_CACHE_MASK;
-     assert(qemu_opt_find(opts, BDRV_OPT_CACHE_NO_FLUSH));
--    if (qemu_opt_get_bool(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
-+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
-         *flags |= BDRV_O_NO_FLUSH;
-     }
-     assert(qemu_opt_find(opts, BDRV_OPT_CACHE_DIRECT));
--    if (qemu_opt_get_bool(opts, BDRV_OPT_CACHE_DIRECT, false)) {
-+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_DIRECT, false)) {
-         *flags |= BDRV_O_NOCACHE;
-     }
-     *flags &= ~BDRV_O_RDWR;
-     assert(qemu_opt_find(opts, BDRV_OPT_READ_ONLY));
--    if (!qemu_opt_get_bool(opts, BDRV_OPT_READ_ONLY, false)) {
-+    if (!qemu_opt_get_bool_del(opts, BDRV_OPT_READ_ONLY, false)) {
-         *flags |= BDRV_O_RDWR;
-     }
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-     BlockDriver *drv;
-     QemuOpts *opts;
-     QDict *orig_reopen_opts;
--    const char *value;
-     bool read_only;
-     assert(reopen_state != NULL);
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-     update_flags_from_options(&reopen_state->flags, opts);
--    /* node-name and driver must be unchanged. Put them back into the QDict, so
--     * that they are checked at the end of this function. */
--    value = qemu_opt_get(opts, "node-name");
--    if (value) {
--        qdict_put_str(reopen_state->options, "node-name", value);
--    }
--
--    value = qemu_opt_get(opts, "driver");
--    if (value) {
--        qdict_put_str(reopen_state->options, "driver", value);
--    }
-+    /* All other options (including node-name and driver) must be unchanged.
-+     * Put them back into the QDict, so that they are checked at the end
-+     * of this function. */
-+    qemu_opts_to_qdict(opts, reopen_state->options);
-     /* If we are to stay read-only, do not allow permission change
-      * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
---
-.13.6

-[Qemu-devel] [PULL 08/23] file-posix: Forbid trying to change unsupported options during reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The file-posix code is used for the "file", "host_device" and
-"host_cdrom" drivers, and it allows reopening images. However the only
-option that is actually processed is "x-check-cache-dropped", and
-changes in all other options (e.g. "filename") are silently ignored:
-   (qemu) qemu-io virtio0 "reopen -o file.filename=no-such-file"
-While we could allow changing some of the other options, let's keep
-things as they are for now but return an error if the user tries to
-change any of them.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/file-posix.c | 9 +++++++--
-file changed, 7 insertions(+), 2 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
-         goto out;
-     }
--    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
--                                                false);
-+    rs->check_cache_dropped =
-+        qemu_opt_get_bool_del(opts, "x-check-cache-dropped", false);
-+
-+    /* This driver's reopen function doesn't currently allow changing
-+     * other options, so let's put them back in the original QDict and
-+     * bdrv_reopen_prepare() will detect changes and complain. */
-+    qemu_opts_to_qdict(opts, state->options);
-     if (s->type == FTYPE_CD) {
-         rs->open_flags |= O_NONBLOCK;
---
-.13.6

-[Qemu-devel] [PULL 09/23] block: Allow changing 'discard' on reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-'discard' is one of the basic BlockdevOptions available for all
-drivers, but it's not handled by bdrv_reopen_prepare() so any attempt
-to change it results in an error:
-   (qemu) qemu-io virtio0 "reopen -o discard=on"
-   Cannot change the option 'discard'
-Since there's no reason why we shouldn't allow changing it and the
-implementation is simple let's just do it.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 11 +++++++++++
-file changed, 11 insertions(+)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-     BlockDriver *drv;
-     QemuOpts *opts;
-     QDict *orig_reopen_opts;
-+    char *discard = NULL;
-     bool read_only;
-     assert(reopen_state != NULL);
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-     update_flags_from_options(&reopen_state->flags, opts);
-+    discard = qemu_opt_get_del(opts, "discard");
-+    if (discard != NULL) {
-+        if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
-+            error_setg(errp, "Invalid discard option");
-+            ret = -EINVAL;
-+            goto error;
-+        }
-+    }
-+
-     /* All other options (including node-name and driver) must be unchanged.
-      * Put them back into the QDict, so that they are checked at the end
-      * of this function. */
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
- error:
-     qemu_opts_del(opts);
-     qobject_unref(orig_reopen_opts);
-+    g_free(discard);
-     return ret;
- }
---
-.13.6

-[Qemu-devel] [PULL 10/23] block: Allow changing 'detect-zeroes' on reopen
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-'detect-zeroes' is one of the basic BlockdevOptions available for all
-drivers, but it's not handled by bdrv_reopen_prepare(), so any attempt
-to change it results in an error:
-   (qemu) qemu-io virtio0 "reopen -o detect-zeroes=on"
-   Cannot change the option 'detect-zeroes'
-Since there's no reason why we shouldn't allow changing it and the
-implementation is simple let's just do it.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- include/block/block.h |  1 +
- block.c               | 64 ++++++++++++++++++++++++++++++++-------------------
-files changed, 41 insertions(+), 24 deletions(-)
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
- typedef struct BDRVReopenState {
-     BlockDriverState *bs;
-     int flags;
-+    BlockdevDetectZeroesOptions detect_zeroes;
-     uint64_t perm, shared_perm;
-     QDict *options;
-     QDict *explicit_options;
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static void bdrv_join_options(BlockDriverState *bs, QDict *options,
-     }
- }
-+static BlockdevDetectZeroesOptions bdrv_parse_detect_zeroes(QemuOpts *opts,
-+                                                            int open_flags,
-+                                                            Error **errp)
-+{
-+    Error *local_err = NULL;
-+    char *value = qemu_opt_get_del(opts, "detect-zeroes");
-+    BlockdevDetectZeroesOptions detect_zeroes =
-+        qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup, value,
-+                        BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, &local_err);
-+    g_free(value);
-+    if (local_err) {
-+        error_propagate(errp, local_err);
-+        return detect_zeroes;
-+    }
-+
-+    if (detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&
-+        !(open_flags & BDRV_O_UNMAP))
-+    {
-+        error_setg(errp, "setting detect-zeroes to unmap is not allowed "
-+                   "without setting discard operation to unmap");
-+    }
-+
-+    return detect_zeroes;
-+}
-+
- /**
-  * Set open flags for a given discard mode
-  *
-@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
-     const char *driver_name = NULL;
-     const char *node_name = NULL;
-     const char *discard;
--    const char *detect_zeroes;
-     QemuOpts *opts;
-     BlockDriver *drv;
-     Error *local_err = NULL;
-@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
-         }
-     }
--    detect_zeroes = qemu_opt_get(opts, "detect-zeroes");
--    if (detect_zeroes) {
--        BlockdevDetectZeroesOptions value =
--            qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup,
--                            detect_zeroes,
--                            BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
--                            &local_err);
--        if (local_err) {
--            error_propagate(errp, local_err);
--            ret = -EINVAL;
--            goto fail_opts;
--        }
--
--        if (value == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&
--            !(bs->open_flags & BDRV_O_UNMAP))
--        {
--            error_setg(errp, "setting detect-zeroes to unmap is not allowed "
--                             "without setting discard operation to unmap");
--            ret = -EINVAL;
--            goto fail_opts;
--        }
--
--        bs->detect_zeroes = value;
-+    bs->detect_zeroes =
-+        bdrv_parse_detect_zeroes(opts, bs->open_flags, &local_err);
-+    if (local_err) {
-+        error_propagate(errp, local_err);
-+        ret = -EINVAL;
-+        goto fail_opts;
-     }
-     if (filename != NULL) {
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-         }
-     }
-+    reopen_state->detect_zeroes =
-+        bdrv_parse_detect_zeroes(opts, reopen_state->flags, &local_err);
-+    if (local_err) {
-+        error_propagate(errp, local_err);
-+        ret = -EINVAL;
-+        goto error;
-+    }
-+
-     /* All other options (including node-name and driver) must be unchanged.
-      * Put them back into the QDict, so that they are checked at the end
-      * of this function. */
-@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
-     bs->options            = reopen_state->options;
-     bs->open_flags         = reopen_state->flags;
-     bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
-+    bs->detect_zeroes      = reopen_state->detect_zeroes;
-     /* Remove child references from bs->options and bs->explicit_options.
-      * Child options were already removed in bdrv_reopen_queue_child() */
---
-.13.6

-[Qemu-devel] [PULL 11/23] qcow2: Options' documentation fixes
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- docs/qcow2-cache.txt | 21 ++++++++++++++-------
- qemu-options.hx      |  9 ++++++---
-files changed, 20 insertions(+), 10 deletions(-)
-diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
-index XXXXXXX..XXXXXXX 100644
---- a/docs/qcow2-cache.txt
-+++ b/docs/qcow2-cache.txt
-@@ -XXX,XX +XXX,XX @@ Choosing the right cache sizes
- In order to choose the cache sizes we need to know how they relate to
- the amount of allocated space.
--The amount of virtual disk that can be mapped by the L2 and refcount
-+The part of the virtual disk that can be mapped by the L2 and refcount
- caches (in bytes) is:
-    disk_size = l2_cache_size * cluster_size / 8
-    disk_size = refcount_cache_size * cluster_size * 8 / refcount_bits
- With the default values for cluster_size (64KB) and refcount_bits
--(16), that is
-+(16), this becomes:
-    disk_size = l2_cache_size * 8192
-    disk_size = refcount_cache_size * 32768
-@@ -XXX,XX +XXX,XX @@ need:
-    l2_cache_size = disk_size_GB * 131072
-    refcount_cache_size = disk_size_GB * 32768
--QEMU has a default L2 cache of 1MB (1048576 bytes) and a refcount
--cache of 256KB (262144 bytes), so using the formulas we've just seen
--we have
-+For example, 1MB of L2 cache is needed to cover every 8 GB of the virtual
-+image size (given that the default cluster size is used):
--   1048576 / 131072 = 8 GB of virtual disk covered by that cache
--    262144 /  32768 = 8 GB
-+   8 GB / 8192 = 1 MB
-+
-+The refcount cache is 4 times the cluster size by default. With the default
-+cluster size of 64 KB, it is 256 KB (262144 bytes). This is sufficient for
-+8 GB of image size:
-+
-+   262144 * 32768 = 8 GB
- How to configure the cache sizes
-@@ -XXX,XX +XXX,XX @@ There are a few things that need to be taken into account:
-    memory as possible to the L2 cache before increasing the refcount
-    cache size.
-+ - At most two of "l2-cache-size", "refcount-cache-size", and "cache-size"
-+   can be set simultaneously.
-+
- Unlike L2 tables, refcount blocks are not used during normal I/O but
- only during allocations and internal snapshots. In most cases they are
- accessed sequentially (even during random guest I/O) so increasing the
-diff --git a/qemu-options.hx b/qemu-options.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -XXX,XX +XXX,XX @@ image file)
- @item cache-size
- The maximum total size of the L2 table and refcount block caches in bytes
--(default: 1048576 bytes or 8 clusters, whichever is larger)
-+(default: the sum of l2-cache-size and refcount-cache-size)
- @item l2-cache-size
- The maximum size of the L2 table cache in bytes
--(default: 4/5 of the total cache size)
-+(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever
-+is larger; otherwise, as large as possible or needed within the cache-size,
-+while permitting the requested or the minimal refcount cache size)
- @item refcount-cache-size
- The maximum size of the refcount block cache in bytes
--(default: 1/5 of the total cache size)
-+(default: 4 times the cluster size; or if cache-size is specified, the part of
-+it which is not used for the L2 cache)
- @item cache-clean-interval
- Clean unused entries in the L2 and refcount caches. The interval is in seconds.
---
-.13.6

-[Qemu-devel] [PULL 12/23] include: Add a lookup table of sizes
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-Adding a lookup table for the powers of two, with the appropriate size
-prefixes. This is needed when a size has to be stringified, in which
-case something like '(1 * KiB)' would become a literal '(1 * (1L << 10))'
-string. Powers of two are used very often for sizes, so such a table
-will also make it easier and more intuitive to write them.
-This table is generatred using the following AWK script:
-BEGIN {
-    suffix="KMGTPE";
-    for(i=10; i<64; i++) {
-        val=2**i;
-        s=substr(suffix, int(i/10), 1);
-        n=2**(i%10);
-        pad=21-int(log(n)/log(10));
-        printf("#define S_%d%siB %*d\n", n, s, pad, val);
-    }
-}
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- include/qemu/units.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
-file changed, 55 insertions(+)
-diff --git a/include/qemu/units.h b/include/qemu/units.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/qemu/units.h
-+++ b/include/qemu/units.h
-@@ -XXX,XX +XXX,XX @@
- #define PiB     (INT64_C(1) << 50)
- #define EiB     (INT64_C(1) << 60)
-+#define S_1KiB                  1024
-+#define S_2KiB                  2048
-+#define S_4KiB                  4096
-+#define S_8KiB                  8192
-+#define S_16KiB                16384
-+#define S_32KiB                32768
-+#define S_64KiB                65536
-+#define S_128KiB              131072
-+#define S_256KiB              262144
-+#define S_512KiB              524288
-+#define S_1MiB               1048576
-+#define S_2MiB               2097152
-+#define S_4MiB               4194304
-+#define S_8MiB               8388608
-+#define S_16MiB             16777216
-+#define S_32MiB             33554432
-+#define S_64MiB             67108864
-+#define S_128MiB           134217728
-+#define S_256MiB           268435456
-+#define S_512MiB           536870912
-+#define S_1GiB            1073741824
-+#define S_2GiB            2147483648
-+#define S_4GiB            4294967296
-+#define S_8GiB            8589934592
-+#define S_16GiB          17179869184
-+#define S_32GiB          34359738368
-+#define S_64GiB          68719476736
-+#define S_128GiB        137438953472
-+#define S_256GiB        274877906944
-+#define S_512GiB        549755813888
-+#define S_1TiB         1099511627776
-+#define S_2TiB         2199023255552
-+#define S_4TiB         4398046511104
-+#define S_8TiB         8796093022208
-+#define S_16TiB       17592186044416
-+#define S_32TiB       35184372088832
-+#define S_64TiB       70368744177664
-+#define S_128TiB     140737488355328
-+#define S_256TiB     281474976710656
-+#define S_512TiB     562949953421312
-+#define S_1PiB      1125899906842624
-+#define S_2PiB      2251799813685248
-+#define S_4PiB      4503599627370496
-+#define S_8PiB      9007199254740992
-+#define S_16PiB    18014398509481984
-+#define S_32PiB    36028797018963968
-+#define S_64PiB    72057594037927936
-+#define S_128PiB  144115188075855872
-+#define S_256PiB  288230376151711744
-+#define S_512PiB  576460752303423488
-+#define S_1EiB   1152921504606846976
-+#define S_2EiB   2305843009213693952
-+#define S_4EiB   4611686018427387904
-+#define S_8EiB   9223372036854775808
-+
- #endif
---
-.13.6

-[Qemu-devel] [PULL 13/23] qcow2: Make sizes more humanly readable
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.h | 9 +++++----
- block/qcow2.c | 2 +-
-files changed, 6 insertions(+), 5 deletions(-)
-diff --git a/block/qcow2.h b/block/qcow2.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.h
-+++ b/block/qcow2.h
-@@ -XXX,XX +XXX,XX @@
- #include "crypto/block.h"
- #include "qemu/coroutine.h"
-+#include "qemu/units.h"
- //#define DEBUG_ALLOC
- //#define DEBUG_ALLOC2
-@@ -XXX,XX +XXX,XX @@
- /* 8 MB refcount table is enough for 2 PB images at 64k cluster size
-  * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
--#define QCOW_MAX_REFTABLE_SIZE 0x800000
-+#define QCOW_MAX_REFTABLE_SIZE S_8MiB
- /* 32 MB L1 table is enough for 2 PB images at 64k cluster size
-  * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
--#define QCOW_MAX_L1_SIZE 0x2000000
-+#define QCOW_MAX_L1_SIZE S_32MiB
- /* Allow for an average of 1k per snapshot table entry, should be plenty of
-  * space for snapshot names and IDs */
-@@ -XXX,XX +XXX,XX @@
- /* Whichever is more */
- #define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */
--#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */
-+#define DEFAULT_L2_CACHE_SIZE S_1MiB
--#define DEFAULT_CLUSTER_SIZE 65536
-+#define DEFAULT_CLUSTER_SIZE S_64KiB
- #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
-         }
-     } else {
-         if (!l2_cache_size_set) {
--            *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE,
-+            *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE,
-                                  (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
-                                  * s->cluster_size);
-         }
---
-.13.6

-[Qemu-devel] [PULL 14/23] qcow2: Avoid duplication in setting the refcount cache size
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-The refcount cache size does not need to be set to its minimum value in
-read_cache_sizes(), as it is set to at least its minimum value in
-qcow2_update_options_prepare().
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 5 ++---
-file changed, 2 insertions(+), 3 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
-                                  (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
-                                  * s->cluster_size);
-         }
--        if (!refcount_cache_size_set) {
--            *refcount_cache_size = min_refcount_cache;
--        }
-     }
-+    /* l2_cache_size and refcount_cache_size are ensured to have at least
-+     * their minimum values in qcow2_update_options_prepare() */
-     if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
-         *l2_cache_entry_size > s->cluster_size ||
---
-.13.6

-[Qemu-devel] [PULL 15/23] qcow2: Assign the L2 cache relatively to the image size
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-Sufficient L2 cache can noticeably improve the performance when using
-large images with frequent I/O.
-Previously, unless 'cache-size' was specified and was large enough, the
-L2 cache was set to a certain size without taking the virtual image size
-into account.
-Now, the L2 cache assignment is aware of the virtual size of the image,
-and will cover the entire image, unless the cache size needed for that is
-larger than a certain maximum. This maximum is set to 1 MB by default
-(enough to cover an 8 GB image with the default cluster size) but can
-be increased or decreased using the 'l2-cache-size' option. This option
-was previously documented as the *maximum* L2 cache size, and this patch
-makes it behave as such, instead of as a constant size. Also, the
-existing option 'cache-size' can limit the sum of both L2 and refcount
-caches, as previously.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- docs/qcow2-cache.txt       | 15 ++++++++++-----
- block/qcow2.h              |  4 +---
- block/qcow2.c              | 21 +++++++++------------
- qemu-options.hx            |  6 +++---
- tests/qemu-iotests/137     |  8 +++++++-
- tests/qemu-iotests/137.out |  4 +++-
-files changed, 33 insertions(+), 25 deletions(-)
-diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
-index XXXXXXX..XXXXXXX 100644
---- a/docs/qcow2-cache.txt
-+++ b/docs/qcow2-cache.txt
-@@ -XXX,XX +XXX,XX @@ There are a few things that need to be taken into account:
-  - Both caches must have a size that is a multiple of the cluster size
-    (or the cache entry size: see "Using smaller cache sizes" below).
-- - The default L2 cache size is 8 clusters or 1MB (whichever is more),
--   and the minimum is 2 clusters (or 2 cache entries, see below).
-+ - The maximum L2 cache size is 1 MB by default (enough for full coverage
-+   of 8 GB images, with the default cluster size). This value can be
-+   modified using the "l2-cache-size" option. QEMU will not use more memory
-+   than needed to hold all of the image's L2 tables, regardless of this max.
-+   value. The minimal L2 cache size is 2 clusters (or 2 cache entries, see
-+   below).
-  - The default (and minimum) refcount cache size is 4 clusters.
-@@ -XXX,XX +XXX,XX @@ Some things to take into account:
-    always uses the cluster size as the entry size.
-  - If the L2 cache is big enough to hold all of the image's L2 tables
--   (as explained in the "Choosing the right cache sizes" section
--   earlier in this document) then none of this is necessary and you
--   can omit the "l2-cache-entry-size" parameter altogether.
-+   (as explained in the "Choosing the right cache sizes" and "How to
-+   configure the cache sizes" sections in this document) then none of
-+   this is necessary and you can omit the "l2-cache-entry-size"
-+   parameter altogether.
- Reducing the memory usage
-diff --git a/block/qcow2.h b/block/qcow2.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.h
-+++ b/block/qcow2.h
-@@ -XXX,XX +XXX,XX @@
- /* Must be at least 4 to cover all cases of refcount table growth */
- #define MIN_REFCOUNT_CACHE_SIZE 4 /* clusters */
--/* Whichever is more */
--#define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */
--#define DEFAULT_L2_CACHE_SIZE S_1MiB
-+#define DEFAULT_L2_CACHE_MAX_SIZE S_1MiB
- #define DEFAULT_CLUSTER_SIZE S_64KiB
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
-                              uint64_t *refcount_cache_size, Error **errp)
- {
-     BDRVQcow2State *s = bs->opaque;
--    uint64_t combined_cache_size;
-+    uint64_t combined_cache_size, l2_cache_max_setting;
-     bool l2_cache_size_set, refcount_cache_size_set, combined_cache_size_set;
-     int min_refcount_cache = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;
-+    uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
-+    uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);
-     combined_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_CACHE_SIZE);
-     l2_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_SIZE);
-     refcount_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_REFCOUNT_CACHE_SIZE);
-     combined_cache_size = qemu_opt_get_size(opts, QCOW2_OPT_CACHE_SIZE, 0);
--    *l2_cache_size = qemu_opt_get_size(opts, QCOW2_OPT_L2_CACHE_SIZE, 0);
-+    l2_cache_max_setting = qemu_opt_get_size(opts, QCOW2_OPT_L2_CACHE_SIZE,
-+                                             DEFAULT_L2_CACHE_MAX_SIZE);
-     *refcount_cache_size = qemu_opt_get_size(opts,
-                                              QCOW2_OPT_REFCOUNT_CACHE_SIZE, 0);
-     *l2_cache_entry_size = qemu_opt_get_size(
-         opts, QCOW2_OPT_L2_CACHE_ENTRY_SIZE, s->cluster_size);
-+    *l2_cache_size = MIN(max_l2_cache, l2_cache_max_setting);
-+
-     if (combined_cache_size_set) {
-         if (l2_cache_size_set && refcount_cache_size_set) {
-             error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE
-                        " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be set "
-                        "at the same time");
-             return;
--        } else if (*l2_cache_size > combined_cache_size) {
-+        } else if (l2_cache_size_set &&
-+                   (l2_cache_max_setting > combined_cache_size)) {
-             error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed "
-                        QCOW2_OPT_CACHE_SIZE);
-             return;
-@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
-         } else if (refcount_cache_size_set) {
-             *l2_cache_size = combined_cache_size - *refcount_cache_size;
-         } else {
--            uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
--            uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);
--
-             /* Assign as much memory as possible to the L2 cache, and
-              * use the remainder for the refcount cache */
-             if (combined_cache_size >= max_l2_cache + min_refcount_cache) {
-@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
-                 *l2_cache_size = combined_cache_size - *refcount_cache_size;
-             }
-         }
--    } else {
--        if (!l2_cache_size_set) {
--            *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE,
--                                 (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
--                                 * s->cluster_size);
--        }
-     }
-     /* l2_cache_size and refcount_cache_size are ensured to have at least
-      * their minimum values in qcow2_update_options_prepare() */
-diff --git a/qemu-options.hx b/qemu-options.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -XXX,XX +XXX,XX @@ The maximum total size of the L2 table and refcount block caches in bytes
- @item l2-cache-size
- The maximum size of the L2 table cache in bytes
--(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever
--is larger; otherwise, as large as possible or needed within the cache-size,
--while permitting the requested or the minimal refcount cache size)
-+(default: if cache-size is not specified - 1M; otherwise, as large as possible
-+within the cache-size, while permitting the requested or the minimal refcount
-+cache size)
- @item refcount-cache-size
- The maximum size of the refcount block cache in bytes
-diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/137
-+++ b/tests/qemu-iotests/137
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
-     -c "reopen -o cache-size=1M,l2-cache-size=64k,refcount-cache-size=64k" \
-     -c "reopen -o cache-size=1M,l2-cache-size=2M" \
-     -c "reopen -o cache-size=1M,refcount-cache-size=2M" \
--    -c "reopen -o l2-cache-size=256T" \
-     -c "reopen -o l2-cache-entry-size=33k" \
-     -c "reopen -o l2-cache-entry-size=128k" \
-     -c "reopen -o refcount-cache-size=256T" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
-     -c "reopen -o cache-clean-interval=-1" \
-     "$TEST_IMG" | _filter_qemu_io
-+IMGOPTS="cluster_size=256k" _make_test_img 32P
-+$QEMU_IO \
-+    -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
-+    "$TEST_IMG" | _filter_qemu_io
-+
-+_make_test_img 64M
-+
- echo
- echo === Test transaction semantics ===
- echo
-diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/137.out
-+++ b/tests/qemu-iotests/137.out
-@@ -XXX,XX +XXX,XX @@ Parameter 'lazy-refcounts' expects 'on' or 'off'
- cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
- l2-cache-size may not exceed cache-size
- refcount-cache-size may not exceed cache-size
--L2 cache size too big
- L2 cache entry size must be a power of two between 512 and the cluster size (65536)
- L2 cache entry size must be a power of two between 512 and the cluster size (65536)
- Refcount cache size too big
-@@ -XXX,XX +XXX,XX @@ Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-c
- Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
- Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
- Cache clean interval too big
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
-+L2 cache size too big
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- === Test transaction semantics ===
---
-.13.6

-[Qemu-devel] [PULL 16/23] qcow2: Increase the default upper limit on the L2 cache size
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-The upper limit on the L2 cache size is increased from 1 MB to 32 MB
-on Linux platforms, and to 8 MB on other platforms (this difference is
-caused by the ability to set intervals for cache cleaning on Linux
-platforms only).
-This is done in order to allow default full coverage with the L2 cache
-for images of up to 256 GB in size (was 8 GB). Note, that only the
-needed amount to cover the full image is allocated. The value which is
-changed here is just the upper limit on the L2 cache size, beyond which
-it will not grow, even if the size of the image will require it to.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- docs/qcow2-cache.txt | 15 +++++++++------
- block/qcow2.h        |  6 +++++-
- qemu-options.hx      |  6 +++---
-files changed, 17 insertions(+), 10 deletions(-)
-diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
-index XXXXXXX..XXXXXXX 100644
---- a/docs/qcow2-cache.txt
-+++ b/docs/qcow2-cache.txt
-@@ -XXX,XX +XXX,XX @@ There are a few things that need to be taken into account:
-  - Both caches must have a size that is a multiple of the cluster size
-    (or the cache entry size: see "Using smaller cache sizes" below).
-- - The maximum L2 cache size is 1 MB by default (enough for full coverage
--   of 8 GB images, with the default cluster size). This value can be
--   modified using the "l2-cache-size" option. QEMU will not use more memory
--   than needed to hold all of the image's L2 tables, regardless of this max.
--   value. The minimal L2 cache size is 2 clusters (or 2 cache entries, see
--   below).
-+ - The maximum L2 cache size is 32 MB by default on Linux platforms (enough
-+   for full coverage of 256 GB images, with the default cluster size). This
-+   value can be modified using the "l2-cache-size" option. QEMU will not use
-+   more memory than needed to hold all of the image's L2 tables, regardless
-+   of this max. value.
-+   On non-Linux platforms the maximal value is smaller by default (8 MB) and
-+   this difference stems from the fact that on Linux the cache can be cleared
-+   periodically if needed, using the "cache-clean-interval" option (see below).
-+   The minimal L2 cache size is 2 clusters (or 2 cache entries, see below).
-  - The default (and minimum) refcount cache size is 4 clusters.
-diff --git a/block/qcow2.h b/block/qcow2.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.h
-+++ b/block/qcow2.h
-@@ -XXX,XX +XXX,XX @@
- /* Must be at least 4 to cover all cases of refcount table growth */
- #define MIN_REFCOUNT_CACHE_SIZE 4 /* clusters */
--#define DEFAULT_L2_CACHE_MAX_SIZE S_1MiB
-+#ifdef CONFIG_LINUX
-+#define DEFAULT_L2_CACHE_MAX_SIZE S_32MiB
-+#else
-+#define DEFAULT_L2_CACHE_MAX_SIZE S_8MiB
-+#endif
- #define DEFAULT_CLUSTER_SIZE S_64KiB
-diff --git a/qemu-options.hx b/qemu-options.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -XXX,XX +XXX,XX @@ The maximum total size of the L2 table and refcount block caches in bytes
- @item l2-cache-size
- The maximum size of the L2 table cache in bytes
--(default: if cache-size is not specified - 1M; otherwise, as large as possible
--within the cache-size, while permitting the requested or the minimal refcount
--cache size)
-+(default: if cache-size is not specified - 32M on Linux platforms, and 8M on
-+non-Linux platforms; otherwise, as large as possible within the cache-size,
-+while permitting the requested or the minimal refcount cache size)
- @item refcount-cache-size
- The maximum size of the refcount block cache in bytes
---
-.13.6

-[Qemu-devel] [PULL 17/23] qcow2: Resize the cache upon image resizing
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-The caches are now recalculated upon image resizing. This is done
-because the new default behavior of assigning L2 cache relatively to
-the image size, implies that the cache will be adapted accordingly
-after an image resize.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 11 +++++++++++
-file changed, 11 insertions(+)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-     uint64_t old_length;
-     int64_t new_l1_size;
-     int ret;
-+    QDict *options;
-     if (prealloc != PREALLOC_MODE_OFF && prealloc != PREALLOC_MODE_METADATA &&
-         prealloc != PREALLOC_MODE_FALLOC && prealloc != PREALLOC_MODE_FULL)
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         }
-     }
-+    bs->total_sectors = offset / BDRV_SECTOR_SIZE;
-+
-     /* write updated header.size */
-     offset = cpu_to_be64(offset);
-     ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-     }
-     s->l1_vm_state_index = new_l1_size;
-+
-+    /* Update cache sizes */
-+    options = qdict_clone_shallow(bs->options);
-+    ret = qcow2_update_options(bs, options, s->flags, errp);
-+    qobject_unref(options);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-     ret = 0;
- fail:
-     qemu_co_mutex_unlock(&s->lock);
---
-.13.6

-[Qemu-devel] [PULL 18/23] qcow2: Set the default cache-clean-interval to 10 minutes
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-The default cache-clean-interval is set to 10 minutes, in order to lower
-the overhead of the qcow2 caches (before the default was 0, i.e.
-disabled).
-* For non-Linux platforms the default is kept at 0, because
-  cache-clean-interval is not supported there yet.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qapi/block-core.json | 3 ++-
- docs/qcow2-cache.txt | 4 ++--
- block/qcow2.h        | 4 +++-
- block/qcow2.c        | 2 +-
- qemu-options.hx      | 2 +-
-files changed, 9 insertions(+), 6 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@
- #
- # @cache-clean-interval:  clean unused entries in the L2 and refcount
- #                         caches. The interval is in seconds. The default value
--#                         is 0 and it disables this feature (since 2.5)
-+#                         is 600, and 0 disables this feature. (since 2.5)
-+#
- # @encrypt:               Image decryption options. Mandatory for
- #                         encrypted images, except when doing a metadata-only
- #                         probe of the image. (since 2.10)
-diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
-index XXXXXXX..XXXXXXX 100644
---- a/docs/qcow2-cache.txt
-+++ b/docs/qcow2-cache.txt
-@@ -XXX,XX +XXX,XX @@ This example removes all unused cache entries every 15 minutes:
-    -drive file=hd.qcow2,cache-clean-interval=900
--If unset, the default value for this parameter is 0 and it disables
--this feature.
-+If unset, the default value for this parameter is 600. Setting it to 0
-+disables this feature.
- Note that this functionality currently relies on the MADV_DONTNEED
- argument for madvise() to actually free the memory. This is a
-diff --git a/block/qcow2.h b/block/qcow2.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.h
-+++ b/block/qcow2.h
-@@ -XXX,XX +XXX,XX @@
- #ifdef CONFIG_LINUX
- #define DEFAULT_L2_CACHE_MAX_SIZE S_32MiB
-+#define DEFAULT_CACHE_CLEAN_INTERVAL 600  /* seconds */
- #else
- #define DEFAULT_L2_CACHE_MAX_SIZE S_8MiB
-+/* Cache clean interval is currently available only on Linux, so must be 0 */
-+#define DEFAULT_CACHE_CLEAN_INTERVAL 0
- #endif
- #define DEFAULT_CLUSTER_SIZE S_64KiB
--
- #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
- #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"
- #define QCOW2_OPT_DISCARD_SNAPSHOT "pass-discard-snapshot"
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
-     /* New interval for cache cleanup timer */
-     r->cache_clean_interval =
-         qemu_opt_get_number(opts, QCOW2_OPT_CACHE_CLEAN_INTERVAL,
--                            s->cache_clean_interval);
-+                            DEFAULT_CACHE_CLEAN_INTERVAL);
- #ifndef CONFIG_LINUX
-     if (r->cache_clean_interval != 0) {
-         error_setg(errp, QCOW2_OPT_CACHE_CLEAN_INTERVAL
-diff --git a/qemu-options.hx b/qemu-options.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -XXX,XX +XXX,XX @@ it which is not used for the L2 cache)
- @item cache-clean-interval
- Clean unused entries in the L2 and refcount caches. The interval is in seconds.
--The default value is 0 and it disables this feature.
-+The default value is 600. Setting it to 0 disables this feature.
- @item pass-discard-request
- Whether discard requests to the qcow2 device should be forwarded to the data
---
-.13.6

-[Qemu-devel] [PULL 19/23] qcow2: Explicit number replaced by a constant
+Deleted patch
-From: Leonid Bloch <lbloch@janustech.com>
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
-     /* 2^(s->refcount_order - 3) is the refcount width in bytes */
-     s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3);
-     s->refcount_block_size = 1 << s->refcount_block_bits;
--    bs->total_sectors = header.size / 512;
-+    bs->total_sectors = header.size / BDRV_SECTOR_SIZE;
-     s->csize_shift = (62 - (s->cluster_bits - 8));
-     s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
-     s->cluster_offset_mask = (1LL << s->csize_shift) - 1;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         goto fail;
-     }
--    old_length = bs->total_sectors * 512;
-+    old_length = bs->total_sectors * BDRV_SECTOR_SIZE;
-     new_l1_size = size_to_l1(s, offset);
-     if (offset < old_length) {
---
-.13.6

-[Qemu-devel] [PULL 20/23] block-backend: Set werror/rerror defaults in blk_new()
+Deleted patch
-Currently, the default values for werror and rerror have to be set
-explicitly with blk_set_on_error() by the callers of blk_new(). The only
-caller actually doing this is blockdev_init(), which is called for
-BlockBackends created using -drive.
-In particular, anonymous BlockBackends created with
--device ...,drive=<node-name> didn't get the correct default set and
-instead defaulted to the integer value 0 (= BLOCKDEV_ON_ERROR_REPORT).
-This is the intended default for rerror anyway, but the default for
-werror should be BLOCKDEV_ON_ERROR_ENOSPC.
-Set the defaults in blk_new() instead so that they apply no matter what
-way the BlockBackend was created.
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
----
- block/block-backend.c      | 3 +++
- tests/qemu-iotests/067.out | 1 +
-files changed, 4 insertions(+)
-diff --git a/block/block-backend.c b/block/block-backend.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/block-backend.c
-+++ b/block/block-backend.c
-@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm)
-     blk->shared_perm = shared_perm;
-     blk_set_enable_write_cache(blk, true);
-+    blk->on_read_error = BLOCKDEV_ON_ERROR_REPORT;
-+    blk->on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
-+
-     block_acct_init(&blk->stats);
-     notifier_list_init(&blk->remove_bs_notifiers);
-diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/067.out
-+++ b/tests/qemu-iotests/067.out
-@@ -XXX,XX +XXX,XX @@ Testing: -device virtio-scsi -device scsi-cd,id=cd0
- {
-     "return": [
-         {
-+            "io-status": "ok",
-             "device": "",
-             "locked": false,
-             "removable": true,
---
-.13.6

-[Qemu-devel] [PULL 22/23] test-replication: Lock AioContext around blk_unref()
+[PULL 1/3] block: Lock AioContext for drain_end in blockdev-reopen
-Recently, the test case has started failing because some job related
+bdrv_subtree_drained_end() requires the caller to hold the AioContext
-functions want to drop the AioContext lock even though it hasn't been
+lock for the drained node. Not doing this for nodes outside of the main
-taken:
+AioContext leads to crashes when AIO_WAIT_WHILE() needs to wait and
 tries to temporarily release the lock.
-    (gdb) bt
+Fixes: 3908b7a8994fa5ef7a89aa58cd5a02fc58141592
-    #0  0x00007f51c067c9fb in raise () from /lib64/libc.so.6
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2046659
-    #1  0x00007f51c067e77d in abort () from /lib64/libc.so.6
+Reported-by: Qing Wang <qinwang@redhat.com>
-    #2  0x0000558c9d5dde7b in error_exit (err=<optimized out>, msg=msg@entry=0x558c9d6fe120 <__func__.18373> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-    #3  0x0000558c9d6b5263 in qemu_mutex_unlock_impl (mutex=mutex@entry=0x558c9f3999a0, file=file@entry=0x558c9d6fd36f "util/async.c", line=line@entry=516) at util/qemu-thread-posix.c:96
+Message-Id: <20220203140534.36522-2-kwolf@redhat.com>
-    #4  0x0000558c9d6b0565 in aio_context_release (ctx=ctx@entry=0x558c9f399940) at util/async.c:516
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
     #5  0x0000558c9d5eb3da in job_completed_txn_abort (job=0x558c9f68e640) at job.c:738
     #6  0x0000558c9d5eb227 in job_finish_sync (job=0x558c9f68e640, finish=finish@entry=0x558c9d5eb8d0 <job_cancel_err>, errp=errp@entry=0x0) at job.c:986
     #7  0x0000558c9d5eb8ee in job_cancel_sync (job=<optimized out>) at job.c:941
     #8  0x0000558c9d64d853 in replication_close (bs=<optimized out>) at block/replication.c:148
     #9  0x0000558c9d5e5c9f in bdrv_close (bs=0x558c9f41b020) at block.c:3420
     #10 bdrv_delete (bs=0x558c9f41b020) at block.c:3629
     #11 bdrv_unref (bs=0x558c9f41b020) at block.c:4685
     #12 0x0000558c9d62a3f3 in blk_remove_bs (blk=blk@entry=0x558c9f42a7c0) at block/block-backend.c:783
     #13 0x0000558c9d62a667 in blk_delete (blk=0x558c9f42a7c0) at block/block-backend.c:402
     #14 blk_unref (blk=0x558c9f42a7c0) at block/block-backend.c:457
     #15 0x0000558c9d5dfcea in test_secondary_stop () at tests/test-replication.c:478
     #16 0x00007f51c1f13178 in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
     #17 0x00007f51c1f1337b in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
     #18 0x00007f51c1f1337b in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
     #19 0x00007f51c1f13552 in g_test_run_suite () from /lib64/libglib-2.0.so.0
     #20 0x00007f51c1f13571 in g_test_run () from /lib64/libglib-2.0.so.0
     #21 0x0000558c9d5de31f in main (argc=<optimized out>, argv=<optimized out>) at tests/test-replication.c:581
 It is yet unclear whether this should really be considered a bug in the
 test case or whether blk_unref() should work for callers that haven't
 taken the AioContext lock, but in order to fix the build tests quickly,
 just take the AioContext lock around blk_unref().
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/test-replication.c | 11 +++++++++++
+ blockdev.c | 11 ++++++++++-
-file changed, 11 insertions(+)
+file changed, 10 insertions(+), 1 deletion(-)
-diff --git a/tests/test-replication.c b/tests/test-replication.c
+diff --git a/blockdev.c b/blockdev.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/test-replication.c
+--- a/blockdev.c
-+++ b/tests/test-replication.c
++++ b/blockdev.c
-@@ -XXX,XX +XXX,XX @@ static BlockBackend *start_primary(void)
+@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
  static void teardown_primary(void)
  {
-     BlockBackend *blk;
+     BlockReopenQueue *queue = NULL;
-+    AioContext *ctx;
+     GSList *drained = NULL;
++    GSList *p;
-     /* remove P_ID */
-     blk = blk_by_name(P_ID);
+     /* Add each one of the BDS that we want to reopen to the queue */
-     assert(blk);
+     for (; reopen_list != NULL; reopen_list = reopen_list->next) {
+@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
-+    ctx = blk_get_aio_context(blk);
-+    aio_context_acquire(ctx);
+ fail:
-     monitor_remove_blk(blk);
+     bdrv_reopen_queue_free(queue);
-     blk_unref(blk);
+-    g_slist_free_full(drained, (GDestroyNotify) bdrv_subtree_drained_end);
-+    aio_context_release(ctx);
++    for (p = drained; p; p = p->next) {
 +        BlockDriverState *bs = p->data;
 +        AioContext *ctx = bdrv_get_aio_context(bs);
 +
 +        aio_context_acquire(ctx);
 +        bdrv_subtree_drained_end(bs);
 +        aio_context_release(ctx);
 +    }
 +    g_slist_free(drained);
  }
- static void test_primary_read(void)
+ void qmp_blockdev_del(const char *node_name, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void teardown_secondary(void)
  {
      /* only need to destroy two BBs */
      BlockBackend *blk;
 +    AioContext *ctx;
      /* remove S_LOCAL_DISK_ID */
      blk = blk_by_name(S_LOCAL_DISK_ID);
      assert(blk);
 +    ctx = blk_get_aio_context(blk);
 +    aio_context_acquire(ctx);
      monitor_remove_blk(blk);
      blk_unref(blk);
 +    aio_context_release(ctx);
      /* remove S_ID */
      blk = blk_by_name(S_ID);
      assert(blk);
 +    ctx = blk_get_aio_context(blk);
 +    aio_context_acquire(ctx);
      monitor_remove_blk(blk);
      blk_unref(blk);
 +    aio_context_release(ctx);
  }
  static void test_secondary_read(void)
 --
-.13.6
+.34.1

-[Qemu-devel] [PULL 23/23] tests/test-bdrv-drain: Fix too late qemu_event_reset()
+[PULL 2/3] iotests: Test blockdev-reopen with iothreads and throttling
-qemu_event_reset() must be called before the AIO request in a different
+The 'throttle' block driver implements .bdrv_co_drain_end, so
-iothread is submitted. Otherwise the request could be completed before
+blockdev-reopen will have to wait for it to complete in the polling
-we do the qemu_event_reset() and the test would hang in
+loop at the end of qmp_blockdev_reopen(). This makes AIO_WAIT_WHILE()
-qemu_event_wait().
+release the AioContext lock, which causes a crash if the lock hasn't
 correctly been taken.
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20220203140534.36522-3-kwolf@redhat.com>
-Tested-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/test-bdrv-drain.c | 4 ++--
+ tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
-file changed, 2 insertions(+), 2 deletions(-)
+ tests/qemu-iotests/245.out |  4 ++--
 files changed, 35 insertions(+), 5 deletions(-)
-diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
+diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/245
 +++ b/tests/qemu-iotests/245
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
          self.assertEqual(self.get_node('hd1'), None)
          self.assert_qmp(self.get_node('hd2'), 'ro', True)
 -    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None):
 -        opts = hd_opts(0)
 +    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None,
 +                           opts_a = None, opts_b = None):
 +        opts = opts_a or hd_opts(0)
          result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
          self.assert_qmp(result, 'return', {})
 -        opts2 = hd_opts(2)
 +        opts2 = opts_b or hd_opts(2)
          result = self.vm.qmp('blockdev-add', conv_keys = False, **opts2)
          self.assert_qmp(result, 'return', {})
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
      def test_iothreads_switch_overlay(self):
          self.run_test_iothreads('', 'iothread0')
 +    def test_iothreads_with_throttling(self):
 +        # Create a throttle-group object
 +        opts = { 'qom-type': 'throttle-group', 'id': 'group0',
 +                 'limits': { 'iops-total': 1000 } }
 +        result = self.vm.qmp('object-add', conv_keys = False, **opts)
 +        self.assert_qmp(result, 'return', {})
 +
 +        # Options with a throttle filter between format and protocol
 +        opts = [
 +            {
 +                'driver': iotests.imgfmt,
 +                'node-name': f'hd{idx}',
 +                'file' : {
 +                    'node-name': f'hd{idx}-throttle',
 +                    'driver': 'throttle',
 +                    'throttle-group': 'group0',
 +                    'file': {
 +                        'driver': 'file',
 +                        'node-name': f'hd{idx}-file',
 +                        'filename': hd_path[idx],
 +                    },
 +                },
 +            }
 +            for idx in (0, 2)
 +        ]
 +
 +        self.run_test_iothreads('iothread0', 'iothread0', None,
 +                                opts[0], opts[1])
 +
  if __name__ == '__main__':
      iotests.activate_logging()
      iotests.main(supported_fmts=["qcow2"],
 diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/test-bdrv-drain.c
+--- a/tests/qemu-iotests/245.out
-+++ b/tests/test-bdrv-drain.c
++++ b/tests/qemu-iotests/245.out
-@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
+@@ -XXX,XX +XXX,XX @@ read 1/1 bytes at offset 262152
-     s->bh_indirection_ctx = ctx_b;
+ read 1/1 bytes at offset 262160
+bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-     aio_ret = -EINPROGRESS;
-+    qemu_event_reset(&done_event);
+-...............
-+
++................
-     if (drain_thread == 0) {
+ ----------------------------------------------------------------------
-         acb = blk_aio_preadv(blk, 0, &qiov, 0, test_iothread_aio_cb, &aio_ret);
+-Ran 25 tests
-     } else {
++Ran 26 tests
-@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
-          * but the drain in this thread can continue immediately after
+ OK
           * bdrv_dec_in_flight() and aio_ret might be assigned only slightly
           * later. */
 -        qemu_event_reset(&done_event);
          do_drain_begin(drain_type, bs);
          g_assert_cmpint(bs->in_flight, ==, 0);
@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
          }
          break;
      case 1:
 -        qemu_event_reset(&done_event);
          aio_bh_schedule_oneshot(ctx_a, test_iothread_drain_entry, &data);
          qemu_event_wait(&done_event);
          break;
 --
-.13.6
+.34.1

-[Qemu-devel] [PULL 21/23] qcow2: Fix cache-clean-interval documentation
+[PULL 3/3] hw/block/fdc-isa: Respect QOM properties when building AML
-From: Leonid Bloch <lbloch@janustech.com>
+From: Bernhard Beschow <shentey@gmail.com>
-Fixing cache-clean-interval documentation following the recent change to
+Other ISA devices such as serial-isa use the properties in their
-a default of 600 seconds on supported plarforms (only Linux currently).
+build_aml functions. fdc-isa not using them is probably an oversight.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
+Signed-off-by: Bernhard Beschow <shentey@gmail.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Message-Id: <20220209191558.30393-1-shentey@gmail.com>
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- qapi/block-core.json |  3 ++-
+ hw/block/fdc-isa.c | 11 +++++++----
- docs/qcow2-cache.txt | 20 ++++++++++----------
+file changed, 7 insertions(+), 4 deletions(-)
  qemu-options.hx      |  3 ++-
 files changed, 14 insertions(+), 12 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/block/fdc-isa.c
-+++ b/qapi/block-core.json
++++ b/hw/block/fdc-isa.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)
- #
- # @cache-clean-interval:  clean unused entries in the L2 and refcount
+ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
- #                         caches. The interval is in seconds. The default value
+ {
--#                         is 600, and 0 disables this feature. (since 2.5)
++    FDCtrlISABus *isa = ISA_FDC(isadev);
-+#                         is 600 on supporting platforms, and 0 on other
+     Aml *dev;
-+#                         platforms. 0 disables this feature. (since 2.5)
+     Aml *crs;
- #
+     int i;
- # @encrypt:               Image decryption options. Mandatory for
+@@ -XXX,XX +XXX,XX @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
- #                         encrypted images, except when doing a metadata-only
+     };
-diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
-index XXXXXXX..XXXXXXX 100644
+     crs = aml_resource_template();
---- a/docs/qcow2-cache.txt
+-    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));
-+++ b/docs/qcow2-cache.txt
+-    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));
-@@ -XXX,XX +XXX,XX @@ Reducing the memory usage
+-    aml_append(crs, aml_irq_no_flags(6));
- It is possible to clean unused cache entries in order to reduce the
+     aml_append(crs,
- memory usage during periods of low I/O activity.
+-        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));
++        aml_io(AML_DECODE16, isa->iobase + 2, isa->iobase + 2, 0x00, 0x04));
--The parameter "cache-clean-interval" defines an interval (in seconds).
++    aml_append(crs,
--All cache entries that haven't been accessed during that interval are
++        aml_io(AML_DECODE16, isa->iobase + 7, isa->iobase + 7, 0x00, 0x01));
--removed from memory.
++    aml_append(crs, aml_irq_no_flags(isa->irq));
-+The parameter "cache-clean-interval" defines an interval (in seconds),
++    aml_append(crs,
-+after which all the cache entries that haven't been accessed during the
++        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, isa->dma));
-+interval are removed from memory. Setting this parameter to 0 disables this
-+feature.
+     dev = aml_device("FDC0");
+     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));
 -This example removes all unused cache entries every 15 minutes:
 +The following example removes all unused cache entries every 15 minutes:
     -drive file=hd.qcow2,cache-clean-interval=900
 -If unset, the default value for this parameter is 600. Setting it to 0
 -disables this feature.
 +If unset, the default value for this parameter is 600 on platforms which
 +support this functionality, and is 0 (disabled) on other platforms.
 -Note that this functionality currently relies on the MADV_DONTNEED
 -argument for madvise() to actually free the memory. This is a
 -Linux-specific feature, so cache-clean-interval is not supported in
 -other systems.
 +This functionality currently relies on the MADV_DONTNEED argument for
 +madvise() to actually free the memory. This is a Linux-specific feature,
 +so cache-clean-interval is not supported on other systems.
 diff --git a/qemu-options.hx b/qemu-options.hx
 index XXXXXXX..XXXXXXX 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ it which is not used for the L2 cache)
  @item cache-clean-interval
  Clean unused entries in the L2 and refcount caches. The interval is in seconds.
 -The default value is 600. Setting it to 0 disables this feature.
 +The default value is 600 on supporting platforms, and 0 on other platforms.
 +Setting it to 0 disables this feature.
  @item pass-discard-request
  Whether discard requests to the qcow2 device should be forwarded to the data
 --
-.13.6
+.34.1

The following changes since commit 07f426c35eddd79388a23d11cb278600d7e3831d:

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180926' into staging (2018-09-28 18:56:09 +0100)

are available in the git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to dd353157942a59c21da07da5ac8749a871f7c3ed:

tests/test-bdrv-drain: Fix too late qemu_event_reset() (2018-10-01 19:13:55 +0200)

----------------------------------------------------------------
Block layer patches:

- qcow2 cache option default changes (Linux: 32 MB maximum, limited by
  whatever cache size can be made use of with the specific image;
  default cache-clean-interval of 10 minutes)
- reopen: Allow specifying unchanged child node references, and changing
  a few generic options (discard, detect-zeroes)
- Fix werror/rerror defaults for -device drive=<node-name>
- Test case fixes

----------------------------------------------------------------
Alberto Garcia (9):
      qemu-io: Fix writethrough check in reopen
      file-posix: x-check-cache-dropped should default to false on reopen
      block: Remove child references from bs->{options,explicit_options}
      block: Don't look for child references in append_open_options()
      block: Allow child references on reopen
      block: Forbid trying to change unsupported options during reopen
      file-posix: Forbid trying to change unsupported options during reopen
      block: Allow changing 'discard' on reopen
      block: Allow changing 'detect-zeroes' on reopen

Fam Zheng (1):
      file-posix: Include filename in locking error message

Kevin Wolf (3):
      block-backend: Set werror/rerror defaults in blk_new()
      test-replication: Lock AioContext around blk_unref()
      tests/test-bdrv-drain: Fix too late qemu_event_reset()

Leonid Bloch (10):
      qcow2: Options' documentation fixes
      include: Add a lookup table of sizes
      qcow2: Make sizes more humanly readable
      qcow2: Avoid duplication in setting the refcount cache size
      qcow2: Assign the L2 cache relatively to the image size
      qcow2: Increase the default upper limit on the L2 cache size
      qcow2: Resize the cache upon image resizing
      qcow2: Set the default cache-clean-interval to 10 minutes
      qcow2: Explicit number replaced by a constant
      qcow2: Fix cache-clean-interval documentation

From: Fam Zheng <famz@redhat.com>

Image locking errors happening at device initialization time doesn't say
which file cannot be locked, for instance,

-device scsi-disk,drive=drive-1: Failed to get shared "write" lock
    Is another process using the image?

could refer to either the overlay image or its backing image.

Hoist the error_append_hint to the caller of raw_check_lock_bytes where
file name is known, and include it in the error hint.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c         | 10 +++---
 tests/qemu-iotests/153.out | 76 +++++++++++++++++++++++-----------------------
 tests/qemu-iotests/182.out |  2 +-
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,
                            "Failed to get \"%s\" lock",
                            perm_name);
                 g_free(perm_name);
-                error_append_hint(errp,
-                                  "Is another process using the image?\n");
                 return ret;
             }
         }
@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,
                            "Failed to get shared \"%s\" lock",
                            perm_name);
                 g_free(perm_name);
-                error_append_hint(errp,
-                                  "Is another process using the image?\n");
                 return ret;
             }
         }
@@ -XXX,XX +XXX,XX @@ static int raw_handle_perm_lock(BlockDriverState *bs,
             if (!ret) {
                 return 0;
             }
+            error_append_hint(errp,
+                              "Is another process using the image [%s]?\n",
+                              bs->filename);
         }
         op = RAW_PL_ABORT;
         /* fall through to unlock bytes. */
@@ -XXX,XX +XXX,XX @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     /* Step two: Check that nobody else has taken conflicting locks */
     result = raw_check_lock_bytes(fd, perm, shared, errp);
     if (result < 0) {
+        error_append_hint(errp,
+                          "Is another process using the image [%s]?\n",
+                          file_opts->filename);
         goto out_unlock;
     }
 
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t
 
 == Launching another QEMU, opts: '' ==
 QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Launching another QEMU, opts: 'read-only=on' ==
 QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,read-only=on: Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Launching another QEMU, opts: 'read-only=on,force-share=on' ==
 
@@ -XXX,XX +XXX,XX @@ Is another process using the image?
 
 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
 can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
 can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
 _qemu_img_wrapper info TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper check TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper compare TEST_DIR/t.qcow2 TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper map TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper amend -o  TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper commit TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper resize TEST_DIR/t.qcow2 32M
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper convert TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.convert
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper dd if=TEST_DIR/t.qcow2 of=TEST_DIR/t.qcow2.convert bs=512 count=1
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 file format: IMGFMT
 
 == Running utility commands -U ==
@@ -XXX,XX +XXX,XX @@ Try 'qemu-img --help' for more information
 
 _qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t
 
 == Launching another QEMU, opts: '' ==
 QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Launching another QEMU, opts: 'read-only=on' ==
 
@@ -XXX,XX +XXX,XX @@ Is another process using the image?
 
 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
 
 _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper map TEST_DIR/t.qcow2
 
 _qemu_img_wrapper amend -o  TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper commit TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper resize TEST_DIR/t.qcow2 32M
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper rebase TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper snapshot -l TEST_DIR/t.qcow2
 
@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2
 
 _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 file format: IMGFMT
 
 == Running utility commands -U ==
@@ -XXX,XX +XXX,XX @@ Try 'qemu-img --help' for more information
 
 _qemu_img_wrapper rebase -U TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base
 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_img_wrapper snapshot -l -U TEST_DIR/t.qcow2
 
@@ -XXX,XX +XXX,XX @@ Round done
 
 == Two devices with the same image (read-only=off - read-only=off) ==
 QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=off: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Two devices with the same image (read-only=off - read-only=on) ==
 QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=on: Failed to get shared "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Two devices with the same image (read-only=off - read-only=on,force-share=on) ==
 
 == Two devices with the same image (read-only=on - read-only=off) ==
 QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2,read-only=off: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Two devices with the same image (read-only=on - read-only=on) ==
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.c', fmt=IMGFMT size=33554432 backing_file=TEST_DIR
 
 == Backing image also as an active device ==
 QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Backing image also as an active device (ro) ==
 
 == Symbolic link ==
 QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 
 == Active commit to intermediate layer should work when base in use ==
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ Adding drive
 
 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 Creating overlay with qemu-img when the guest is running should be allowed
 
 _qemu_img_wrapper create -f qcow2 -b TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.overlay
@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
 
 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 Closing the other
 
 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/182.out
+++ b/tests/qemu-iotests/182.out
@@ -XXX,XX +XXX,XX @@ Starting QEMU
 
 Starting a second QEMU using the same image should fail
 QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=none,id=drive0,file.locking=on: Failed to get "write" lock
-Is another process using the image?
+Is another process using the image [TEST_DIR/t.qcow2]?
 *** done
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

"qemu-io reopen" doesn't allow changing the writethrough setting of
the cache, but the check is wrong, causing an error even on a simple
reopen with the default parameters:

$ qemu-img create -f qcow2 hd.qcow2 1M
   $ qemu-system-x86_64 -monitor stdio -drive if=virtio,file=hd.qcow2
   (qemu) qemu-io virtio0 reopen
   Cannot change cache.writeback: Device attached

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-io-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -XXX,XX +XXX,XX @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
         return -EINVAL;
     }
 
-    if (writethrough != blk_enable_write_cache(blk) &&
+    if (!writethrough != blk_enable_write_cache(blk) &&
         blk_get_attached_dev(blk))
     {
         error_report("Cannot change cache.writeback: Device attached");
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

The default value of x-check-cache-dropped is false. There's no reason
to use the previous value as a default in raw_reopen_prepare() because
bdrv_reopen_queue_child() already takes care of putting the old
options in the BDRVReopenState.options QDict.

If x-check-cache-dropped was previously set but is now missing from
the reopen QDict then it should be reset to false.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
     }
 
     rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
-                                                s->check_cache_dropped);
+                                                false);
 
     if (s->type == FTYPE_CD) {
         rs->open_flags |= O_NONBLOCK;
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

Block drivers allow opening their children using a reference to an
existing BlockDriverState. These references remain stored in the
'options' and 'explicit_options' QDicts, but we don't need to keep
them once everything is open.

What is more important, these values can become wrong if the children
change:

$ qemu-img create -f qcow2 hd0.qcow2 10M
    $ qemu-img create -f qcow2 hd1.qcow2 10M
    $ qemu-img create -f qcow2 hd2.qcow2 10M
    $ $QEMU -drive if=none,file=hd0.qcow2,node-name=hd0 \
            -drive if=none,file=hd1.qcow2,node-name=hd1,backing=hd0 \
            -drive file=hd2.qcow2,node-name=hd2,backing=hd1

After this hd2 has hd1 as its backing file. Now let's remove it using
block_stream:

(qemu) block_stream hd2 0 hd0.qcow2

Now hd0 is the backing file of hd2, but hd2's options QDicts still
contain backing=hd1.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
         }
     }
 
-    /* Remove all children options from bs->options and bs->explicit_options */
+    /* Remove all children options and references
+     * from bs->options and bs->explicit_options */
     QLIST_FOREACH(child, &bs->children, next) {
         char *child_key_dot;
         child_key_dot = g_strdup_printf("%s.", child->name);
         qdict_extract_subqdict(bs->explicit_options, NULL, child_key_dot);
         qdict_extract_subqdict(bs->options, NULL, child_key_dot);
+        qdict_del(bs->explicit_options, child->name);
+        qdict_del(bs->options, child->name);
         g_free(child_key_dot);
     }
 
@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
 {
     BlockDriver *drv;
     BlockDriverState *bs;
+    BdrvChild *child;
     bool old_can_write, new_can_write;
 
     assert(reopen_state != NULL);
@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
     bs->open_flags         = reopen_state->flags;
     bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
 
+    /* Remove child references from bs->options and bs->explicit_options.
+     * Child options were already removed in bdrv_reopen_queue_child() */
+    QLIST_FOREACH(child, &bs->children, next) {
+        qdict_del(bs->explicit_options, child->name);
+        qdict_del(bs->options, child->name);
+    }
+
     bdrv_refresh_limits(bs, NULL);
 
     bdrv_set_perm(reopen_state->bs, reopen_state->perm,
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

In the previous patch we removed child references from bs->options, so
there's no need to look for them here anymore.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static bool append_open_options(QDict *d, BlockDriverState *bs)
 {
     const QDictEntry *entry;
     QemuOptDesc *desc;
-    BdrvChild *child;
     bool found_any = false;
 
     for (entry = qdict_first(bs->options); entry;
          entry = qdict_next(bs->options, entry))
     {
-        /* Exclude node-name references to children */
-        QLIST_FOREACH(child, &bs->children, next) {
-            if (!strcmp(entry->key, child->name)) {
-                break;
-            }
-        }
-        if (child) {
-            continue;
-        }
-
-        /* And exclude all non-driver-specific options */
+        /* Exclude all non-driver-specific options */
         for (desc = bdrv_runtime_opts.desc; desc->name; desc++) {
             if (!strcmp(qdict_entry_key(entry), desc->name)) {
                 break;
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

In the previous patches we removed all child references from
bs->{options,explicit_options} because keeping them is useless and
wrong.

Because of this, any attempt to reopen a BlockDriverState using a
child reference as one of its options would result in a failure,
because bdrv_reopen_prepare() would detect that there's a new option
(the child reference) that wasn't present in bs->options.

But passing child references on reopen can be useful. It's a way to
specify a BDS's child without having to pass recursively all of the
child's options, and if the reference points to a different BDS then
this can allow us to replace the child.

However, replacing the child is something that needs to be implemented
case by case and only when it makes sense. For now, this patch allows
passing a child reference as long as it points to the current child of
the BlockDriverState.

It's also important to remember that, as a consequence of the
previous patches, this child reference will be removed from
bs->{options,explicit_options} after the reopening has been completed.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
             QObject *new = entry->value;
             QObject *old = qdict_get(reopen_state->bs->options, entry->key);
 
+            /* Allow child references (child_name=node_name) as long as they
+             * point to the current child (i.e. everything stays the same). */
+            if (qobject_type(new) == QTYPE_QSTRING) {
+                BdrvChild *child;
+                QLIST_FOREACH(child, &reopen_state->bs->children, next) {
+                    if (!strcmp(child->name, entry->key)) {
+                        break;
+                    }
+                }
+
+                if (child) {
+                    const char *str = qobject_get_try_str(new);
+                    if (!strcmp(child->bs->node_name, str)) {
+                        continue; /* Found child with this name, skip option */
+                    }
+                }
+            }
+
             /*
              * TODO: When using -drive to specify blockdev options, all values
              * will be strings; however, when using -blockdev, blockdev-add or
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

The bdrv_reopen_prepare() function checks all options passed to each
BlockDriverState (in the reopen_state->options QDict) and makes all
necessary preparations to apply the option changes requested by the
user.

Options are removed from the QDict as they are processed, so at the
end of bdrv_reopen_prepare() only the options that can't be changed
are left. Then a loop goes over all remaining options and verifies
that the old and new values are identical, returning an error if
they're not.

The problem is that at the moment there are options that are removed
from the QDict although they can't be changed. The consequence of this
is any modification to any of those options is silently ignored:

(qemu) qemu-io virtio0 "reopen -o discard=on"

This happens when all options from bdrv_runtime_opts are removed
from the QDict but then only a few of them are processed. Since
it's especially important that "node-name" and "driver" are not
changed, the code puts them back into the QDict so they are checked
at the end of the function. Instead of putting only those two options
back into the QDict, this patch puts all unprocessed options using
qemu_opts_to_qdict().

update_flags_from_options() also needs to be modified to prevent
BDRV_OPT_CACHE_NO_FLUSH, BDRV_OPT_CACHE_DIRECT and BDRV_OPT_READ_ONLY
from going back to the QDict.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
     *flags &= ~BDRV_O_CACHE_MASK;
 
     assert(qemu_opt_find(opts, BDRV_OPT_CACHE_NO_FLUSH));
-    if (qemu_opt_get_bool(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
         *flags |= BDRV_O_NO_FLUSH;
     }
 
     assert(qemu_opt_find(opts, BDRV_OPT_CACHE_DIRECT));
-    if (qemu_opt_get_bool(opts, BDRV_OPT_CACHE_DIRECT, false)) {
+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_DIRECT, false)) {
         *flags |= BDRV_O_NOCACHE;
     }
 
     *flags &= ~BDRV_O_RDWR;
 
     assert(qemu_opt_find(opts, BDRV_OPT_READ_ONLY));
-    if (!qemu_opt_get_bool(opts, BDRV_OPT_READ_ONLY, false)) {
+    if (!qemu_opt_get_bool_del(opts, BDRV_OPT_READ_ONLY, false)) {
         *flags |= BDRV_O_RDWR;
     }
 
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
     BlockDriver *drv;
     QemuOpts *opts;
     QDict *orig_reopen_opts;
-    const char *value;
     bool read_only;
 
     assert(reopen_state != NULL);
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
 
     update_flags_from_options(&reopen_state->flags, opts);
 
-    /* node-name and driver must be unchanged. Put them back into the QDict, so
-     * that they are checked at the end of this function. */
-    value = qemu_opt_get(opts, "node-name");
-    if (value) {
-        qdict_put_str(reopen_state->options, "node-name", value);
-    }
-
-    value = qemu_opt_get(opts, "driver");
-    if (value) {
-        qdict_put_str(reopen_state->options, "driver", value);
-    }
+    /* All other options (including node-name and driver) must be unchanged.
+     * Put them back into the QDict, so that they are checked at the end
+     * of this function. */
+    qemu_opts_to_qdict(opts, reopen_state->options);
 
     /* If we are to stay read-only, do not allow permission change
      * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

The file-posix code is used for the "file", "host_device" and
"host_cdrom" drivers, and it allows reopening images. However the only
option that is actually processed is "x-check-cache-dropped", and
changes in all other options (e.g. "filename") are silently ignored:

(qemu) qemu-io virtio0 "reopen -o file.filename=no-such-file"

While we could allow changing some of the other options, let's keep
things as they are for now but return an error if the user tries to
change any of them.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
         goto out;
     }
 
-    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
-                                                false);
+    rs->check_cache_dropped =
+        qemu_opt_get_bool_del(opts, "x-check-cache-dropped", false);
+
+    /* This driver's reopen function doesn't currently allow changing
+     * other options, so let's put them back in the original QDict and
+     * bdrv_reopen_prepare() will detect changes and complain. */
+    qemu_opts_to_qdict(opts, state->options);
 
     if (s->type == FTYPE_CD) {
         rs->open_flags |= O_NONBLOCK;
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

'discard' is one of the basic BlockdevOptions available for all
drivers, but it's not handled by bdrv_reopen_prepare() so any attempt
to change it results in an error:

(qemu) qemu-io virtio0 "reopen -o discard=on"
   Cannot change the option 'discard'

Since there's no reason why we shouldn't allow changing it and the
implementation is simple let's just do it.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
     BlockDriver *drv;
     QemuOpts *opts;
     QDict *orig_reopen_opts;
+    char *discard = NULL;
     bool read_only;
 
     assert(reopen_state != NULL);
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
 
     update_flags_from_options(&reopen_state->flags, opts);
 
+    discard = qemu_opt_get_del(opts, "discard");
+    if (discard != NULL) {
+        if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
+            error_setg(errp, "Invalid discard option");
+            ret = -EINVAL;
+            goto error;
+        }
+    }
+
     /* All other options (including node-name and driver) must be unchanged.
      * Put them back into the QDict, so that they are checked at the end
      * of this function. */
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
 error:
     qemu_opts_del(opts);
     qobject_unref(orig_reopen_opts);
+    g_free(discard);
     return ret;
 }
 
-- 
2.13.6

From: Alberto Garcia <berto@igalia.com>

'detect-zeroes' is one of the basic BlockdevOptions available for all
drivers, but it's not handled by bdrv_reopen_prepare(), so any attempt
to change it results in an error:

(qemu) qemu-io virtio0 "reopen -o detect-zeroes=on"
   Cannot change the option 'detect-zeroes'

Since there's no reason why we shouldn't allow changing it and the
implementation is simple let's just do it.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block.h |  1 +
 block.c               | 64 ++++++++++++++++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
 typedef struct BDRVReopenState {
     BlockDriverState *bs;
     int flags;
+    BlockdevDetectZeroesOptions detect_zeroes;
     uint64_t perm, shared_perm;
     QDict *options;
     QDict *explicit_options;
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_join_options(BlockDriverState *bs, QDict *options,
     }
 }
 
+static BlockdevDetectZeroesOptions bdrv_parse_detect_zeroes(QemuOpts *opts,
+                                                            int open_flags,
+                                                            Error **errp)
+{
+    Error *local_err = NULL;
+    char *value = qemu_opt_get_del(opts, "detect-zeroes");
+    BlockdevDetectZeroesOptions detect_zeroes =
+        qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup, value,
+                        BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, &local_err);
+    g_free(value);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return detect_zeroes;
+    }
+
+    if (detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&
+        !(open_flags & BDRV_O_UNMAP))
+    {
+        error_setg(errp, "setting detect-zeroes to unmap is not allowed "
+                   "without setting discard operation to unmap");
+    }
+
+    return detect_zeroes;
+}
+
 /**
  * Set open flags for a given discard mode
  *
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
     const char *driver_name = NULL;
     const char *node_name = NULL;
     const char *discard;
-    const char *detect_zeroes;
     QemuOpts *opts;
     BlockDriver *drv;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
         }
     }
 
-    detect_zeroes = qemu_opt_get(opts, "detect-zeroes");
-    if (detect_zeroes) {
-        BlockdevDetectZeroesOptions value =
-            qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup,
-                            detect_zeroes,
-                            BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
-                            &local_err);
-        if (local_err) {
-            error_propagate(errp, local_err);
-            ret = -EINVAL;
-            goto fail_opts;
-        }
-
-        if (value == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&
-            !(bs->open_flags & BDRV_O_UNMAP))
-        {
-            error_setg(errp, "setting detect-zeroes to unmap is not allowed "
-                             "without setting discard operation to unmap");
-            ret = -EINVAL;
-            goto fail_opts;
-        }
-
-        bs->detect_zeroes = value;
+    bs->detect_zeroes =
+        bdrv_parse_detect_zeroes(opts, bs->open_flags, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto fail_opts;
     }
 
     if (filename != NULL) {
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
         }
     }
 
+    reopen_state->detect_zeroes =
+        bdrv_parse_detect_zeroes(opts, reopen_state->flags, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto error;
+    }
+
     /* All other options (including node-name and driver) must be unchanged.
      * Put them back into the QDict, so that they are checked at the end
      * of this function. */
@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
     bs->options            = reopen_state->options;
     bs->open_flags         = reopen_state->flags;
     bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
+    bs->detect_zeroes      = reopen_state->detect_zeroes;
 
     /* Remove child references from bs->options and bs->explicit_options.
      * Child options were already removed in bdrv_reopen_queue_child() */
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 docs/qcow2-cache.txt | 21 ++++++++++++++-------
 qemu-options.hx      |  9 ++++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/qcow2-cache.txt
+++ b/docs/qcow2-cache.txt
@@ -XXX,XX +XXX,XX @@ Choosing the right cache sizes
 In order to choose the cache sizes we need to know how they relate to
 the amount of allocated space.
 
-The amount of virtual disk that can be mapped by the L2 and refcount
+The part of the virtual disk that can be mapped by the L2 and refcount
 caches (in bytes) is:
 
    disk_size = l2_cache_size * cluster_size / 8
    disk_size = refcount_cache_size * cluster_size * 8 / refcount_bits
 
 With the default values for cluster_size (64KB) and refcount_bits
-(16), that is
+(16), this becomes:
 
    disk_size = l2_cache_size * 8192
    disk_size = refcount_cache_size * 32768
@@ -XXX,XX +XXX,XX @@ need:
    l2_cache_size = disk_size_GB * 131072
    refcount_cache_size = disk_size_GB * 32768
 
-QEMU has a default L2 cache of 1MB (1048576 bytes) and a refcount
-cache of 256KB (262144 bytes), so using the formulas we've just seen
-we have
+For example, 1MB of L2 cache is needed to cover every 8 GB of the virtual
+image size (given that the default cluster size is used):
 
-   1048576 / 131072 = 8 GB of virtual disk covered by that cache
-    262144 /  32768 = 8 GB
+   8 GB / 8192 = 1 MB
+
+The refcount cache is 4 times the cluster size by default. With the default
+cluster size of 64 KB, it is 256 KB (262144 bytes). This is sufficient for
+8 GB of image size:
+
+   262144 * 32768 = 8 GB
 
 
 How to configure the cache sizes
@@ -XXX,XX +XXX,XX @@ There are a few things that need to be taken into account:
    memory as possible to the L2 cache before increasing the refcount
    cache size.
 
+ - At most two of "l2-cache-size", "refcount-cache-size", and "cache-size"
+   can be set simultaneously.
+
 Unlike L2 tables, refcount blocks are not used during normal I/O but
 only during allocations and internal snapshots. In most cases they are
 accessed sequentially (even during random guest I/O) so increasing the
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ image file)
 
 @item cache-size
 The maximum total size of the L2 table and refcount block caches in bytes
-(default: 1048576 bytes or 8 clusters, whichever is larger)
+(default: the sum of l2-cache-size and refcount-cache-size)
 
 @item l2-cache-size
 The maximum size of the L2 table cache in bytes
-(default: 4/5 of the total cache size)
+(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever
+is larger; otherwise, as large as possible or needed within the cache-size,
+while permitting the requested or the minimal refcount cache size)
 
 @item refcount-cache-size
 The maximum size of the refcount block cache in bytes
-(default: 1/5 of the total cache size)
+(default: 4 times the cluster size; or if cache-size is specified, the part of
+it which is not used for the L2 cache)
 
 @item cache-clean-interval
 Clean unused entries in the L2 and refcount caches. The interval is in seconds.
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

Adding a lookup table for the powers of two, with the appropriate size
prefixes. This is needed when a size has to be stringified, in which
case something like '(1 * KiB)' would become a literal '(1 * (1L << 10))'
string. Powers of two are used very often for sizes, so such a table
will also make it easier and more intuitive to write them.

This table is generatred using the following AWK script:

BEGIN {
	suffix="KMGTPE";
	for(i=10; i<64; i++) {
		val=2**i;
		s=substr(suffix, int(i/10), 1);
		n=2**(i%10);
		pad=21-int(log(n)/log(10));
		printf("#define S_%d%siB %*d\n", n, s, pad, val);
	}
}

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qemu/units.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/include/qemu/units.h b/include/qemu/units.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/units.h
+++ b/include/qemu/units.h
@@ -XXX,XX +XXX,XX @@
 #define PiB     (INT64_C(1) << 50)
 #define EiB     (INT64_C(1) << 60)
 
+#define S_1KiB                  1024
+#define S_2KiB                  2048
+#define S_4KiB                  4096
+#define S_8KiB                  8192
+#define S_16KiB                16384
+#define S_32KiB                32768
+#define S_64KiB                65536
+#define S_128KiB              131072
+#define S_256KiB              262144
+#define S_512KiB              524288
+#define S_1MiB               1048576
+#define S_2MiB               2097152
+#define S_4MiB               4194304
+#define S_8MiB               8388608
+#define S_16MiB             16777216
+#define S_32MiB             33554432
+#define S_64MiB             67108864
+#define S_128MiB           134217728
+#define S_256MiB           268435456
+#define S_512MiB           536870912
+#define S_1GiB            1073741824
+#define S_2GiB            2147483648
+#define S_4GiB            4294967296
+#define S_8GiB            8589934592
+#define S_16GiB          17179869184
+#define S_32GiB          34359738368
+#define S_64GiB          68719476736
+#define S_128GiB        137438953472
+#define S_256GiB        274877906944
+#define S_512GiB        549755813888
+#define S_1TiB         1099511627776
+#define S_2TiB         2199023255552
+#define S_4TiB         4398046511104
+#define S_8TiB         8796093022208
+#define S_16TiB       17592186044416
+#define S_32TiB       35184372088832
+#define S_64TiB       70368744177664
+#define S_128TiB     140737488355328
+#define S_256TiB     281474976710656
+#define S_512TiB     562949953421312
+#define S_1PiB      1125899906842624
+#define S_2PiB      2251799813685248
+#define S_4PiB      4503599627370496
+#define S_8PiB      9007199254740992
+#define S_16PiB    18014398509481984
+#define S_32PiB    36028797018963968
+#define S_64PiB    72057594037927936
+#define S_128PiB  144115188075855872
+#define S_256PiB  288230376151711744
+#define S_512PiB  576460752303423488
+#define S_1EiB   1152921504606846976
+#define S_2EiB   2305843009213693952
+#define S_4EiB   4611686018427387904
+#define S_8EiB   9223372036854775808
+
 #endif
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@
 
 #include "crypto/block.h"
 #include "qemu/coroutine.h"
+#include "qemu/units.h"
 
 //#define DEBUG_ALLOC
 //#define DEBUG_ALLOC2
@@ -XXX,XX +XXX,XX @@
 
 /* 8 MB refcount table is enough for 2 PB images at 64k cluster size
  * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
-#define QCOW_MAX_REFTABLE_SIZE 0x800000
+#define QCOW_MAX_REFTABLE_SIZE S_8MiB
 
 /* 32 MB L1 table is enough for 2 PB images at 64k cluster size
  * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
-#define QCOW_MAX_L1_SIZE 0x2000000
+#define QCOW_MAX_L1_SIZE S_32MiB
 
 /* Allow for an average of 1k per snapshot table entry, should be plenty of
  * space for snapshot names and IDs */
@@ -XXX,XX +XXX,XX @@
 
 /* Whichever is more */
 #define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */
-#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */
+#define DEFAULT_L2_CACHE_SIZE S_1MiB
 
-#define DEFAULT_CLUSTER_SIZE 65536
+#define DEFAULT_CLUSTER_SIZE S_64KiB
 
 
 #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
         }
     } else {
         if (!l2_cache_size_set) {
-            *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE,
+            *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE,
                                  (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
                                  * s->cluster_size);
         }
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

The refcount cache size does not need to be set to its minimum value in
read_cache_sizes(), as it is set to at least its minimum value in
qcow2_update_options_prepare().

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
                                  (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
                                  * s->cluster_size);
         }
-        if (!refcount_cache_size_set) {
-            *refcount_cache_size = min_refcount_cache;
-        }
     }
+    /* l2_cache_size and refcount_cache_size are ensured to have at least
+     * their minimum values in qcow2_update_options_prepare() */
 
     if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
         *l2_cache_entry_size > s->cluster_size ||
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

Sufficient L2 cache can noticeably improve the performance when using
large images with frequent I/O.

Previously, unless 'cache-size' was specified and was large enough, the
L2 cache was set to a certain size without taking the virtual image size
into account.

Now, the L2 cache assignment is aware of the virtual size of the image,
and will cover the entire image, unless the cache size needed for that is
larger than a certain maximum. This maximum is set to 1 MB by default
(enough to cover an 8 GB image with the default cluster size) but can
be increased or decreased using the 'l2-cache-size' option. This option
was previously documented as the *maximum* L2 cache size, and this patch
makes it behave as such, instead of as a constant size. Also, the
existing option 'cache-size' can limit the sum of both L2 and refcount
caches, as previously.

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 docs/qcow2-cache.txt       | 15 ++++++++++-----
 block/qcow2.h              |  4 +---
 block/qcow2.c              | 21 +++++++++------------
 qemu-options.hx            |  6 +++---
 tests/qemu-iotests/137     |  8 +++++++-
 tests/qemu-iotests/137.out |  4 +++-
 6 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/qcow2-cache.txt
+++ b/docs/qcow2-cache.txt
@@ -XXX,XX +XXX,XX @@ There are a few things that need to be taken into account:
  - Both caches must have a size that is a multiple of the cluster size
    (or the cache entry size: see "Using smaller cache sizes" below).
 
- - The default L2 cache size is 8 clusters or 1MB (whichever is more),
-   and the minimum is 2 clusters (or 2 cache entries, see below).
+ - The maximum L2 cache size is 1 MB by default (enough for full coverage
+   of 8 GB images, with the default cluster size). This value can be
+   modified using the "l2-cache-size" option. QEMU will not use more memory
+   than needed to hold all of the image's L2 tables, regardless of this max.
+   value. The minimal L2 cache size is 2 clusters (or 2 cache entries, see
+   below).
 
  - The default (and minimum) refcount cache size is 4 clusters.
 
@@ -XXX,XX +XXX,XX @@ Some things to take into account:
    always uses the cluster size as the entry size.
 
  - If the L2 cache is big enough to hold all of the image's L2 tables
-   (as explained in the "Choosing the right cache sizes" section
-   earlier in this document) then none of this is necessary and you
-   can omit the "l2-cache-entry-size" parameter altogether.
+   (as explained in the "Choosing the right cache sizes" and "How to
+   configure the cache sizes" sections in this document) then none of
+   this is necessary and you can omit the "l2-cache-entry-size"
+   parameter altogether.
 
 
 Reducing the memory usage
diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@
 /* Must be at least 4 to cover all cases of refcount table growth */
 #define MIN_REFCOUNT_CACHE_SIZE 4 /* clusters */
 
-/* Whichever is more */
-#define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */
-#define DEFAULT_L2_CACHE_SIZE S_1MiB
+#define DEFAULT_L2_CACHE_MAX_SIZE S_1MiB
 
 #define DEFAULT_CLUSTER_SIZE S_64KiB
 
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
                              uint64_t *refcount_cache_size, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
-    uint64_t combined_cache_size;
+    uint64_t combined_cache_size, l2_cache_max_setting;
     bool l2_cache_size_set, refcount_cache_size_set, combined_cache_size_set;
     int min_refcount_cache = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;
+    uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
+    uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);
 
     combined_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_CACHE_SIZE);
     l2_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_SIZE);
     refcount_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_REFCOUNT_CACHE_SIZE);
 
     combined_cache_size = qemu_opt_get_size(opts, QCOW2_OPT_CACHE_SIZE, 0);
-    *l2_cache_size = qemu_opt_get_size(opts, QCOW2_OPT_L2_CACHE_SIZE, 0);
+    l2_cache_max_setting = qemu_opt_get_size(opts, QCOW2_OPT_L2_CACHE_SIZE,
+                                             DEFAULT_L2_CACHE_MAX_SIZE);
     *refcount_cache_size = qemu_opt_get_size(opts,
                                              QCOW2_OPT_REFCOUNT_CACHE_SIZE, 0);
 
     *l2_cache_entry_size = qemu_opt_get_size(
         opts, QCOW2_OPT_L2_CACHE_ENTRY_SIZE, s->cluster_size);
 
+    *l2_cache_size = MIN(max_l2_cache, l2_cache_max_setting);
+
     if (combined_cache_size_set) {
         if (l2_cache_size_set && refcount_cache_size_set) {
             error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE
                        " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be set "
                        "at the same time");
             return;
-        } else if (*l2_cache_size > combined_cache_size) {
+        } else if (l2_cache_size_set &&
+                   (l2_cache_max_setting > combined_cache_size)) {
             error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed "
                        QCOW2_OPT_CACHE_SIZE);
             return;
@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
         } else if (refcount_cache_size_set) {
             *l2_cache_size = combined_cache_size - *refcount_cache_size;
         } else {
-            uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
-            uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);
-
             /* Assign as much memory as possible to the L2 cache, and
              * use the remainder for the refcount cache */
             if (combined_cache_size >= max_l2_cache + min_refcount_cache) {
@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
                 *l2_cache_size = combined_cache_size - *refcount_cache_size;
             }
         }
-    } else {
-        if (!l2_cache_size_set) {
-            *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE,
-                                 (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
-                                 * s->cluster_size);
-        }
     }
     /* l2_cache_size and refcount_cache_size are ensured to have at least
      * their minimum values in qcow2_update_options_prepare() */
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ The maximum total size of the L2 table and refcount block caches in bytes
 
 @item l2-cache-size
 The maximum size of the L2 table cache in bytes
-(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever
-is larger; otherwise, as large as possible or needed within the cache-size,
-while permitting the requested or the minimal refcount cache size)
+(default: if cache-size is not specified - 1M; otherwise, as large as possible
+within the cache-size, while permitting the requested or the minimal refcount
+cache size)
 
 @item refcount-cache-size
 The maximum size of the refcount block cache in bytes
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
     -c "reopen -o cache-size=1M,l2-cache-size=64k,refcount-cache-size=64k" \
     -c "reopen -o cache-size=1M,l2-cache-size=2M" \
     -c "reopen -o cache-size=1M,refcount-cache-size=2M" \
-    -c "reopen -o l2-cache-size=256T" \
     -c "reopen -o l2-cache-entry-size=33k" \
     -c "reopen -o l2-cache-entry-size=128k" \
     -c "reopen -o refcount-cache-size=256T" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
     -c "reopen -o cache-clean-interval=-1" \
     "$TEST_IMG" | _filter_qemu_io
 
+IMGOPTS="cluster_size=256k" _make_test_img 32P
+$QEMU_IO \
+    -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
+    "$TEST_IMG" | _filter_qemu_io
+
+_make_test_img 64M
+
 echo
 echo === Test transaction semantics ===
 echo
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -XXX,XX +XXX,XX @@ Parameter 'lazy-refcounts' expects 'on' or 'off'
 cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
 l2-cache-size may not exceed cache-size
 refcount-cache-size may not exceed cache-size
-L2 cache size too big
 L2 cache entry size must be a power of two between 512 and the cluster size (65536)
 L2 cache entry size must be a power of two between 512 and the cluster size (65536)
 Refcount cache size too big
@@ -XXX,XX +XXX,XX @@ Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-c
 Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
 Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
 Cache clean interval too big
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
+L2 cache size too big
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 
 === Test transaction semantics ===
 
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

The upper limit on the L2 cache size is increased from 1 MB to 32 MB
on Linux platforms, and to 8 MB on other platforms (this difference is
caused by the ability to set intervals for cache cleaning on Linux
platforms only).

This is done in order to allow default full coverage with the L2 cache
for images of up to 256 GB in size (was 8 GB). Note, that only the
needed amount to cover the full image is allocated. The value which is
changed here is just the upper limit on the L2 cache size, beyond which
it will not grow, even if the size of the image will require it to.

From: Leonid Bloch <lbloch@janustech.com>

The caches are now recalculated upon image resizing. This is done
because the new default behavior of assigning L2 cache relatively to
the image size, implies that the cache will be adapted accordingly
after an image resize.

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
     uint64_t old_length;
     int64_t new_l1_size;
     int ret;
+    QDict *options;
 
     if (prealloc != PREALLOC_MODE_OFF && prealloc != PREALLOC_MODE_METADATA &&
         prealloc != PREALLOC_MODE_FALLOC && prealloc != PREALLOC_MODE_FULL)
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         }
     }
 
+    bs->total_sectors = offset / BDRV_SECTOR_SIZE;
+
     /* write updated header.size */
     offset = cpu_to_be64(offset);
     ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
     }
 
     s->l1_vm_state_index = new_l1_size;
+
+    /* Update cache sizes */
+    options = qdict_clone_shallow(bs->options);
+    ret = qcow2_update_options(bs, options, s->flags, errp);
+    qobject_unref(options);
+    if (ret < 0) {
+        goto fail;
+    }
     ret = 0;
 fail:
     qemu_co_mutex_unlock(&s->lock);
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

The default cache-clean-interval is set to 10 minutes, in order to lower
the overhead of the qcow2 caches (before the default was 0, i.e.
disabled).

* For non-Linux platforms the default is kept at 0, because
  cache-clean-interval is not supported there yet.

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qapi/block-core.json | 3 ++-
 docs/qcow2-cache.txt | 4 ++--
 block/qcow2.h        | 4 +++-
 block/qcow2.c        | 2 +-
 qemu-options.hx      | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # @cache-clean-interval:  clean unused entries in the L2 and refcount
 #                         caches. The interval is in seconds. The default value
-#                         is 0 and it disables this feature (since 2.5)
+#                         is 600, and 0 disables this feature. (since 2.5)
+#
 # @encrypt:               Image decryption options. Mandatory for
 #                         encrypted images, except when doing a metadata-only
 #                         probe of the image. (since 2.10)
diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/qcow2-cache.txt
+++ b/docs/qcow2-cache.txt
@@ -XXX,XX +XXX,XX @@ This example removes all unused cache entries every 15 minutes:
 
    -drive file=hd.qcow2,cache-clean-interval=900
 
-If unset, the default value for this parameter is 0 and it disables
-this feature.
+If unset, the default value for this parameter is 600. Setting it to 0
+disables this feature.
 
 Note that this functionality currently relies on the MADV_DONTNEED
 argument for madvise() to actually free the memory. This is a
diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@
 
 #ifdef CONFIG_LINUX
 #define DEFAULT_L2_CACHE_MAX_SIZE S_32MiB
+#define DEFAULT_CACHE_CLEAN_INTERVAL 600  /* seconds */
 #else
 #define DEFAULT_L2_CACHE_MAX_SIZE S_8MiB
+/* Cache clean interval is currently available only on Linux, so must be 0 */
+#define DEFAULT_CACHE_CLEAN_INTERVAL 0
 #endif
 
 #define DEFAULT_CLUSTER_SIZE S_64KiB
 
-
 #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
 #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"
 #define QCOW2_OPT_DISCARD_SNAPSHOT "pass-discard-snapshot"
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
     /* New interval for cache cleanup timer */
     r->cache_clean_interval =
         qemu_opt_get_number(opts, QCOW2_OPT_CACHE_CLEAN_INTERVAL,
-                            s->cache_clean_interval);
+                            DEFAULT_CACHE_CLEAN_INTERVAL);
 #ifndef CONFIG_LINUX
     if (r->cache_clean_interval != 0) {
         error_setg(errp, QCOW2_OPT_CACHE_CLEAN_INTERVAL
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ it which is not used for the L2 cache)
 
 @item cache-clean-interval
 Clean unused entries in the L2 and refcount caches. The interval is in seconds.
-The default value is 0 and it disables this feature.
+The default value is 600. Setting it to 0 disables this feature.
 
 @item pass-discard-request
 Whether discard requests to the qcow2 device should be forwarded to the data
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
     /* 2^(s->refcount_order - 3) is the refcount width in bytes */
     s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3);
     s->refcount_block_size = 1 << s->refcount_block_bits;
-    bs->total_sectors = header.size / 512;
+    bs->total_sectors = header.size / BDRV_SECTOR_SIZE;
     s->csize_shift = (62 - (s->cluster_bits - 8));
     s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
     s->cluster_offset_mask = (1LL << s->csize_shift) - 1;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         goto fail;
     }
 
-    old_length = bs->total_sectors * 512;
+    old_length = bs->total_sectors * BDRV_SECTOR_SIZE;
     new_l1_size = size_to_l1(s, offset);
 
     if (offset < old_length) {
-- 
2.13.6

Currently, the default values for werror and rerror have to be set
explicitly with blk_set_on_error() by the callers of blk_new(). The only
caller actually doing this is blockdev_init(), which is called for
BlockBackends created using -drive.

In particular, anonymous BlockBackends created with
-device ...,drive=<node-name> didn't get the correct default set and
instead defaulted to the integer value 0 (= BLOCKDEV_ON_ERROR_REPORT).
This is the intended default for rerror anyway, but the default for
werror should be BLOCKDEV_ON_ERROR_ENOSPC.

Set the defaults in blk_new() instead so that they apply no matter what
way the BlockBackend was created.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
---
 block/block-backend.c      | 3 +++
 tests/qemu-iotests/067.out | 1 +
 2 files changed, 4 insertions(+)

diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm)
     blk->shared_perm = shared_perm;
     blk_set_enable_write_cache(blk, true);
 
+    blk->on_read_error = BLOCKDEV_ON_ERROR_REPORT;
+    blk->on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
+
     block_acct_init(&blk->stats);
 
     notifier_list_init(&blk->remove_bs_notifiers);
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -XXX,XX +XXX,XX @@ Testing: -device virtio-scsi -device scsi-cd,id=cd0
 {
     "return": [
         {
+            "io-status": "ok",
             "device": "",
             "locked": false,
             "removable": true,
-- 
2.13.6

From: Leonid Bloch <lbloch@janustech.com>

Fixing cache-clean-interval documentation following the recent change to
a default of 600 seconds on supported plarforms (only Linux currently).

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qapi/block-core.json |  3 ++-
 docs/qcow2-cache.txt | 20 ++++++++++----------
 qemu-options.hx      |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # @cache-clean-interval:  clean unused entries in the L2 and refcount
 #                         caches. The interval is in seconds. The default value
-#                         is 600, and 0 disables this feature. (since 2.5)
+#                         is 600 on supporting platforms, and 0 on other
+#                         platforms. 0 disables this feature. (since 2.5)
 #
 # @encrypt:               Image decryption options. Mandatory for
 #                         encrypted images, except when doing a metadata-only
diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/qcow2-cache.txt
+++ b/docs/qcow2-cache.txt
@@ -XXX,XX +XXX,XX @@ Reducing the memory usage
 It is possible to clean unused cache entries in order to reduce the
 memory usage during periods of low I/O activity.
 
-The parameter "cache-clean-interval" defines an interval (in seconds).
-All cache entries that haven't been accessed during that interval are
-removed from memory.
+The parameter "cache-clean-interval" defines an interval (in seconds),
+after which all the cache entries that haven't been accessed during the
+interval are removed from memory. Setting this parameter to 0 disables this
+feature.
 
-This example removes all unused cache entries every 15 minutes:
+The following example removes all unused cache entries every 15 minutes:
 
    -drive file=hd.qcow2,cache-clean-interval=900
 
-If unset, the default value for this parameter is 600. Setting it to 0
-disables this feature.
+If unset, the default value for this parameter is 600 on platforms which
+support this functionality, and is 0 (disabled) on other platforms.
 
-Note that this functionality currently relies on the MADV_DONTNEED
-argument for madvise() to actually free the memory. This is a
-Linux-specific feature, so cache-clean-interval is not supported in
-other systems.
+This functionality currently relies on the MADV_DONTNEED argument for
+madvise() to actually free the memory. This is a Linux-specific feature,
+so cache-clean-interval is not supported on other systems.
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ it which is not used for the L2 cache)
 
 @item cache-clean-interval
 Clean unused entries in the L2 and refcount caches. The interval is in seconds.
-The default value is 600. Setting it to 0 disables this feature.
+The default value is 600 on supporting platforms, and 0 on other platforms.
+Setting it to 0 disables this feature.
 
 @item pass-discard-request
 Whether discard requests to the qcow2 device should be forwarded to the data
-- 
2.13.6

Recently, the test case has started failing because some job related
functions want to drop the AioContext lock even though it hasn't been
taken:

(gdb) bt
    #0  0x00007f51c067c9fb in raise () from /lib64/libc.so.6
    #1  0x00007f51c067e77d in abort () from /lib64/libc.so.6
    #2  0x0000558c9d5dde7b in error_exit (err=<optimized out>, msg=msg@entry=0x558c9d6fe120 <__func__.18373> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
    #3  0x0000558c9d6b5263 in qemu_mutex_unlock_impl (mutex=mutex@entry=0x558c9f3999a0, file=file@entry=0x558c9d6fd36f "util/async.c", line=line@entry=516) at util/qemu-thread-posix.c:96
    #4  0x0000558c9d6b0565 in aio_context_release (ctx=ctx@entry=0x558c9f399940) at util/async.c:516
    #5  0x0000558c9d5eb3da in job_completed_txn_abort (job=0x558c9f68e640) at job.c:738
    #6  0x0000558c9d5eb227 in job_finish_sync (job=0x558c9f68e640, finish=finish@entry=0x558c9d5eb8d0 <job_cancel_err>, errp=errp@entry=0x0) at job.c:986
    #7  0x0000558c9d5eb8ee in job_cancel_sync (job=<optimized out>) at job.c:941
    #8  0x0000558c9d64d853 in replication_close (bs=<optimized out>) at block/replication.c:148
    #9  0x0000558c9d5e5c9f in bdrv_close (bs=0x558c9f41b020) at block.c:3420
    #10 bdrv_delete (bs=0x558c9f41b020) at block.c:3629
    #11 bdrv_unref (bs=0x558c9f41b020) at block.c:4685
    #12 0x0000558c9d62a3f3 in blk_remove_bs (blk=blk@entry=0x558c9f42a7c0) at block/block-backend.c:783
    #13 0x0000558c9d62a667 in blk_delete (blk=0x558c9f42a7c0) at block/block-backend.c:402
    #14 blk_unref (blk=0x558c9f42a7c0) at block/block-backend.c:457
    #15 0x0000558c9d5dfcea in test_secondary_stop () at tests/test-replication.c:478
    #16 0x00007f51c1f13178 in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
    #17 0x00007f51c1f1337b in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
    #18 0x00007f51c1f1337b in g_test_run_suite_internal () from /lib64/libglib-2.0.so.0
    #19 0x00007f51c1f13552 in g_test_run_suite () from /lib64/libglib-2.0.so.0
    #20 0x00007f51c1f13571 in g_test_run () from /lib64/libglib-2.0.so.0
    #21 0x0000558c9d5de31f in main (argc=<optimized out>, argv=<optimized out>) at tests/test-replication.c:581

It is yet unclear whether this should really be considered a bug in the
test case or whether blk_unref() should work for callers that haven't
taken the AioContext lock, but in order to fix the build tests quickly,
just take the AioContext lock around blk_unref().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/test-replication.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test-replication.c b/tests/test-replication.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -XXX,XX +XXX,XX @@ static BlockBackend *start_primary(void)
 static void teardown_primary(void)
 {
     BlockBackend *blk;
+    AioContext *ctx;
 
     /* remove P_ID */
     blk = blk_by_name(P_ID);
     assert(blk);
 
+    ctx = blk_get_aio_context(blk);
+    aio_context_acquire(ctx);
     monitor_remove_blk(blk);
     blk_unref(blk);
+    aio_context_release(ctx);
 }
 
 static void test_primary_read(void)
@@ -XXX,XX +XXX,XX @@ static void teardown_secondary(void)
 {
     /* only need to destroy two BBs */
     BlockBackend *blk;
+    AioContext *ctx;
 
     /* remove S_LOCAL_DISK_ID */
     blk = blk_by_name(S_LOCAL_DISK_ID);
     assert(blk);
 
+    ctx = blk_get_aio_context(blk);
+    aio_context_acquire(ctx);
     monitor_remove_blk(blk);
     blk_unref(blk);
+    aio_context_release(ctx);
 
     /* remove S_ID */
     blk = blk_by_name(S_ID);
     assert(blk);
 
+    ctx = blk_get_aio_context(blk);
+    aio_context_acquire(ctx);
     monitor_remove_blk(blk);
     blk_unref(blk);
+    aio_context_release(ctx);
 }
 
 static void test_secondary_read(void)
-- 
2.13.6

qemu_event_reset() must be called before the AIO request in a different
iothread is submitted. Otherwise the request could be completed before
we do the qemu_event_reset() and the test would hang in
qemu_event_wait().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Tested-by: Max Reitz <mreitz@redhat.com>
---
 tests/test-bdrv-drain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
     s->bh_indirection_ctx = ctx_b;
 
     aio_ret = -EINPROGRESS;
+    qemu_event_reset(&done_event);
+
     if (drain_thread == 0) {
         acb = blk_aio_preadv(blk, 0, &qiov, 0, test_iothread_aio_cb, &aio_ret);
     } else {
@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
          * but the drain in this thread can continue immediately after
          * bdrv_dec_in_flight() and aio_ret might be assigned only slightly
          * later. */
-        qemu_event_reset(&done_event);
         do_drain_begin(drain_type, bs);
         g_assert_cmpint(bs->in_flight, ==, 0);
 
@@ -XXX,XX +XXX,XX @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
         }
         break;
     case 1:
-        qemu_event_reset(&done_event);
         aio_bh_schedule_oneshot(ctx_a, test_iothread_drain_entry, &data);
         qemu_event_wait(&done_event);
         break;
-- 
2.13.6

The following changes since commit 0a301624c2f4ced3331ffd5bce85b4274fe132af:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20220208' into staging (2022-02-08 11:40:08 +0000)

are available in the Git repository at:

https://gitlab.com/kmwolf/qemu.git tags/for-upstream

for you to fetch changes up to fdb8541b2e4f6ff60f435fbb5a5e1df20c275a86:

hw/block/fdc-isa: Respect QOM properties when building AML (2022-02-11 17:37:26 +0100)

----------------------------------------------------------------
Block layer patches

- Fix crash in blockdev-reopen with iothreads
- fdc-isa: Respect QOM properties when building AML

----------------------------------------------------------------
Bernhard Beschow (1):
      hw/block/fdc-isa: Respect QOM properties when building AML

Kevin Wolf (2):
      block: Lock AioContext for drain_end in blockdev-reopen
      iotests: Test blockdev-reopen with iothreads and throttling

blockdev.c                 | 11 ++++++++++-
 hw/block/fdc-isa.c         | 11 +++++++----
 tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
 tests/qemu-iotests/245.out |  4 ++--
 4 files changed, 52 insertions(+), 10 deletions(-)

bdrv_subtree_drained_end() requires the caller to hold the AioContext
lock for the drained node. Not doing this for nodes outside of the main
AioContext leads to crashes when AIO_WAIT_WHILE() needs to wait and
tries to temporarily release the lock.

Fixes: 3908b7a8994fa5ef7a89aa58cd5a02fc58141592
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2046659
Reported-by: Qing Wang <qinwang@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220203140534.36522-2-kwolf@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
 {
     BlockReopenQueue *queue = NULL;
     GSList *drained = NULL;
+    GSList *p;
 
     /* Add each one of the BDS that we want to reopen to the queue */
     for (; reopen_list != NULL; reopen_list = reopen_list->next) {
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
 
 fail:
     bdrv_reopen_queue_free(queue);
-    g_slist_free_full(drained, (GDestroyNotify) bdrv_subtree_drained_end);
+    for (p = drained; p; p = p->next) {
+        BlockDriverState *bs = p->data;
+        AioContext *ctx = bdrv_get_aio_context(bs);
+
+        aio_context_acquire(ctx);
+        bdrv_subtree_drained_end(bs);
+        aio_context_release(ctx);
+    }
+    g_slist_free(drained);
 }
 
 void qmp_blockdev_del(const char *node_name, Error **errp)
-- 
2.34.1

The 'throttle' block driver implements .bdrv_co_drain_end, so
blockdev-reopen will have to wait for it to complete in the polling
loop at the end of qmp_blockdev_reopen(). This makes AIO_WAIT_WHILE()
release the AioContext lock, which causes a crash if the lock hasn't
correctly been taken.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220203140534.36522-3-kwolf@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
 tests/qemu-iotests/245.out |  4 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/245
+++ b/tests/qemu-iotests/245
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
         self.assertEqual(self.get_node('hd1'), None)
         self.assert_qmp(self.get_node('hd2'), 'ro', True)
 
-    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None):
-        opts = hd_opts(0)
+    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None,
+                           opts_a = None, opts_b = None):
+        opts = opts_a or hd_opts(0)
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
         self.assert_qmp(result, 'return', {})
 
-        opts2 = hd_opts(2)
+        opts2 = opts_b or hd_opts(2)
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts2)
         self.assert_qmp(result, 'return', {})
 
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
     def test_iothreads_switch_overlay(self):
         self.run_test_iothreads('', 'iothread0')
 
+    def test_iothreads_with_throttling(self):
+        # Create a throttle-group object
+        opts = { 'qom-type': 'throttle-group', 'id': 'group0',
+                 'limits': { 'iops-total': 1000 } }
+        result = self.vm.qmp('object-add', conv_keys = False, **opts)
+        self.assert_qmp(result, 'return', {})
+
+        # Options with a throttle filter between format and protocol
+        opts = [
+            {
+                'driver': iotests.imgfmt,
+                'node-name': f'hd{idx}',
+                'file' : {
+                    'node-name': f'hd{idx}-throttle',
+                    'driver': 'throttle',
+                    'throttle-group': 'group0',
+                    'file': {
+                        'driver': 'file',
+                        'node-name': f'hd{idx}-file',
+                        'filename': hd_path[idx],
+                    },
+                },
+            }
+            for idx in (0, 2)
+        ]
+
+        self.run_test_iothreads('iothread0', 'iothread0', None,
+                                opts[0], opts[1])
+
 if __name__ == '__main__':
     iotests.activate_logging()
     iotests.main(supported_fmts=["qcow2"],
diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/245.out
+++ b/tests/qemu-iotests/245.out
@@ -XXX,XX +XXX,XX @@ read 1/1 bytes at offset 262152
 read 1/1 bytes at offset 262160
 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
-...............
+................
 ----------------------------------------------------------------------
-Ran 25 tests
+Ran 26 tests
 
 OK
-- 
2.34.1

From: Bernhard Beschow <shentey@gmail.com>

Other ISA devices such as serial-isa use the properties in their
build_aml functions. fdc-isa not using them is probably an oversight.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20220209191558.30393-1-shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/fdc-isa.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -XXX,XX +XXX,XX @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)
 
 static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
 {
+    FDCtrlISABus *isa = ISA_FDC(isadev);
     Aml *dev;
     Aml *crs;
     int i;
@@ -XXX,XX +XXX,XX @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
     };
 
     crs = aml_resource_template();
-    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));
-    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));
-    aml_append(crs, aml_irq_no_flags(6));
     aml_append(crs,
-        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));
+        aml_io(AML_DECODE16, isa->iobase + 2, isa->iobase + 2, 0x00, 0x04));
+    aml_append(crs,
+        aml_io(AML_DECODE16, isa->iobase + 7, isa->iobase + 7, 0x00, 0x01));
+    aml_append(crs, aml_irq_no_flags(isa->irq));
+    aml_append(crs,
+        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, isa->dma));
 
     dev = aml_device("FDC0");
     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));
-- 
2.34.1