Series comparison

-[PULL 00/34] Block patches
+[PULL 0/5] Block patches
-The following changes since commit f17783e706ab9c7b3a2b69cf48e4f0ba40664f54:
+The following changes since commit 03a3a62fbd0aa5227e978eef3c67d3978aec9e5f:
-  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191220' into staging (2020-01-03 18:50:33 +0000)
+  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2023-09-07 10:29:06 -0400)
 are available in the Git repository at:
-  https://github.com/XanClic/qemu.git tags/pull-block-2020-01-06
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 503ca1262bab2c11c533a4816d1ff4297d4f58a6:
+for you to fetch changes up to 631c872614aca91eaf947c1748f0f27f99635d92:
-  backup-top: Begin drain earlier (2020-01-06 14:26:23 +0100)
+  tests/qtest: Introduce tests for UFS (2023-09-07 14:01:29 -0400)
 ----------------------------------------------------------------
-Block patches:
+Pull request
-- Minor fixes and tests from the freeze period (too minor to be included
-  in 4.2)
+- Jeuk Kim's emulated UFS device
-- Allow many bash iotests to test qcow2's external data file feature
+- Fabiano Rosas' IOThread GSource "name" debugging aid
 - Add compress filter driver
 - Fix Python iotests after 6f6e1698a6
 - Fix for the backup job
 ----------------------------------------------------------------
-Andrey Shinkevich (3):
-  block: introduce compress filter driver
-  qcow2: Allow writing compressed data of multiple clusters
-  tests/qemu-iotests: add case to write compressed data of multiple
-    clusters
-Max Reitz (28):
+Fabiano Rosas (1):
-  block: Add bdrv_qapi_perm_to_blk_perm()
+  iothread: Set the GSource "name" field
   block: Use bdrv_qapi_perm_to_blk_perm()
   blkdebug: Allow taking/unsharing permissions
   iotests: Add @error to wait_until_completed
   iotests: Add test for failing mirror complete
   iotests: s/qocw2/qcow2/
   iotests/qcow2.py: Add dump-header-exts
   iotests/qcow2.py: Split feature fields into bits
   iotests: Add _filter_json_filename
   iotests: Filter refcount_order in 036
   iotests: Replace IMGOPTS by _unsupported_imgopts
   iotests: Drop compat=1.1 in 050
   iotests: Let _make_test_img parse its parameters
   iotests: Add -o and --no-opts to _make_test_img
   iotests: Inject space into -ocompat=0.10 in 051
   iotests: Replace IMGOPTS= by -o
   iotests: Replace IMGOPTS='' by --no-opts
   iotests: Drop IMGOPTS use in 267
   iotests: Avoid qemu-img create
   iotests: Use _rm_test_img for deleting test images
   iotests: Avoid cp/mv of test images
   iotests: Make 091 work with data_file
   iotests: Make 110 work with data_file
   iotests: Make 137 work with data_file
   iotests: Make 198 work with data_file
   iotests: Disable data_file where it cannot be used
   iotests: Allow check -o data_file
   backup-top: Begin drain earlier
-PanNengyuan (1):
+Jeuk Kim (4):
-  throttle-groups: fix memory leak in throttle_group_set_limit:
+  hw/ufs: Initial commit for emulated Universal-Flash-Storage
   hw/ufs: Support for Query Transfer Requests
   hw/ufs: Support for UFS logical unit
   tests/qtest: Introduce tests for UFS
-Philippe Mathieu-Daudé (1):
+ MAINTAINERS              |    7 +
-  tests/qemu-iotests: Update tests to recent desugarized -accel option
+ docs/specs/pci-ids.rst   |    2 +
+ meson.build              |    1 +
-Vladimir Sementsov-Ogievskiy (1):
+ hw/ufs/trace.h           |    1 +
-  qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap
+ hw/ufs/ufs.h             |  131 ++++
+ include/block/ufs.h      | 1090 +++++++++++++++++++++++++++
- block.c                          |  47 +++++----
+ include/hw/pci/pci.h     |    1 +
- block/Makefile.objs              |   1 +
+ include/hw/pci/pci_ids.h |    1 +
- block/backup-top.c               |   4 +-
+ include/scsi/constants.h |    1 +
- block/blkdebug.c                 |  93 ++++++++++++++++-
+ hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++
- block/filter-compress.c          | 168 +++++++++++++++++++++++++++++++
+ hw/ufs/ufs.c             | 1502 ++++++++++++++++++++++++++++++++++++++
- block/qcow2-bitmap.c             |  41 ++++----
+ iothread.c               |   14 +-
- block/qcow2.c                    | 102 ++++++++++++++-----
+ tests/qtest/ufs-test.c   |  587 +++++++++++++++
- block/throttle-groups.c          |   4 +-
+ hw/Kconfig               |    1 +
- include/block/block.h            |   1 +
+ hw/meson.build           |    1 +
- qapi/block-core.json             |  24 ++++-
+ hw/ufs/Kconfig           |    4 +
- tests/qemu-iotests/007           |   5 +-
+ hw/ufs/meson.build       |    1 +
- tests/qemu-iotests/014           |   2 +
+ hw/ufs/trace-events      |   58 ++
- tests/qemu-iotests/015           |   5 +-
+ tests/qtest/meson.build  |    1 +
- tests/qemu-iotests/019           |   6 +-
+files changed, 4843 insertions(+), 6 deletions(-)
- tests/qemu-iotests/020           |   6 +-
+ create mode 100644 hw/ufs/trace.h
- tests/qemu-iotests/024           |  10 +-
+ create mode 100644 hw/ufs/ufs.h
- tests/qemu-iotests/026           |   5 +-
+ create mode 100644 include/block/ufs.h
- tests/qemu-iotests/028           |   2 +-
+ create mode 100644 hw/ufs/lu.c
- tests/qemu-iotests/029           |   7 +-
+ create mode 100644 hw/ufs/ufs.c
- tests/qemu-iotests/031           |   9 +-
+ create mode 100644 tests/qtest/ufs-test.c
- tests/qemu-iotests/031.out       |  36 +++----
+ create mode 100644 hw/ufs/Kconfig
- tests/qemu-iotests/036           |  15 +--
+ create mode 100644 hw/ufs/meson.build
- tests/qemu-iotests/036.out       |  66 ++----------
+ create mode 100644 hw/ufs/trace-events
  tests/qemu-iotests/039           |  27 ++---
  tests/qemu-iotests/039.out       |  22 ++--
  tests/qemu-iotests/041           |  44 ++++++++
  tests/qemu-iotests/041.out       |   4 +-
  tests/qemu-iotests/043           |   4 +-
  tests/qemu-iotests/046           |   2 +
  tests/qemu-iotests/048           |   4 +-
  tests/qemu-iotests/050           |   8 +-
  tests/qemu-iotests/051           |   7 +-
  tests/qemu-iotests/053           |   4 +-
  tests/qemu-iotests/058           |   7 +-
  tests/qemu-iotests/059           |  20 ++--
  tests/qemu-iotests/060           |  14 +--
  tests/qemu-iotests/060.out       |  20 ++--
  tests/qemu-iotests/061           |  63 ++++++------
  tests/qemu-iotests/061.out       |  72 ++++++-------
  tests/qemu-iotests/062           |   5 +-
  tests/qemu-iotests/063           |  18 ++--
  tests/qemu-iotests/063.out       |   3 +-
  tests/qemu-iotests/066           |   7 +-
  tests/qemu-iotests/067           |   6 +-
  tests/qemu-iotests/068           |   6 +-
  tests/qemu-iotests/069           |   2 +-
  tests/qemu-iotests/071           |   7 +-
  tests/qemu-iotests/073           |   4 +
  tests/qemu-iotests/074           |   4 +-
  tests/qemu-iotests/079           |   3 +-
  tests/qemu-iotests/080           |   7 +-
  tests/qemu-iotests/081           |   6 +-
  tests/qemu-iotests/085           |  18 ++--
  tests/qemu-iotests/085.out       |   8 +-
  tests/qemu-iotests/088           |   2 +-
  tests/qemu-iotests/090           |   2 +
  tests/qemu-iotests/091           |   2 +-
  tests/qemu-iotests/091.out       |   2 -
  tests/qemu-iotests/092           |   2 +-
  tests/qemu-iotests/094           |   4 +-
  tests/qemu-iotests/095           |   5 +-
  tests/qemu-iotests/098           |   6 +-
  tests/qemu-iotests/099           |  10 +-
  tests/qemu-iotests/103           |   5 +-
  tests/qemu-iotests/106           |   2 +-
  tests/qemu-iotests/108           |  10 +-
  tests/qemu-iotests/109           |   4 +-
  tests/qemu-iotests/110           |  11 +-
  tests/qemu-iotests/110.out       |   4 +-
  tests/qemu-iotests/111           |   3 +-
  tests/qemu-iotests/112           |  37 +++----
  tests/qemu-iotests/114           |   2 +
  tests/qemu-iotests/115           |   3 +-
  tests/qemu-iotests/121           |   9 +-
  tests/qemu-iotests/122           |   6 +-
  tests/qemu-iotests/123           |   4 +-
  tests/qemu-iotests/125           |   2 +-
  tests/qemu-iotests/137           |  17 +++-
  tests/qemu-iotests/137.out       |   6 +-
  tests/qemu-iotests/138           |   8 +-
  tests/qemu-iotests/141           |   4 +-
  tests/qemu-iotests/142           |   2 +-
  tests/qemu-iotests/144           |   4 +-
  tests/qemu-iotests/153           |  12 +--
  tests/qemu-iotests/156           |  10 +-
  tests/qemu-iotests/159           |   2 +-
  tests/qemu-iotests/160           |   3 +-
  tests/qemu-iotests/161           |   4 +-
  tests/qemu-iotests/170           |   2 +-
  tests/qemu-iotests/172           |   6 +-
  tests/qemu-iotests/173           |   3 +-
  tests/qemu-iotests/174           |   2 +-
  tests/qemu-iotests/175           |   2 +-
  tests/qemu-iotests/176           |   7 +-
  tests/qemu-iotests/178           |   6 +-
  tests/qemu-iotests/182           |   2 +-
  tests/qemu-iotests/183           |   2 +-
  tests/qemu-iotests/185           |   4 +-
  tests/qemu-iotests/187           |   6 +-
  tests/qemu-iotests/190           |   4 +-
  tests/qemu-iotests/191           |  11 +-
  tests/qemu-iotests/195           |   2 +-
  tests/qemu-iotests/197           |   6 +-
  tests/qemu-iotests/198           |   6 +-
  tests/qemu-iotests/198.out       |   4 +-
  tests/qemu-iotests/200           |   7 +-
  tests/qemu-iotests/201           |   6 +-
  tests/qemu-iotests/214           |  46 ++++++++-
  tests/qemu-iotests/214.out       |  14 +++
  tests/qemu-iotests/215           |   6 +-
  tests/qemu-iotests/217           |   3 +-
  tests/qemu-iotests/220           |   5 +-
  tests/qemu-iotests/225           |   2 +-
  tests/qemu-iotests/229           |   3 +-
  tests/qemu-iotests/232           |   4 +-
  tests/qemu-iotests/235           |   2 +-
  tests/qemu-iotests/243           |  10 +-
  tests/qemu-iotests/244           |  15 +--
  tests/qemu-iotests/247           |   4 +-
  tests/qemu-iotests/249           |   4 +-
  tests/qemu-iotests/250           |   5 +-
  tests/qemu-iotests/252           |   2 +-
  tests/qemu-iotests/261           |   5 +-
  tests/qemu-iotests/265           |   2 +-
  tests/qemu-iotests/267           |  17 ++--
  tests/qemu-iotests/273           |   3 +
  tests/qemu-iotests/check         |   6 +-
  tests/qemu-iotests/common.filter |  47 ++++++++-
  tests/qemu-iotests/common.rc     |  63 ++++++++++--
  tests/qemu-iotests/iotests.py    |  18 ++--
  tests/qemu-iotests/qcow2.py      |  23 ++++-
 files changed, 1139 insertions(+), 552 deletions(-)
  create mode 100644 block/filter-compress.c
 --
-.24.1
+.41.0

-[PULL 01/34] block: Add bdrv_qapi_perm_to_blk_perm()
+[PULL 1/5] iothread: Set the GSource "name" field
-We need some way to correlate QAPI BlockPermission values with
+From: Fabiano Rosas <farosas@suse.de>
 BLK_PERM_* flags.  We could:
-(1) have the same order in the QAPI definition as the the BLK_PERM_*
+Having a name in the source helps with debugging core dumps when one
-    flags are in LSb-first order.  However, then there is no guarantee
+might not have access to TLS data to cross-reference AioContexts with
-    that they actually match (e.g. when someone modifies the QAPI schema
+their addresses.
     without thinking of the BLK_PERM_* definitions).
     We could add static assertions, but these would break what’s good
     about this solution, namely its simplicity.
-(2) define the BLK_PERM_* flags based on the BlockPermission values.
+Signed-off-by: Fabiano Rosas <farosas@suse.de>
-    But this way whenever someone were to modify the QAPI order
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-    (perfectly sensible in theory), the BLK_PERM_* values would change.
+Message-id: 20230905180359.14083-1-farosas@suse.de
-    Because these values are used for file locking, this might break
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-    file locking between different qemu versions.
+---
  iothread.c | 14 ++++++++------
 file changed, 8 insertions(+), 6 deletions(-)
-Therefore, go the slightly more cumbersome way: Add a function to
+diff --git a/iothread.c b/iothread.c
 translate from the QAPI constants to the BLK_PERM_* flags.
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20191108123455.39445-2-mreitz@redhat.com
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block.c               | 18 ++++++++++++++++++
  include/block/block.h |  1 +
 files changed, 19 insertions(+)
 diff --git a/block.c b/block.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/iothread.c
-+++ b/block.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
+@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
-     *nshared = shared;
+     qemu_sem_destroy(&iothread->init_done_sem);
  }
-+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
+-static void iothread_init_gcontext(IOThread *iothread)
-+{
++static void iothread_init_gcontext(IOThread *iothread, const char *thread_name)
-+    static const uint64_t permissions[] = {
+ {
-+        [BLOCK_PERMISSION_CONSISTENT_READ]  = BLK_PERM_CONSISTENT_READ,
+     GSource *source;
-+        [BLOCK_PERMISSION_WRITE]            = BLK_PERM_WRITE,
++    g_autofree char *name = g_strdup_printf("%s aio-context", thread_name);
-+        [BLOCK_PERMISSION_WRITE_UNCHANGED]  = BLK_PERM_WRITE_UNCHANGED,
-+        [BLOCK_PERMISSION_RESIZE]           = BLK_PERM_RESIZE,
+     iothread->worker_context = g_main_context_new();
-+        [BLOCK_PERMISSION_GRAPH_MOD]        = BLK_PERM_GRAPH_MOD,
+     source = aio_get_g_source(iothread_get_aio_context(iothread));
-+    };
++    g_source_set_name(source, name);
      g_source_attach(source, iothread->worker_context);
      g_source_unref(source);
      iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
  {
      Error *local_error = NULL;
      IOThread *iothread = IOTHREAD(base);
 -    char *thread_name;
 +    g_autofree char *thread_name = NULL;
      iothread->stopping = false;
      iothread->running = true;
@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
          return;
      }
 +    thread_name = g_strdup_printf("IO %s",
 +                        object_get_canonical_path_component(OBJECT(base)));
 +
-+    QEMU_BUILD_BUG_ON(ARRAY_SIZE(permissions) != BLOCK_PERMISSION__MAX);
+     /*
-+    QEMU_BUILD_BUG_ON(1UL << ARRAY_SIZE(permissions) != BLK_PERM_ALL + 1);
+      * Init one GMainContext for the iothread unconditionally, even if
-+
+      * it's not used
-+    assert(qapi_perm < BLOCK_PERMISSION__MAX);
+      */
-+
+-    iothread_init_gcontext(iothread);
-+    return permissions[qapi_perm];
++    iothread_init_gcontext(iothread, thread_name);
-+}
-+
+     iothread_set_aio_context_params(base, &local_error);
- static void bdrv_replace_child_noperm(BdrvChild *child,
+     if (local_error) {
-                                       BlockDriverState *new_bs)
+@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
- {
+     /* This assumes we are called from a thread with useful CPU affinity for us
-diff --git a/include/block/block.h b/include/block/block.h
+      * to inherit.
-index XXXXXXX..XXXXXXX 100644
+      */
---- a/include/block/block.h
+-    thread_name = g_strdup_printf("IO %s",
-+++ b/include/block/block.h
+-                        object_get_canonical_path_component(OBJECT(base)));
-@@ -XXX,XX +XXX,XX @@ enum {
+     qemu_thread_create(&iothread->thread, thread_name, iothread_run,
- };
+                        iothread, QEMU_THREAD_JOINABLE);
+-    g_free(thread_name);
- char *bdrv_perm_names(uint64_t perm);
-+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm);
+     /* Wait for initialization to complete */
+     while (iothread->thread_id == -1) {
  /* disk I/O throttling */
  void bdrv_init(void);
 --
-.24.1
+.41.0

-[PULL 02/34] block: Use bdrv_qapi_perm_to_blk_perm()
+Deleted patch
-We can save some LoC in xdbg_graph_add_edge() by using
-bdrv_qapi_perm_to_blk_perm().
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191108123455.39445-3-mreitz@redhat.com
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block.c | 29 ++++++++---------------------
-file changed, 8 insertions(+), 21 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 xdbg_graph_add_node(XDbgBlockGraphConstructor *gr, void *node,
- static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *parent,
-                                 const BdrvChild *child)
- {
--    typedef struct {
--        unsigned int flag;
--        BlockPermission num;
--    } PermissionMap;
--
--    static const PermissionMap permissions[] = {
--        { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ },
--        { BLK_PERM_WRITE,           BLOCK_PERMISSION_WRITE },
--        { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED },
--        { BLK_PERM_RESIZE,          BLOCK_PERMISSION_RESIZE },
--        { BLK_PERM_GRAPH_MOD,       BLOCK_PERMISSION_GRAPH_MOD },
--        { 0, 0 }
--    };
--    const PermissionMap *p;
-+    BlockPermission qapi_perm;
-     XDbgBlockGraphEdge *edge;
--    QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) != BLK_PERM_ALL + 1);
--
-     edge = g_new0(XDbgBlockGraphEdge, 1);
-     edge->parent = xdbg_graph_node_num(gr, parent);
-     edge->child = xdbg_graph_node_num(gr, child->bs);
-     edge->name = g_strdup(child->name);
--    for (p = permissions; p->flag; p++) {
--        if (p->flag & child->perm) {
--            QAPI_LIST_ADD(edge->perm, p->num);
-+    for (qapi_perm = 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) {
-+        uint64_t flag = bdrv_qapi_perm_to_blk_perm(qapi_perm);
-+
-+        if (flag & child->perm) {
-+            QAPI_LIST_ADD(edge->perm, qapi_perm);
-         }
--        if (p->flag & child->shared_perm) {
--            QAPI_LIST_ADD(edge->shared_perm, p->num);
-+        if (flag & child->shared_perm) {
-+            QAPI_LIST_ADD(edge->shared_perm, qapi_perm);
-         }
-     }
---
-.24.1

-[PULL 30/34] block: introduce compress filter driver
+[PULL 2/5] hw/ufs: Initial commit for emulated Universal-Flash-Storage
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+From: Jeuk Kim <jeuk20.kim@samsung.com>
-Allow writing all the data compressed through the filter driver.
+Universal Flash Storage (UFS) is a high-performance mass storage device
-The written data will be aligned by the cluster size.
+with a serial interface. It is primarily used as a high-performance
-Based on the QEMU current implementation, that data can be written to
+data storage device for embedded applications.
 unallocated clusters only. May be used for a backup job.
-Suggested-by: Max Reitz <mreitz@redhat.com>
+This commit contains code for UFS device to be recognized
-Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+as a UFS PCI device.
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Patches to handle UFS logical unit and Transfer Request will follow.
-Message-id: 1575288906-551879-2-git-send-email-andrey.shinkevich@virtuozzo.com
-[mreitz: Replace NULL bdrv_get_format_name() by "(no format)"]
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 10232660d462ee5cd10cf673f1a9a1205fc8276c.1693980783.git.jeuk20.kim@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/Makefile.objs     |   1 +
+ MAINTAINERS              |    6 +
- block/filter-compress.c | 168 ++++++++++++++++++++++++++++++++++++++++
+ docs/specs/pci-ids.rst   |    2 +
- qapi/block-core.json    |  10 ++-
+ meson.build              |    1 +
-files changed, 175 insertions(+), 4 deletions(-)
+ hw/ufs/trace.h           |    1 +
- create mode 100644 block/filter-compress.c
+ hw/ufs/ufs.h             |   42 ++
  include/block/ufs.h      | 1090 ++++++++++++++++++++++++++++++++++++++
  include/hw/pci/pci.h     |    1 +
  include/hw/pci/pci_ids.h |    1 +
  hw/ufs/ufs.c             |  278 ++++++++++
  hw/Kconfig               |    1 +
  hw/meson.build           |    1 +
  hw/ufs/Kconfig           |    4 +
  hw/ufs/meson.build       |    1 +
  hw/ufs/trace-events      |   32 ++
 files changed, 1461 insertions(+)
  create mode 100644 hw/ufs/trace.h
  create mode 100644 hw/ufs/ufs.h
  create mode 100644 include/block/ufs.h
  create mode 100644 hw/ufs/ufs.c
  create mode 100644 hw/ufs/Kconfig
  create mode 100644 hw/ufs/meson.build
  create mode 100644 hw/ufs/trace-events
-diff --git a/block/Makefile.objs b/block/Makefile.objs
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/block/Makefile.objs
+--- a/MAINTAINERS
-+++ b/block/Makefile.objs
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ block-obj-y += crypto.o
+@@ -XXX,XX +XXX,XX @@ F: tests/qtest/nvme-test.c
+ F: docs/system/devices/nvme.rst
- block-obj-y += aio_task.o
+ T: git git://git.infradead.org/qemu-nvme.git nvme-next
- block-obj-y += backup-top.o
-+block-obj-y += filter-compress.o
++ufs
++M: Jeuk Kim <jeuk20.kim@samsung.com>
- common-obj-y += stream.o
++S: Supported
++F: hw/ufs/*
-diff --git a/block/filter-compress.c b/block/filter-compress.c
++F: include/block/ufs.h
 +
  megasas
  M: Hannes Reinecke <hare@suse.com>
  L: qemu-block@nongnu.org
 diff --git a/docs/specs/pci-ids.rst b/docs/specs/pci-ids.rst
 index XXXXXXX..XXXXXXX 100644
 --- a/docs/specs/pci-ids.rst
 +++ b/docs/specs/pci-ids.rst
@@ -XXX,XX +XXX,XX @@ PCI devices (other than virtio):
    PCI PVPanic device (``-device pvpanic-pci``)
 b36:0012
    PCI ACPI ERST device (``-device acpi-erst``)
 +1b36:0013
 +  PCI UFS device (``-device ufs``)
  All these devices are documented in :doc:`index`.
 diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/meson.build
 +++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system
      'hw/ssi',
      'hw/timer',
      'hw/tpm',
 +    'hw/ufs',
      'hw/usb',
      'hw/vfio',
      'hw/virtio',
 diff --git a/hw/ufs/trace.h b/hw/ufs/trace.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/block/filter-compress.c
++++ b/hw/ufs/trace.h
@@ -0,0 +1 @@
 +#include "trace/trace-hw_ufs.h"
 diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/ufs.h
 @@ -XXX,XX +XXX,XX @@
 +/*
-+ * Compress filter block driver
++ * QEMU UFS
 + *
-+ * Copyright (c) 2019 Virtuozzo International GmbH
++ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + *
-+ * Author:
++ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
 + *   Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
 + *   (based on block/copy-on-read.c by Max Reitz)
 + *
-+ * This program is free software; you can redistribute it and/or
++ * SPDX-License-Identifier: GPL-2.0-or-later
-+ * modify it under the terms of the GNU General Public License as
++ */
-+ * published by the Free Software Foundation; either version 2 or
++
-+ * (at your option) any later version of the License.
++#ifndef HW_UFS_UFS_H
 +#define HW_UFS_UFS_H
 +
 +#include "hw/pci/pci_device.h"
 +#include "hw/scsi/scsi.h"
 +#include "block/ufs.h"
 +
 +#define UFS_MAX_LUS 32
 +#define UFS_BLOCK_SIZE 4096
 +
 +typedef struct UfsParams {
 +    char *serial;
 +    uint8_t nutrs; /* Number of UTP Transfer Request Slots */
 +    uint8_t nutmrs; /* Number of UTP Task Management Request Slots */
 +} UfsParams;
 +
 +typedef struct UfsHc {
 +    PCIDevice parent_obj;
 +    MemoryRegion iomem;
 +    UfsReg reg;
 +    UfsParams params;
 +    uint32_t reg_size;
 +
 +    qemu_irq irq;
 +    QEMUBH *doorbell_bh;
 +    QEMUBH *complete_bh;
 +} UfsHc;
 +
 +#define TYPE_UFS "ufs"
 +#define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 +
 +#endif /* HW_UFS_UFS_H */
 diff --git a/include/block/ufs.h b/include/block/ufs.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/include/block/ufs.h
@@ -XXX,XX +XXX,XX @@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
 +
 +#ifndef BLOCK_UFS_H
 +#define BLOCK_UFS_H
 +
 +#include "hw/registerfields.h"
 +
 +typedef struct QEMU_PACKED UfsReg {
 +    uint32_t cap;
 +    uint32_t rsvd0;
 +    uint32_t ver;
 +    uint32_t rsvd1;
 +    uint32_t hcpid;
 +    uint32_t hcmid;
 +    uint32_t ahit;
 +    uint32_t rsvd2;
 +    uint32_t is;
 +    uint32_t ie;
 +    uint32_t rsvd3[2];
 +    uint32_t hcs;
 +    uint32_t hce;
 +    uint32_t uecpa;
 +    uint32_t uecdl;
 +    uint32_t uecn;
 +    uint32_t uect;
 +    uint32_t uecdme;
 +    uint32_t utriacr;
 +    uint32_t utrlba;
 +    uint32_t utrlbau;
 +    uint32_t utrldbr;
 +    uint32_t utrlclr;
 +    uint32_t utrlrsr;
 +    uint32_t utrlcnr;
 +    uint32_t rsvd4[2];
 +    uint32_t utmrlba;
 +    uint32_t utmrlbau;
 +    uint32_t utmrldbr;
 +    uint32_t utmrlclr;
 +    uint32_t utmrlrsr;
 +    uint32_t rsvd5[3];
 +    uint32_t uiccmd;
 +    uint32_t ucmdarg1;
 +    uint32_t ucmdarg2;
 +    uint32_t ucmdarg3;
 +    uint32_t rsvd6[4];
 +    uint32_t rsvd7[4];
 +    uint32_t rsvd8[16];
 +    uint32_t ccap;
 +} UfsReg;
 +
 +REG32(CAP, offsetof(UfsReg, cap))
 +    FIELD(CAP, NUTRS, 0, 5)
 +    FIELD(CAP, RTT, 8, 8)
 +    FIELD(CAP, NUTMRS, 16, 3)
 +    FIELD(CAP, AUTOH8, 23, 1)
 +    FIELD(CAP, 64AS, 24, 1)
 +    FIELD(CAP, OODDS, 25, 1)
 +    FIELD(CAP, UICDMETMS, 26, 1)
 +    FIELD(CAP, CS, 28, 1)
 +REG32(VER, offsetof(UfsReg, ver))
 +REG32(HCPID, offsetof(UfsReg, hcpid))
 +REG32(HCMID, offsetof(UfsReg, hcmid))
 +REG32(AHIT, offsetof(UfsReg, ahit))
 +REG32(IS, offsetof(UfsReg, is))
 +    FIELD(IS, UTRCS, 0, 1)
 +    FIELD(IS, UDEPRI, 1, 1)
 +    FIELD(IS, UE, 2, 1)
 +    FIELD(IS, UTMS, 3, 1)
 +    FIELD(IS, UPMS, 4, 1)
 +    FIELD(IS, UHXS, 5, 1)
 +    FIELD(IS, UHES, 6, 1)
 +    FIELD(IS, ULLS, 7, 1)
 +    FIELD(IS, ULSS, 8, 1)
 +    FIELD(IS, UTMRCS, 9, 1)
 +    FIELD(IS, UCCS, 10, 1)
 +    FIELD(IS, DFES, 11, 1)
 +    FIELD(IS, UTPES, 12, 1)
 +    FIELD(IS, HCFES, 16, 1)
 +    FIELD(IS, SBFES, 17, 1)
 +    FIELD(IS, CEFES, 18, 1)
 +REG32(IE, offsetof(UfsReg, ie))
 +    FIELD(IE, UTRCE, 0, 1)
 +    FIELD(IE, UDEPRIE, 1, 1)
 +    FIELD(IE, UEE, 2, 1)
 +    FIELD(IE, UTMSE, 3, 1)
 +    FIELD(IE, UPMSE, 4, 1)
 +    FIELD(IE, UHXSE, 5, 1)
 +    FIELD(IE, UHESE, 6, 1)
 +    FIELD(IE, ULLSE, 7, 1)
 +    FIELD(IE, ULSSE, 8, 1)
 +    FIELD(IE, UTMRCE, 9, 1)
 +    FIELD(IE, UCCE, 10, 1)
 +    FIELD(IE, DFEE, 11, 1)
 +    FIELD(IE, UTPEE, 12, 1)
 +    FIELD(IE, HCFEE, 16, 1)
 +    FIELD(IE, SBFEE, 17, 1)
 +    FIELD(IE, CEFEE, 18, 1)
 +REG32(HCS, offsetof(UfsReg, hcs))
 +    FIELD(HCS, DP, 0, 1)
 +    FIELD(HCS, UTRLRDY, 1, 1)
 +    FIELD(HCS, UTMRLRDY, 2, 1)
 +    FIELD(HCS, UCRDY, 3, 1)
 +    FIELD(HCS, UPMCRS, 8, 3)
 +REG32(HCE, offsetof(UfsReg, hce))
 +    FIELD(HCE, HCE, 0, 1)
 +    FIELD(HCE, CGE, 1, 1)
 +REG32(UECPA, offsetof(UfsReg, uecpa))
 +REG32(UECDL, offsetof(UfsReg, uecdl))
 +REG32(UECN, offsetof(UfsReg, uecn))
 +REG32(UECT, offsetof(UfsReg, uect))
 +REG32(UECDME, offsetof(UfsReg, uecdme))
 +REG32(UTRIACR, offsetof(UfsReg, utriacr))
 +REG32(UTRLBA, offsetof(UfsReg, utrlba))
 +    FIELD(UTRLBA, UTRLBA, 9, 22)
 +REG32(UTRLBAU, offsetof(UfsReg, utrlbau))
 +REG32(UTRLDBR, offsetof(UfsReg, utrldbr))
 +REG32(UTRLCLR, offsetof(UfsReg, utrlclr))
 +REG32(UTRLRSR, offsetof(UfsReg, utrlrsr))
 +REG32(UTRLCNR, offsetof(UfsReg, utrlcnr))
 +REG32(UTMRLBA, offsetof(UfsReg, utmrlba))
 +    FIELD(UTMRLBA, UTMRLBA, 9, 22)
 +REG32(UTMRLBAU, offsetof(UfsReg, utmrlbau))
 +REG32(UTMRLDBR, offsetof(UfsReg, utmrldbr))
 +REG32(UTMRLCLR, offsetof(UfsReg, utmrlclr))
 +REG32(UTMRLRSR, offsetof(UfsReg, utmrlrsr))
 +REG32(UICCMD, offsetof(UfsReg, uiccmd))
 +REG32(UCMDARG1, offsetof(UfsReg, ucmdarg1))
 +REG32(UCMDARG2, offsetof(UfsReg, ucmdarg2))
 +REG32(UCMDARG3, offsetof(UfsReg, ucmdarg3))
 +REG32(CCAP, offsetof(UfsReg, ccap))
 +
 +#define UFS_INTR_MASK                                    \
 +    ((1 << R_IS_CEFES_SHIFT) | (1 << R_IS_SBFES_SHIFT) | \
 +     (1 << R_IS_HCFES_SHIFT) | (1 << R_IS_UTPES_SHIFT) | \
 +     (1 << R_IS_DFES_SHIFT) | (1 << R_IS_UCCS_SHIFT) |   \
 +     (1 << R_IS_UTMRCS_SHIFT) | (1 << R_IS_ULSS_SHIFT) | \
 +     (1 << R_IS_ULLS_SHIFT) | (1 << R_IS_UHES_SHIFT) |   \
 +     (1 << R_IS_UHXS_SHIFT) | (1 << R_IS_UPMS_SHIFT) |   \
 +     (1 << R_IS_UTMS_SHIFT) | (1 << R_IS_UE_SHIFT) |     \
 +     (1 << R_IS_UDEPRI_SHIFT) | (1 << R_IS_UTRCS_SHIFT))
 +
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT 24
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK 0xff
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE(dword0)                       \
 +    ((be32_to_cpu(dword0) >> UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT) & \
 +     UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK)
 +
 +#define UFS_UPIU_HEADER_QUERY_FUNC_SHIFT 16
 +#define UFS_UPIU_HEADER_QUERY_FUNC_MASK 0xff
 +#define UFS_UPIU_HEADER_QUERY_FUNC(dword1)                       \
 +    ((be32_to_cpu(dword1) >> UFS_UPIU_HEADER_QUERY_FUNC_SHIFT) & \
 +     UFS_UPIU_HEADER_QUERY_FUNC_MASK)
 +
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT 0
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK 0xffff
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH(dword2)                       \
 +    ((be32_to_cpu(dword2) >> UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT) & \
 +     UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK)
 +
 +typedef struct QEMU_PACKED DeviceDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t device;
 +    uint8_t device_class;
 +    uint8_t device_sub_class;
 +    uint8_t protocol;
 +    uint8_t number_lu;
 +    uint8_t number_wlu;
 +    uint8_t boot_enable;
 +    uint8_t descr_access_en;
 +    uint8_t init_power_mode;
 +    uint8_t high_priority_lun;
 +    uint8_t secure_removal_type;
 +    uint8_t security_lu;
 +    uint8_t background_ops_term_lat;
 +    uint8_t init_active_icc_level;
 +    uint16_t spec_version;
 +    uint16_t manufacture_date;
 +    uint8_t manufacturer_name;
 +    uint8_t product_name;
 +    uint8_t serial_number;
 +    uint8_t oem_id;
 +    uint16_t manufacturer_id;
 +    uint8_t ud_0_base_offset;
 +    uint8_t ud_config_p_length;
 +    uint8_t device_rtt_cap;
 +    uint16_t periodic_rtc_update;
 +    uint8_t ufs_features_support;
 +    uint8_t ffu_timeout;
 +    uint8_t queue_depth;
 +    uint16_t device_version;
 +    uint8_t num_secure_wp_area;
 +    uint32_t psa_max_data_size;
 +    uint8_t psa_state_timeout;
 +    uint8_t product_revision_level;
 +    uint8_t reserved[36];
 +    uint32_t extended_ufs_features_support;
 +    uint8_t write_booster_buffer_preserve_user_space_en;
 +    uint8_t write_booster_buffer_type;
 +    uint32_t num_shared_write_booster_buffer_alloc_units;
 +} DeviceDescriptor;
 +
 +typedef struct QEMU_PACKED GeometryDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t media_technology;
 +    uint8_t reserved;
 +    uint64_t total_raw_device_capacity;
 +    uint8_t max_number_lu;
 +    uint32_t segment_size;
 +    uint8_t allocation_unit_size;
 +    uint8_t min_addr_block_size;
 +    uint8_t optimal_read_block_size;
 +    uint8_t optimal_write_block_size;
 +    uint8_t max_in_buffer_size;
 +    uint8_t max_out_buffer_size;
 +    uint8_t rpmb_read_write_size;
 +    uint8_t dynamic_capacity_resource_policy;
 +    uint8_t data_ordering;
 +    uint8_t max_context_id_number;
 +    uint8_t sys_data_tag_unit_size;
 +    uint8_t sys_data_tag_res_size;
 +    uint8_t supported_sec_r_types;
 +    uint16_t supported_memory_types;
 +    uint32_t system_code_max_n_alloc_u;
 +    uint16_t system_code_cap_adj_fac;
 +    uint32_t non_persist_max_n_alloc_u;
 +    uint16_t non_persist_cap_adj_fac;
 +    uint32_t enhanced_1_max_n_alloc_u;
 +    uint16_t enhanced_1_cap_adj_fac;
 +    uint32_t enhanced_2_max_n_alloc_u;
 +    uint16_t enhanced_2_cap_adj_fac;
 +    uint32_t enhanced_3_max_n_alloc_u;
 +    uint16_t enhanced_3_cap_adj_fac;
 +    uint32_t enhanced_4_max_n_alloc_u;
 +    uint16_t enhanced_4_cap_adj_fac;
 +    uint32_t optimal_logical_block_size;
 +    uint8_t reserved2[7];
 +    uint32_t write_booster_buffer_max_n_alloc_units;
 +    uint8_t device_max_write_booster_l_us;
 +    uint8_t write_booster_buffer_cap_adj_fac;
 +    uint8_t supported_write_booster_buffer_user_space_reduction_types;
 +    uint8_t supported_write_booster_buffer_types;
 +} GeometryDescriptor;
 +
 +#define UFS_GEOMETRY_CAPACITY_SHIFT 9
 +
 +typedef struct QEMU_PACKED UnitDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t unit_index;
 +    uint8_t lu_enable;
 +    uint8_t boot_lun_id;
 +    uint8_t lu_write_protect;
 +    uint8_t lu_queue_depth;
 +    uint8_t psa_sensitive;
 +    uint8_t memory_type;
 +    uint8_t data_reliability;
 +    uint8_t logical_block_size;
 +    uint64_t logical_block_count;
 +    uint32_t erase_block_size;
 +    uint8_t provisioning_type;
 +    uint64_t phy_mem_resource_count;
 +    uint16_t context_capabilities;
 +    uint8_t large_unit_granularity_m1;
 +    uint8_t reserved[6];
 +    uint32_t lu_num_write_booster_buffer_alloc_units;
 +} UnitDescriptor;
 +
 +typedef struct QEMU_PACKED RpmbUnitDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t unit_index;
 +    uint8_t lu_enable;
 +    uint8_t boot_lun_id;
 +    uint8_t lu_write_protect;
 +    uint8_t lu_queue_depth;
 +    uint8_t psa_sensitive;
 +    uint8_t memory_type;
 +    uint8_t reserved;
 +    uint8_t logical_block_size;
 +    uint64_t logical_block_count;
 +    uint32_t erase_block_size;
 +    uint8_t provisioning_type;
 +    uint64_t phy_mem_resource_count;
 +    uint8_t reserved2[3];
 +} RpmbUnitDescriptor;
 +
 +typedef struct QEMU_PACKED PowerParametersDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t active_icc_levels_vcc[16];
 +    uint16_t active_icc_levels_vccq[16];
 +    uint16_t active_icc_levels_vccq_2[16];
 +} PowerParametersDescriptor;
 +
 +typedef struct QEMU_PACKED InterconnectDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t bcd_unipro_version;
 +    uint16_t bcd_mphy_version;
 +} InterconnectDescriptor;
 +
 +typedef struct QEMU_PACKED StringDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t UC[126];
 +} StringDescriptor;
 +
 +typedef struct QEMU_PACKED DeviceHealthDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t pre_eol_info;
 +    uint8_t device_life_time_est_a;
 +    uint8_t device_life_time_est_b;
 +    uint8_t vendor_prop_info[32];
 +    uint32_t refresh_total_count;
 +    uint32_t refresh_progress;
 +} DeviceHealthDescriptor;
 +
 +typedef struct QEMU_PACKED Flags {
 +    uint8_t reserved;
 +    uint8_t device_init;
 +    uint8_t permanent_wp_en;
 +    uint8_t power_on_wp_en;
 +    uint8_t background_ops_en;
 +    uint8_t device_life_span_mode_en;
 +    uint8_t purge_enable;
 +    uint8_t refresh_enable;
 +    uint8_t phy_resource_removal;
 +    uint8_t busy_rtc;
 +    uint8_t reserved2;
 +    uint8_t permanently_disable_fw_update;
 +    uint8_t reserved3[2];
 +    uint8_t wb_en;
 +    uint8_t wb_buffer_flush_en;
 +    uint8_t wb_buffer_flush_during_hibernate;
 +    uint8_t reserved4[2];
 +} Flags;
 +
 +typedef struct Attributes {
 +    uint8_t boot_lun_en;
 +    uint8_t reserved;
 +    uint8_t current_power_mode;
 +    uint8_t active_icc_level;
 +    uint8_t out_of_order_data_en;
 +    uint8_t background_op_status;
 +    uint8_t purge_status;
 +    uint8_t max_data_in_size;
 +    uint8_t max_data_out_size;
 +    uint32_t dyn_cap_needed;
 +    uint8_t ref_clk_freq;
 +    uint8_t config_descr_lock;
 +    uint8_t max_num_of_rtt;
 +    uint16_t exception_event_control;
 +    uint16_t exception_event_status;
 +    uint32_t seconds_passed;
 +    uint16_t context_conf;
 +    uint8_t device_ffu_status;
 +    uint8_t psa_state;
 +    uint32_t psa_data_size;
 +    uint8_t ref_clk_gating_wait_time;
 +    uint8_t device_case_rough_temperaure;
 +    uint8_t device_too_high_temp_boundary;
 +    uint8_t device_too_low_temp_boundary;
 +    uint8_t throttling_status;
 +    uint8_t wb_buffer_flush_status;
 +    uint8_t available_wb_buffer_size;
 +    uint8_t wb_buffer_life_time_est;
 +    uint32_t current_wb_buffer_size;
 +    uint8_t refresh_status;
 +    uint8_t refresh_freq;
 +    uint8_t refresh_unit;
 +    uint8_t refresh_method;
 +} Attributes;
 +
 +#define UFS_TRANSACTION_SPECIFIC_FIELD_SIZE 20
 +#define UFS_MAX_QUERY_DATA_SIZE 256
 +
 +/* Command response result code */
 +typedef enum CommandRespCode {
 +    UFS_COMMAND_RESULT_SUCESS = 0x00,
 +    UFS_COMMAND_RESULT_FAIL = 0x01,
 +} CommandRespCode;
 +
 +enum {
 +    UFS_UPIU_FLAG_UNDERFLOW = 0x20,
 +    UFS_UPIU_FLAG_OVERFLOW = 0x40,
 +};
 +
 +typedef struct QEMU_PACKED UtpUpiuHeader {
 +    uint8_t trans_type;
 +    uint8_t flags;
 +    uint8_t lun;
 +    uint8_t task_tag;
 +    uint8_t iid_cmd_set_type;
 +    uint8_t query_func;
 +    uint8_t response;
 +    uint8_t scsi_status;
 +    uint8_t ehs_len;
 +    uint8_t device_inf;
 +    uint16_t data_segment_length;
 +} UtpUpiuHeader;
 +
 +/*
 + * The code below is copied from the linux kernel
 + * ("include/uapi/scsi/scsi_bsg_ufs.h") and modified to fit the qemu style.
 + */
 +
 +typedef struct QEMU_PACKED UtpUpiuQuery {
 +    uint8_t opcode;
 +    uint8_t idn;
 +    uint8_t index;
 +    uint8_t selector;
 +    uint16_t reserved_osf;
 +    uint16_t length;
 +    uint32_t value;
 +    uint32_t reserved[2];
 +    /* EHS length should be 0. We don't have to worry about EHS area. */
 +    uint8_t data[UFS_MAX_QUERY_DATA_SIZE];
 +} UtpUpiuQuery;
 +
 +#define UFS_CDB_SIZE 16
 +
 +/*
 + * struct UtpUpiuCmd - Command UPIU structure
 + * @data_transfer_len: Data Transfer Length DW-3
 + * @cdb: Command Descriptor Block CDB DW-4 to DW-7
 + */
 +typedef struct QEMU_PACKED UtpUpiuCmd {
 +    uint32_t exp_data_transfer_len;
 +    uint8_t cdb[UFS_CDB_SIZE];
 +} UtpUpiuCmd;
 +
 +/*
 + * struct UtpUpiuReq - general upiu request structure
 + * @header:UPIU header structure DW-0 to DW-2
 + * @sc: fields structure for scsi command DW-3 to DW-7
 + * @qr: fields structure for query request DW-3 to DW-7
 + * @uc: use utp_upiu_query to host the 4 dwords of uic command
 + */
 +typedef struct QEMU_PACKED UtpUpiuReq {
 +    UtpUpiuHeader header;
 +    union {
 +        UtpUpiuCmd sc;
 +        UtpUpiuQuery qr;
 +    };
 +} UtpUpiuReq;
 +
 +/*
 + * The code below is copied from the linux kernel ("include/ufs/ufshci.h") and
 + * modified to fit the qemu style.
 + */
 +
 +enum {
 +    UFS_PWR_OK = 0x0,
 +    UFS_PWR_LOCAL = 0x01,
 +    UFS_PWR_REMOTE = 0x02,
 +    UFS_PWR_BUSY = 0x03,
 +    UFS_PWR_ERROR_CAP = 0x04,
 +    UFS_PWR_FATAL_ERROR = 0x05,
 +};
 +
 +/* UIC Commands */
 +enum uic_cmd_dme {
 +    UFS_UIC_CMD_DME_GET = 0x01,
 +    UFS_UIC_CMD_DME_SET = 0x02,
 +    UFS_UIC_CMD_DME_PEER_GET = 0x03,
 +    UFS_UIC_CMD_DME_PEER_SET = 0x04,
 +    UFS_UIC_CMD_DME_POWERON = 0x10,
 +    UFS_UIC_CMD_DME_POWEROFF = 0x11,
 +    UFS_UIC_CMD_DME_ENABLE = 0x12,
 +    UFS_UIC_CMD_DME_RESET = 0x14,
 +    UFS_UIC_CMD_DME_END_PT_RST = 0x15,
 +    UFS_UIC_CMD_DME_LINK_STARTUP = 0x16,
 +    UFS_UIC_CMD_DME_HIBER_ENTER = 0x17,
 +    UFS_UIC_CMD_DME_HIBER_EXIT = 0x18,
 +    UFS_UIC_CMD_DME_TEST_MODE = 0x1A,
 +};
 +
 +/* UIC Config result code / Generic error code */
 +enum {
 +    UFS_UIC_CMD_RESULT_SUCCESS = 0x00,
 +    UFS_UIC_CMD_RESULT_INVALID_ATTR = 0x01,
 +    UFS_UIC_CMD_RESULT_FAILURE = 0x01,
 +    UFS_UIC_CMD_RESULT_INVALID_ATTR_VALUE = 0x02,
 +    UFS_UIC_CMD_RESULT_READ_ONLY_ATTR = 0x03,
 +    UFS_UIC_CMD_RESULT_WRITE_ONLY_ATTR = 0x04,
 +    UFS_UIC_CMD_RESULT_BAD_INDEX = 0x05,
 +    UFS_UIC_CMD_RESULT_LOCKED_ATTR = 0x06,
 +    UFS_UIC_CMD_RESULT_BAD_TEST_FEATURE_INDEX = 0x07,
 +    UFS_UIC_CMD_RESULT_PEER_COMM_FAILURE = 0x08,
 +    UFS_UIC_CMD_RESULT_BUSY = 0x09,
 +    UFS_UIC_CMD_RESULT_DME_FAILURE = 0x0A,
 +};
 +
 +#define UFS_MASK_UIC_COMMAND_RESULT 0xFF
 +
 +/*
 + * Request Descriptor Definitions
 + */
 +
 +/* Transfer request command type */
 +enum {
 +    UFS_UTP_CMD_TYPE_SCSI = 0x0,
 +    UFS_UTP_CMD_TYPE_UFS = 0x1,
 +    UFS_UTP_CMD_TYPE_DEV_MANAGE = 0x2,
 +};
 +
 +/* To accommodate UFS2.0 required Command type */
 +enum {
 +    UFS_UTP_CMD_TYPE_UFS_STORAGE = 0x1,
 +};
 +
 +enum {
 +    UFS_UTP_SCSI_COMMAND = 0x00000000,
 +    UFS_UTP_NATIVE_UFS_COMMAND = 0x10000000,
 +    UFS_UTP_DEVICE_MANAGEMENT_FUNCTION = 0x20000000,
 +    UFS_UTP_REQ_DESC_INT_CMD = 0x01000000,
 +    UFS_UTP_REQ_DESC_CRYPTO_ENABLE_CMD = 0x00800000,
 +};
 +
 +/* UTP Transfer Request Data Direction (DD) */
 +enum {
 +    UFS_UTP_NO_DATA_TRANSFER = 0x00000000,
 +    UFS_UTP_HOST_TO_DEVICE = 0x02000000,
 +    UFS_UTP_DEVICE_TO_HOST = 0x04000000,
 +};
 +
 +/* Overall command status values */
 +enum UtpOcsCodes {
 +    UFS_OCS_SUCCESS = 0x0,
 +    UFS_OCS_INVALID_CMD_TABLE_ATTR = 0x1,
 +    UFS_OCS_INVALID_PRDT_ATTR = 0x2,
 +    UFS_OCS_MISMATCH_DATA_BUF_SIZE = 0x3,
 +    UFS_OCS_MISMATCH_RESP_UPIU_SIZE = 0x4,
 +    UFS_OCS_PEER_COMM_FAILURE = 0x5,
 +    UFS_OCS_ABORTED = 0x6,
 +    UFS_OCS_FATAL_ERROR = 0x7,
 +    UFS_OCS_DEVICE_FATAL_ERROR = 0x8,
 +    UFS_OCS_INVALID_CRYPTO_CONFIG = 0x9,
 +    UFS_OCS_GENERAL_CRYPTO_ERROR = 0xa,
 +    UFS_OCS_INVALID_COMMAND_STATUS = 0xf,
 +};
 +
 +enum {
 +    UFS_MASK_OCS = 0x0F,
 +};
 +
 +/*
 + * struct UfshcdSgEntry - UFSHCI PRD Entry
 + * @addr: Physical address; DW-0 and DW-1.
 + * @reserved: Reserved for future use DW-2
 + * @size: size of physical segment DW-3
 + */
 +typedef struct QEMU_PACKED UfshcdSgEntry {
 +    uint64_t addr;
 +    uint32_t reserved;
 +    uint32_t size;
 +    /*
 +     * followed by variant-specific fields if
 +     * CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE has been defined.
 +     */
 +} UfshcdSgEntry;
 +
 +/*
 + * struct RequestDescHeader - Descriptor Header common to both UTRD and UTMRD
 + * @dword0: Descriptor Header DW0
 + * @dword1: Descriptor Header DW1
 + * @dword2: Descriptor Header DW2
 + * @dword3: Descriptor Header DW3
 + */
 +typedef struct QEMU_PACKED RequestDescHeader {
 +    uint32_t dword_0;
 +    uint32_t dword_1;
 +    uint32_t dword_2;
 +    uint32_t dword_3;
 +} RequestDescHeader;
 +
 +/*
 + * struct UtpTransferReqDesc - UTP Transfer Request Descriptor (UTRD)
 + * @header: UTRD header DW-0 to DW-3
 + * @command_desc_base_addr_lo: UCD base address low DW-4
 + * @command_desc_base_addr_hi: UCD base address high DW-5
 + * @response_upiu_length: response UPIU length DW-6
 + * @response_upiu_offset: response UPIU offset DW-6
 + * @prd_table_length: Physical region descriptor length DW-7
 + * @prd_table_offset: Physical region descriptor offset DW-7
 + */
 +typedef struct QEMU_PACKED UtpTransferReqDesc {
 +    /* DW 0-3 */
 +    RequestDescHeader header;
 +
 +    /* DW 4-5*/
 +    uint32_t command_desc_base_addr_lo;
 +    uint32_t command_desc_base_addr_hi;
 +
 +    /* DW 6 */
 +    uint16_t response_upiu_length;
 +    uint16_t response_upiu_offset;
 +
 +    /* DW 7 */
 +    uint16_t prd_table_length;
 +    uint16_t prd_table_offset;
 +} UtpTransferReqDesc;
 +
 +/*
 + * UTMRD structure.
 + */
 +typedef struct QEMU_PACKED UtpTaskReqDesc {
 +    /* DW 0-3 */
 +    RequestDescHeader header;
 +
 +    /* DW 4-11 - Task request UPIU structure */
 +    struct {
 +        UtpUpiuHeader req_header;
 +        uint32_t input_param1;
 +        uint32_t input_param2;
 +        uint32_t input_param3;
 +        uint32_t reserved1[2];
 +    } upiu_req;
 +
 +    /* DW 12-19 - Task Management Response UPIU structure */
 +    struct {
 +        UtpUpiuHeader rsp_header;
 +        uint32_t output_param1;
 +        uint32_t output_param2;
 +        uint32_t reserved2[3];
 +    } upiu_rsp;
 +} UtpTaskReqDesc;
 +
 +/*
 + * The code below is copied from the linux kernel ("include/ufs/ufs.h") and
 + * modified to fit the qemu style.
 + */
 +
 +#define UFS_GENERAL_UPIU_REQUEST_SIZE (sizeof(UtpUpiuReq))
 +#define UFS_QUERY_DESC_MAX_SIZE 255
 +#define UFS_QUERY_DESC_MIN_SIZE 2
 +#define UFS_QUERY_DESC_HDR_SIZE 2
 +#define UFS_QUERY_OSF_SIZE (GENERAL_UPIU_REQUEST_SIZE - (sizeof(UtpUpiuHeader)))
 +#define UFS_SENSE_SIZE 18
 +
 +/*
 + * UFS device may have standard LUs and LUN id could be from 0x00 to
 + * 0x7F. Standard LUs use "Peripheral Device Addressing Format".
 + * UFS device may also have the Well Known LUs (also referred as W-LU)
 + * which again could be from 0x00 to 0x7F. For W-LUs, device only use
 + * the "Extended Addressing Format" which means the W-LUNs would be
 + * from 0xc100 (SCSI_W_LUN_BASE) onwards.
 + * This means max. LUN number reported from UFS device could be 0xC17F.
 + */
 +#define UFS_UPIU_MAX_UNIT_NUM_ID 0x7F
 +#define UFS_UPIU_WLUN_ID (1 << 7)
 +
 +/* WriteBooster buffer is available only for the logical unit from 0 to 7 */
 +#define UFS_UPIU_MAX_WB_LUN_ID 8
 +
 +/*
 + * WriteBooster buffer lifetime has a limit setted by vendor.
 + * If it is over the limit, WriteBooster feature will be disabled.
 + */
 +#define UFS_WB_EXCEED_LIFETIME 0x0B
 +
 +/*
 + * In UFS Spec, the Extra Header Segment (EHS) starts from byte 32 in UPIU
 + * request/response packet
 + */
 +#define UFS_EHS_OFFSET_IN_RESPONSE 32
 +
 +/* Well known logical unit id in LUN field of UPIU */
 +enum {
 +    UFS_UPIU_REPORT_LUNS_WLUN = 0x81,
 +    UFS_UPIU_UFS_DEVICE_WLUN = 0xD0,
 +    UFS_UPIU_BOOT_WLUN = 0xB0,
 +    UFS_UPIU_RPMB_WLUN = 0xC4,
 +};
 +
 +/*
 + * UFS Protocol Information Unit related definitions
 + */
 +
 +/* Task management functions */
 +enum {
 +    UFS_ABORT_TASK = 0x01,
 +    UFS_ABORT_TASK_SET = 0x02,
 +    UFS_CLEAR_TASK_SET = 0x04,
 +    UFS_LOGICAL_RESET = 0x08,
 +    UFS_QUERY_TASK = 0x80,
 +    UFS_QUERY_TASK_SET = 0x81,
 +};
 +
 +/* UTP UPIU Transaction Codes Initiator to Target */
 +enum {
 +    UFS_UPIU_TRANSACTION_NOP_OUT = 0x00,
 +    UFS_UPIU_TRANSACTION_COMMAND = 0x01,
 +    UFS_UPIU_TRANSACTION_DATA_OUT = 0x02,
 +    UFS_UPIU_TRANSACTION_TASK_REQ = 0x04,
 +    UFS_UPIU_TRANSACTION_QUERY_REQ = 0x16,
 +};
 +
 +/* UTP UPIU Transaction Codes Target to Initiator */
 +enum {
 +    UFS_UPIU_TRANSACTION_NOP_IN = 0x20,
 +    UFS_UPIU_TRANSACTION_RESPONSE = 0x21,
 +    UFS_UPIU_TRANSACTION_DATA_IN = 0x22,
 +    UFS_UPIU_TRANSACTION_TASK_RSP = 0x24,
 +    UFS_UPIU_TRANSACTION_READY_XFER = 0x31,
 +    UFS_UPIU_TRANSACTION_QUERY_RSP = 0x36,
 +    UFS_UPIU_TRANSACTION_REJECT_UPIU = 0x3F,
 +};
 +
 +/* UPIU Read/Write flags */
 +enum {
 +    UFS_UPIU_CMD_FLAGS_NONE = 0x00,
 +    UFS_UPIU_CMD_FLAGS_WRITE = 0x20,
 +    UFS_UPIU_CMD_FLAGS_READ = 0x40,
 +};
 +
 +/* UPIU Task Attributes */
 +enum {
 +    UFS_UPIU_TASK_ATTR_SIMPLE = 0x00,
 +    UFS_UPIU_TASK_ATTR_ORDERED = 0x01,
 +    UFS_UPIU_TASK_ATTR_HEADQ = 0x02,
 +    UFS_UPIU_TASK_ATTR_ACA = 0x03,
 +};
 +
 +/* UPIU Query request function */
 +enum {
 +    UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST = 0x01,
 +    UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST = 0x81,
 +};
 +
 +/* Flag idn for Query Requests*/
 +enum flag_idn {
 +    UFS_QUERY_FLAG_IDN_FDEVICEINIT = 0x01,
 +    UFS_QUERY_FLAG_IDN_PERMANENT_WPE = 0x02,
 +    UFS_QUERY_FLAG_IDN_PWR_ON_WPE = 0x03,
 +    UFS_QUERY_FLAG_IDN_BKOPS_EN = 0x04,
 +    UFS_QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE = 0x05,
 +    UFS_QUERY_FLAG_IDN_PURGE_ENABLE = 0x06,
 +    UFS_QUERY_FLAG_IDN_REFRESH_ENABLE = 0x07,
 +    UFS_QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL = 0x08,
 +    UFS_QUERY_FLAG_IDN_BUSY_RTC = 0x09,
 +    UFS_QUERY_FLAG_IDN_RESERVED3 = 0x0A,
 +    UFS_QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE = 0x0B,
 +    UFS_QUERY_FLAG_IDN_WB_EN = 0x0E,
 +    UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN = 0x0F,
 +    UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 = 0x10,
 +    UFS_QUERY_FLAG_IDN_HPB_RESET = 0x11,
 +    UFS_QUERY_FLAG_IDN_HPB_EN = 0x12,
 +    UFS_QUERY_FLAG_IDN_COUNT,
 +};
 +
 +/* Attribute idn for Query requests */
 +enum attr_idn {
 +    UFS_QUERY_ATTR_IDN_BOOT_LU_EN = 0x00,
 +    UFS_QUERY_ATTR_IDN_MAX_HPB_SINGLE_CMD = 0x01,
 +    UFS_QUERY_ATTR_IDN_POWER_MODE = 0x02,
 +    UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL = 0x03,
 +    UFS_QUERY_ATTR_IDN_OOO_DATA_EN = 0x04,
 +    UFS_QUERY_ATTR_IDN_BKOPS_STATUS = 0x05,
 +    UFS_QUERY_ATTR_IDN_PURGE_STATUS = 0x06,
 +    UFS_QUERY_ATTR_IDN_MAX_DATA_IN = 0x07,
 +    UFS_QUERY_ATTR_IDN_MAX_DATA_OUT = 0x08,
 +    UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED = 0x09,
 +    UFS_QUERY_ATTR_IDN_REF_CLK_FREQ = 0x0A,
 +    UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK = 0x0B,
 +    UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT = 0x0C,
 +    UFS_QUERY_ATTR_IDN_EE_CONTROL = 0x0D,
 +    UFS_QUERY_ATTR_IDN_EE_STATUS = 0x0E,
 +    UFS_QUERY_ATTR_IDN_SECONDS_PASSED = 0x0F,
 +    UFS_QUERY_ATTR_IDN_CNTX_CONF = 0x10,
 +    UFS_QUERY_ATTR_IDN_CORR_PRG_BLK_NUM = 0x11,
 +    UFS_QUERY_ATTR_IDN_RESERVED2 = 0x12,
 +    UFS_QUERY_ATTR_IDN_RESERVED3 = 0x13,
 +    UFS_QUERY_ATTR_IDN_FFU_STATUS = 0x14,
 +    UFS_QUERY_ATTR_IDN_PSA_STATE = 0x15,
 +    UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16,
 +    UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17,
 +    UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP = 0x18,
 +    UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND = 0x19,
 +    UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND = 0x1A,
 +    UFS_QUERY_ATTR_IDN_THROTTLING_STATUS = 0x1B,
 +    UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS = 0x1C,
 +    UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE = 0x1D,
 +    UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST = 0x1E,
 +    UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE = 0x1F,
 +    UFS_QUERY_ATTR_IDN_REFRESH_STATUS = 0x2C,
 +    UFS_QUERY_ATTR_IDN_REFRESH_FREQ = 0x2D,
 +    UFS_QUERY_ATTR_IDN_REFRESH_UNIT = 0x2E,
 +    UFS_QUERY_ATTR_IDN_COUNT,
 +};
 +
 +/* Descriptor idn for Query requests */
 +enum desc_idn {
 +    UFS_QUERY_DESC_IDN_DEVICE = 0x0,
 +    UFS_QUERY_DESC_IDN_CONFIGURATION = 0x1,
 +    UFS_QUERY_DESC_IDN_UNIT = 0x2,
 +    UFS_QUERY_DESC_IDN_RFU_0 = 0x3,
 +    UFS_QUERY_DESC_IDN_INTERCONNECT = 0x4,
 +    UFS_QUERY_DESC_IDN_STRING = 0x5,
 +    UFS_QUERY_DESC_IDN_RFU_1 = 0x6,
 +    UFS_QUERY_DESC_IDN_GEOMETRY = 0x7,
 +    UFS_QUERY_DESC_IDN_POWER = 0x8,
 +    UFS_QUERY_DESC_IDN_HEALTH = 0x9,
 +    UFS_QUERY_DESC_IDN_MAX,
 +};
 +
 +enum desc_header_offset {
 +    UFS_QUERY_DESC_LENGTH_OFFSET = 0x00,
 +    UFS_QUERY_DESC_DESC_TYPE_OFFSET = 0x01,
 +};
 +
 +/* Unit descriptor parameters offsets in bytes*/
 +enum unit_desc_param {
 +    UFS_UNIT_DESC_PARAM_LEN = 0x0,
 +    UFS_UNIT_DESC_PARAM_TYPE = 0x1,
 +    UFS_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
 +    UFS_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
 +    UFS_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
 +    UFS_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
 +    UFS_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
 +    UFS_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
 +    UFS_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
 +    UFS_UNIT_DESC_PARAM_DATA_RELIABILITY = 0x9,
 +    UFS_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
 +    UFS_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
 +    UFS_UNIT_DESC_PARAM_ERASE_BLK_SIZE = 0x13,
 +    UFS_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
 +    UFS_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
 +    UFS_UNIT_DESC_PARAM_CTX_CAPABILITIES = 0x20,
 +    UFS_UNIT_DESC_PARAM_LARGE_UNIT_SIZE_M1 = 0x22,
 +    UFS_UNIT_DESC_PARAM_HPB_LU_MAX_ACTIVE_RGNS = 0x23,
 +    UFS_UNIT_DESC_PARAM_HPB_PIN_RGN_START_OFF = 0x25,
 +    UFS_UNIT_DESC_PARAM_HPB_NUM_PIN_RGNS = 0x27,
 +    UFS_UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS = 0x29,
 +};
 +
 +/* RPMB Unit descriptor parameters offsets in bytes*/
 +enum rpmb_unit_desc_param {
 +    UFS_RPMB_UNIT_DESC_PARAM_LEN = 0x0,
 +    UFS_RPMB_UNIT_DESC_PARAM_TYPE = 0x1,
 +    UFS_RPMB_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
 +    UFS_RPMB_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
 +    UFS_RPMB_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
 +    UFS_RPMB_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
 +    UFS_RPMB_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
 +    UFS_RPMB_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
 +    UFS_RPMB_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
 +    UFS_RPMB_UNIT_DESC_PARAM_REGION_EN = 0x9,
 +    UFS_RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
 +    UFS_RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
 +    UFS_RPMB_UNIT_DESC_PARAM_REGION0_SIZE = 0x13,
 +    UFS_RPMB_UNIT_DESC_PARAM_REGION1_SIZE = 0x14,
 +    UFS_RPMB_UNIT_DESC_PARAM_REGION2_SIZE = 0x15,
 +    UFS_RPMB_UNIT_DESC_PARAM_REGION3_SIZE = 0x16,
 +    UFS_RPMB_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
 +    UFS_RPMB_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
 +};
 +
 +/* Device descriptor parameters offsets in bytes*/
 +enum device_desc_param {
 +    UFS_DEVICE_DESC_PARAM_LEN = 0x0,
 +    UFS_DEVICE_DESC_PARAM_TYPE = 0x1,
 +    UFS_DEVICE_DESC_PARAM_DEVICE_TYPE = 0x2,
 +    UFS_DEVICE_DESC_PARAM_DEVICE_CLASS = 0x3,
 +    UFS_DEVICE_DESC_PARAM_DEVICE_SUB_CLASS = 0x4,
 +    UFS_DEVICE_DESC_PARAM_PRTCL = 0x5,
 +    UFS_DEVICE_DESC_PARAM_NUM_LU = 0x6,
 +    UFS_DEVICE_DESC_PARAM_NUM_WLU = 0x7,
 +    UFS_DEVICE_DESC_PARAM_BOOT_ENBL = 0x8,
 +    UFS_DEVICE_DESC_PARAM_DESC_ACCSS_ENBL = 0x9,
 +    UFS_DEVICE_DESC_PARAM_INIT_PWR_MODE = 0xA,
 +    UFS_DEVICE_DESC_PARAM_HIGH_PR_LUN = 0xB,
 +    UFS_DEVICE_DESC_PARAM_SEC_RMV_TYPE = 0xC,
 +    UFS_DEVICE_DESC_PARAM_SEC_LU = 0xD,
 +    UFS_DEVICE_DESC_PARAM_BKOP_TERM_LT = 0xE,
 +    UFS_DEVICE_DESC_PARAM_ACTVE_ICC_LVL = 0xF,
 +    UFS_DEVICE_DESC_PARAM_SPEC_VER = 0x10,
 +    UFS_DEVICE_DESC_PARAM_MANF_DATE = 0x12,
 +    UFS_DEVICE_DESC_PARAM_MANF_NAME = 0x14,
 +    UFS_DEVICE_DESC_PARAM_PRDCT_NAME = 0x15,
 +    UFS_DEVICE_DESC_PARAM_SN = 0x16,
 +    UFS_DEVICE_DESC_PARAM_OEM_ID = 0x17,
 +    UFS_DEVICE_DESC_PARAM_MANF_ID = 0x18,
 +    UFS_DEVICE_DESC_PARAM_UD_OFFSET = 0x1A,
 +    UFS_DEVICE_DESC_PARAM_UD_LEN = 0x1B,
 +    UFS_DEVICE_DESC_PARAM_RTT_CAP = 0x1C,
 +    UFS_DEVICE_DESC_PARAM_FRQ_RTC = 0x1D,
 +    UFS_DEVICE_DESC_PARAM_UFS_FEAT = 0x1F,
 +    UFS_DEVICE_DESC_PARAM_FFU_TMT = 0x20,
 +    UFS_DEVICE_DESC_PARAM_Q_DPTH = 0x21,
 +    UFS_DEVICE_DESC_PARAM_DEV_VER = 0x22,
 +    UFS_DEVICE_DESC_PARAM_NUM_SEC_WPA = 0x24,
 +    UFS_DEVICE_DESC_PARAM_PSA_MAX_DATA = 0x25,
 +    UFS_DEVICE_DESC_PARAM_PSA_TMT = 0x29,
 +    UFS_DEVICE_DESC_PARAM_PRDCT_REV = 0x2A,
 +    UFS_DEVICE_DESC_PARAM_HPB_VER = 0x40,
 +    UFS_DEVICE_DESC_PARAM_HPB_CONTROL = 0x42,
 +    UFS_DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP = 0x4F,
 +    UFS_DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN = 0x53,
 +    UFS_DEVICE_DESC_PARAM_WB_TYPE = 0x54,
 +    UFS_DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS = 0x55,
 +};
 +
 +/* Interconnect descriptor parameters offsets in bytes*/
 +enum interconnect_desc_param {
 +    UFS_INTERCONNECT_DESC_PARAM_LEN = 0x0,
 +    UFS_INTERCONNECT_DESC_PARAM_TYPE = 0x1,
 +    UFS_INTERCONNECT_DESC_PARAM_UNIPRO_VER = 0x2,
 +    UFS_INTERCONNECT_DESC_PARAM_MPHY_VER = 0x4,
 +};
 +
 +/* Geometry descriptor parameters offsets in bytes*/
 +enum geometry_desc_param {
 +    UFS_GEOMETRY_DESC_PARAM_LEN = 0x0,
 +    UFS_GEOMETRY_DESC_PARAM_TYPE = 0x1,
 +    UFS_GEOMETRY_DESC_PARAM_DEV_CAP = 0x4,
 +    UFS_GEOMETRY_DESC_PARAM_MAX_NUM_LUN = 0xC,
 +    UFS_GEOMETRY_DESC_PARAM_SEG_SIZE = 0xD,
 +    UFS_GEOMETRY_DESC_PARAM_ALLOC_UNIT_SIZE = 0x11,
 +    UFS_GEOMETRY_DESC_PARAM_MIN_BLK_SIZE = 0x12,
 +    UFS_GEOMETRY_DESC_PARAM_OPT_RD_BLK_SIZE = 0x13,
 +    UFS_GEOMETRY_DESC_PARAM_OPT_WR_BLK_SIZE = 0x14,
 +    UFS_GEOMETRY_DESC_PARAM_MAX_IN_BUF_SIZE = 0x15,
 +    UFS_GEOMETRY_DESC_PARAM_MAX_OUT_BUF_SIZE = 0x16,
 +    UFS_GEOMETRY_DESC_PARAM_RPMB_RW_SIZE = 0x17,
 +    UFS_GEOMETRY_DESC_PARAM_DYN_CAP_RSRC_PLC = 0x18,
 +    UFS_GEOMETRY_DESC_PARAM_DATA_ORDER = 0x19,
 +    UFS_GEOMETRY_DESC_PARAM_MAX_NUM_CTX = 0x1A,
 +    UFS_GEOMETRY_DESC_PARAM_TAG_UNIT_SIZE = 0x1B,
 +    UFS_GEOMETRY_DESC_PARAM_TAG_RSRC_SIZE = 0x1C,
 +    UFS_GEOMETRY_DESC_PARAM_SEC_RM_TYPES = 0x1D,
 +    UFS_GEOMETRY_DESC_PARAM_MEM_TYPES = 0x1E,
 +    UFS_GEOMETRY_DESC_PARAM_SCM_MAX_NUM_UNITS = 0x20,
 +    UFS_GEOMETRY_DESC_PARAM_SCM_CAP_ADJ_FCTR = 0x24,
 +    UFS_GEOMETRY_DESC_PARAM_NPM_MAX_NUM_UNITS = 0x26,
 +    UFS_GEOMETRY_DESC_PARAM_NPM_CAP_ADJ_FCTR = 0x2A,
 +    UFS_GEOMETRY_DESC_PARAM_ENM1_MAX_NUM_UNITS = 0x2C,
 +    UFS_GEOMETRY_DESC_PARAM_ENM1_CAP_ADJ_FCTR = 0x30,
 +    UFS_GEOMETRY_DESC_PARAM_ENM2_MAX_NUM_UNITS = 0x32,
 +    UFS_GEOMETRY_DESC_PARAM_ENM2_CAP_ADJ_FCTR = 0x36,
 +    UFS_GEOMETRY_DESC_PARAM_ENM3_MAX_NUM_UNITS = 0x38,
 +    UFS_GEOMETRY_DESC_PARAM_ENM3_CAP_ADJ_FCTR = 0x3C,
 +    UFS_GEOMETRY_DESC_PARAM_ENM4_MAX_NUM_UNITS = 0x3E,
 +    UFS_GEOMETRY_DESC_PARAM_ENM4_CAP_ADJ_FCTR = 0x42,
 +    UFS_GEOMETRY_DESC_PARAM_OPT_LOG_BLK_SIZE = 0x44,
 +    UFS_GEOMETRY_DESC_PARAM_HPB_REGION_SIZE = 0x48,
 +    UFS_GEOMETRY_DESC_PARAM_HPB_NUMBER_LU = 0x49,
 +    UFS_GEOMETRY_DESC_PARAM_HPB_SUBREGION_SIZE = 0x4A,
 +    UFS_GEOMETRY_DESC_PARAM_HPB_MAX_ACTIVE_REGS = 0x4B,
 +    UFS_GEOMETRY_DESC_PARAM_WB_MAX_ALLOC_UNITS = 0x4F,
 +    UFS_GEOMETRY_DESC_PARAM_WB_MAX_WB_LUNS = 0x53,
 +    UFS_GEOMETRY_DESC_PARAM_WB_BUFF_CAP_ADJ = 0x54,
 +    UFS_GEOMETRY_DESC_PARAM_WB_SUP_RED_TYPE = 0x55,
 +    UFS_GEOMETRY_DESC_PARAM_WB_SUP_WB_TYPE = 0x56,
 +};
 +
 +/* Health descriptor parameters offsets in bytes*/
 +enum health_desc_param {
 +    UFS_HEALTH_DESC_PARAM_LEN = 0x0,
 +    UFS_HEALTH_DESC_PARAM_TYPE = 0x1,
 +    UFS_HEALTH_DESC_PARAM_EOL_INFO = 0x2,
 +    UFS_HEALTH_DESC_PARAM_LIFE_TIME_EST_A = 0x3,
 +    UFS_HEALTH_DESC_PARAM_LIFE_TIME_EST_B = 0x4,
 +};
 +
 +/* WriteBooster buffer mode */
 +enum {
 +    UFS_WB_BUF_MODE_LU_DEDICATED = 0x0,
 +    UFS_WB_BUF_MODE_SHARED = 0x1,
 +};
 +
 +/*
 + * Logical Unit Write Protect
 + * 00h: LU not write protected
 + * 01h: LU write protected when fPowerOnWPEn =1
 + * 02h: LU permanently write protected when fPermanentWPEn =1
 + */
 +enum ufs_lu_wp_type {
 +    UFS_LU_NO_WP = 0x00,
 +    UFS_LU_POWER_ON_WP = 0x01,
 +    UFS_LU_PERM_WP = 0x02,
 +};
 +
 +/* UTP QUERY Transaction Specific Fields OpCode */
 +enum query_opcode {
 +    UFS_UPIU_QUERY_OPCODE_NOP = 0x0,
 +    UFS_UPIU_QUERY_OPCODE_READ_DESC = 0x1,
 +    UFS_UPIU_QUERY_OPCODE_WRITE_DESC = 0x2,
 +    UFS_UPIU_QUERY_OPCODE_READ_ATTR = 0x3,
 +    UFS_UPIU_QUERY_OPCODE_WRITE_ATTR = 0x4,
 +    UFS_UPIU_QUERY_OPCODE_READ_FLAG = 0x5,
 +    UFS_UPIU_QUERY_OPCODE_SET_FLAG = 0x6,
 +    UFS_UPIU_QUERY_OPCODE_CLEAR_FLAG = 0x7,
 +    UFS_UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8,
 +};
 +
 +/* Query response result code */
 +typedef enum QueryRespCode {
 +    UFS_QUERY_RESULT_SUCCESS = 0x00,
 +    UFS_QUERY_RESULT_NOT_READABLE = 0xF6,
 +    UFS_QUERY_RESULT_NOT_WRITEABLE = 0xF7,
 +    UFS_QUERY_RESULT_ALREADY_WRITTEN = 0xF8,
 +    UFS_QUERY_RESULT_INVALID_LENGTH = 0xF9,
 +    UFS_QUERY_RESULT_INVALID_VALUE = 0xFA,
 +    UFS_QUERY_RESULT_INVALID_SELECTOR = 0xFB,
 +    UFS_QUERY_RESULT_INVALID_INDEX = 0xFC,
 +    UFS_QUERY_RESULT_INVALID_IDN = 0xFD,
 +    UFS_QUERY_RESULT_INVALID_OPCODE = 0xFE,
 +    UFS_QUERY_RESULT_GENERAL_FAILURE = 0xFF,
 +} QueryRespCode;
 +
 +/* UTP Transfer Request Command Type (CT) */
 +enum {
 +    UFS_UPIU_COMMAND_SET_TYPE_SCSI = 0x0,
 +    UFS_UPIU_COMMAND_SET_TYPE_UFS = 0x1,
 +    UFS_UPIU_COMMAND_SET_TYPE_QUERY = 0x2,
 +};
 +
 +/* Task management service response */
 +enum {
 +    UFS_UPIU_TASK_MANAGEMENT_FUNC_COMPL = 0x00,
 +    UFS_UPIU_TASK_MANAGEMENT_FUNC_NOT_SUPPORTED = 0x04,
 +    UFS_UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED = 0x08,
 +    UFS_UPIU_TASK_MANAGEMENT_FUNC_FAILED = 0x05,
 +    UFS_UPIU_INCORRECT_LOGICAL_UNIT_NO = 0x09,
 +};
 +
 +/* UFS device power modes */
 +enum ufs_dev_pwr_mode {
 +    UFS_ACTIVE_PWR_MODE = 1,
 +    UFS_SLEEP_PWR_MODE = 2,
 +    UFS_POWERDOWN_PWR_MODE = 3,
 +    UFS_DEEPSLEEP_PWR_MODE = 4,
 +};
 +
 +/*
 + * struct UtpCmdRsp - Response UPIU structure
 + * @residual_transfer_count: Residual transfer count DW-3
 + * @reserved: Reserved double words DW-4 to DW-7
 + * @sense_data_len: Sense data length DW-8 U16
 + * @sense_data: Sense data field DW-8 to DW-12
 + */
 +typedef struct QEMU_PACKED UtpCmdRsp {
 +    uint32_t residual_transfer_count;
 +    uint32_t reserved[4];
 +    uint16_t sense_data_len;
 +    uint8_t sense_data[UFS_SENSE_SIZE];
 +} UtpCmdRsp;
 +
 +/*
 + * struct UtpUpiuRsp - general upiu response structure
 + * @header: UPIU header structure DW-0 to DW-2
 + * @sr: fields structure for scsi command DW-3 to DW-12
 + * @qr: fields structure for query request DW-3 to DW-7
 + */
 +typedef struct QEMU_PACKED UtpUpiuRsp {
 +    UtpUpiuHeader header;
 +    union {
 +        UtpCmdRsp sr;
 +        UtpUpiuQuery qr;
 +    };
 +} UtpUpiuRsp;
 +
 +static inline void _ufs_check_size(void)
 +{
 +    QEMU_BUILD_BUG_ON(sizeof(UfsReg) != 0x104);
 +    QEMU_BUILD_BUG_ON(sizeof(DeviceDescriptor) != 89);
 +    QEMU_BUILD_BUG_ON(sizeof(GeometryDescriptor) != 87);
 +    QEMU_BUILD_BUG_ON(sizeof(UnitDescriptor) != 45);
 +    QEMU_BUILD_BUG_ON(sizeof(RpmbUnitDescriptor) != 35);
 +    QEMU_BUILD_BUG_ON(sizeof(PowerParametersDescriptor) != 98);
 +    QEMU_BUILD_BUG_ON(sizeof(InterconnectDescriptor) != 6);
 +    QEMU_BUILD_BUG_ON(sizeof(StringDescriptor) != 254);
 +    QEMU_BUILD_BUG_ON(sizeof(DeviceHealthDescriptor) != 45);
 +    QEMU_BUILD_BUG_ON(sizeof(Flags) != 0x13);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuHeader) != 12);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuQuery) != 276);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuCmd) != 20);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuReq) != 288);
 +    QEMU_BUILD_BUG_ON(sizeof(UfshcdSgEntry) != 16);
 +    QEMU_BUILD_BUG_ON(sizeof(RequestDescHeader) != 16);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpTransferReqDesc) != 32);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpTaskReqDesc) != 80);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpCmdRsp) != 40);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuRsp) != 288);
 +}
 +#endif
 diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/pci/pci.h
 +++ b/include/hw/pci/pci.h
@@ -XXX,XX +XXX,XX @@ extern bool pci_available;
  #define PCI_DEVICE_ID_REDHAT_NVME        0x0010
  #define PCI_DEVICE_ID_REDHAT_PVPANIC     0x0011
  #define PCI_DEVICE_ID_REDHAT_ACPI_ERST   0x0012
 +#define PCI_DEVICE_ID_REDHAT_UFS         0x0013
  #define PCI_DEVICE_ID_REDHAT_QXL         0x0100
  #define FMT_PCIBUS                      PRIx64
 diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/pci/pci_ids.h
 +++ b/include/hw/pci/pci_ids.h
@@ -XXX,XX +XXX,XX @@
  #define PCI_CLASS_STORAGE_SATA           0x0106
  #define PCI_CLASS_STORAGE_SAS            0x0107
  #define PCI_CLASS_STORAGE_EXPRESS        0x0108
 +#define PCI_CLASS_STORAGE_UFS            0x0109
  #define PCI_CLASS_STORAGE_OTHER          0x0180
  #define PCI_BASE_CLASS_NETWORK           0x02
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * QEMU Universal Flash Storage (UFS) Controller
 + *
-+ * This program is distributed in the hope that it will be useful,
++ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
-+ * You should have received a copy of the GNU General Public License
++ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ *
 + * SPDX-License-Identifier: GPL-2.0-or-later
 + */
 +
 +#include "qemu/osdep.h"
-+#include "block/block_int.h"
-+#include "qemu/module.h"
 +#include "qapi/error.h"
-+
++#include "migration/vmstate.h"
-+
++#include "trace.h"
-+static int compress_open(BlockDriverState *bs, QDict *options, int flags,
++#include "ufs.h"
-+                         Error **errp)
++
 +/* The QEMU-UFS device follows spec version 3.1 */
 +#define UFS_SPEC_VER 0x00000310
 +#define UFS_MAX_NUTRS 32
 +#define UFS_MAX_NUTMRS 8
 +
 +static void ufs_irq_check(UfsHc *u)
 +{
-+    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false,
++    PCIDevice *pci = PCI_DEVICE(u);
-+                               errp);
++
-+    if (!bs->file) {
++    if ((u->reg.is & UFS_INTR_MASK) & u->reg.ie) {
-+        return -EINVAL;
++        trace_ufs_irq_raise();
 +        pci_irq_assert(pci);
 +    } else {
 +        trace_ufs_irq_lower();
 +        pci_irq_deassert(pci);
 +    }
-+
++}
-+    if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) {
++
-+        error_setg(errp,
++static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
-+                   "Compression is not supported for underlying format: %s",
++{
-+                   bdrv_get_format_name(bs->file->bs) ?: "(no format)");
++    trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
-+
++                             u->reg.ucmdarg3);
-+        return -ENOTSUP;
++    /*
 +     * Only the essential uic commands for running drivers on Linux and Windows
 +     * are implemented.
 +     */
 +    switch (val) {
 +    case UFS_UIC_CMD_DME_LINK_STARTUP:
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, DP, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTRLRDY, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTMRLRDY, 1);
 +        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    /* TODO: Revisit it when Power Management is implemented */
 +    case UFS_UIC_CMD_DME_HIBER_ENTER:
 +        u->reg.is = FIELD_DP32(u->reg.is, IS, UHES, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, UFS_PWR_LOCAL);
 +        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    case UFS_UIC_CMD_DME_HIBER_EXIT:
 +        u->reg.is = FIELD_DP32(u->reg.is, IS, UHXS, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, UFS_PWR_LOCAL);
 +        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    default:
 +        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_FAILURE;
 +    }
 +
-+    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
++    u->reg.is = FIELD_DP32(u->reg.is, IS, UCCS, 1);
-+        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);
++
-+
++    ufs_irq_check(u);
 +    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
 +        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
 +            bs->file->bs->supported_zero_flags);
 +
 +    return 0;
 +}
 +
-+
++static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
 +static int64_t compress_getlength(BlockDriverState *bs)
 +{
-+    return bdrv_getlength(bs->file->bs);
++    switch (offset) {
 +    case A_IS:
 +        u->reg.is &= ~data;
 +        ufs_irq_check(u);
 +        break;
 +    case A_IE:
 +        u->reg.ie = data;
 +        ufs_irq_check(u);
 +        break;
 +    case A_HCE:
 +        if (!FIELD_EX32(u->reg.hce, HCE, HCE) && FIELD_EX32(data, HCE, HCE)) {
 +            u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UCRDY, 1);
 +            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 1);
 +        } else if (FIELD_EX32(u->reg.hce, HCE, HCE) &&
 +                   !FIELD_EX32(data, HCE, HCE)) {
 +            u->reg.hcs = 0;
 +            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 0);
 +        }
 +        break;
 +    case A_UTRLBA:
 +        u->reg.utrlba = data & R_UTRLBA_UTRLBA_MASK;
 +        break;
 +    case A_UTRLBAU:
 +        u->reg.utrlbau = data;
 +        break;
 +    case A_UTRLDBR:
 +        /* Not yet supported */
 +        break;
 +    case A_UTRLRSR:
 +        u->reg.utrlrsr = data;
 +        break;
 +    case A_UTRLCNR:
 +        u->reg.utrlcnr &= ~data;
 +        break;
 +    case A_UTMRLBA:
 +        u->reg.utmrlba = data & R_UTMRLBA_UTMRLBA_MASK;
 +        break;
 +    case A_UTMRLBAU:
 +        u->reg.utmrlbau = data;
 +        break;
 +    case A_UICCMD:
 +        ufs_process_uiccmd(u, data);
 +        break;
 +    case A_UCMDARG1:
 +        u->reg.ucmdarg1 = data;
 +        break;
 +    case A_UCMDARG2:
 +        u->reg.ucmdarg2 = data;
 +        break;
 +    case A_UCMDARG3:
 +        u->reg.ucmdarg3 = data;
 +        break;
 +    case A_UTRLCLR:
 +    case A_UTMRLDBR:
 +    case A_UTMRLCLR:
 +    case A_UTMRLRSR:
 +        trace_ufs_err_unsupport_register_offset(offset);
 +        break;
 +    default:
 +        trace_ufs_err_invalid_register_offset(offset);
 +        break;
 +    }
 +}
 +
-+
++static uint64_t ufs_mmio_read(void *opaque, hwaddr addr, unsigned size)
 +static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs,
 +                                                uint64_t offset, uint64_t bytes,
 +                                                QEMUIOVector *qiov,
 +                                                size_t qiov_offset,
 +                                                int flags)
 +{
-+    return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset,
++    UfsHc *u = (UfsHc *)opaque;
-+                               flags);
++    uint8_t *ptr = (uint8_t *)&u->reg;
 +    uint64_t value;
 +
 +    if (addr > sizeof(u->reg) - size) {
 +        trace_ufs_err_invalid_register_offset(addr);
 +        return 0;
 +    }
 +
 +    value = *(uint32_t *)(ptr + addr);
 +    trace_ufs_mmio_read(addr, value, size);
 +    return value;
 +}
 +
-+
++static void ufs_mmio_write(void *opaque, hwaddr addr, uint64_t data,
-+static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs,
++                           unsigned size)
 +                                                 uint64_t offset,
 +                                                 uint64_t bytes,
 +                                                 QEMUIOVector *qiov,
 +                                                 size_t qiov_offset, int flags)
 +{
-+    return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset,
++    UfsHc *u = (UfsHc *)opaque;
-+                                flags | BDRV_REQ_WRITE_COMPRESSED);
++
-+}
++    if (addr > sizeof(u->reg) - size) {
-+
++        trace_ufs_err_invalid_register_offset(addr);
 +
 +static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs,
 +                                                  int64_t offset, int bytes,
 +                                                  BdrvRequestFlags flags)
 +{
 +    return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
 +}
 +
 +
 +static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs,
 +                                             int64_t offset, int bytes)
 +{
 +    return bdrv_co_pdiscard(bs->file, offset, bytes);
 +}
 +
 +
 +static void compress_refresh_limits(BlockDriverState *bs, Error **errp)
 +{
 +    BlockDriverInfo bdi;
 +    int ret;
 +
 +    if (!bs->file) {
 +        return;
 +    }
 +
-+    ret = bdrv_get_info(bs->file->bs, &bdi);
++    trace_ufs_mmio_write(addr, data, size);
-+    if (ret < 0 || bdi.cluster_size == 0) {
++    ufs_write_reg(u, addr, data, size);
 +}
 +
 +static const MemoryRegionOps ufs_mmio_ops = {
 +    .read = ufs_mmio_read,
 +    .write = ufs_mmio_write,
 +    .endianness = DEVICE_LITTLE_ENDIAN,
 +    .impl = {
 +        .min_access_size = 4,
 +        .max_access_size = 4,
 +    },
 +};
 +
 +static bool ufs_check_constraints(UfsHc *u, Error **errp)
 +{
 +    if (u->params.nutrs > UFS_MAX_NUTRS) {
 +        error_setg(errp, "nutrs must be less than or equal to %d",
 +                   UFS_MAX_NUTRS);
 +        return false;
 +    }
 +
 +    if (u->params.nutmrs > UFS_MAX_NUTMRS) {
 +        error_setg(errp, "nutmrs must be less than or equal to %d",
 +                   UFS_MAX_NUTMRS);
 +        return false;
 +    }
 +
 +    return true;
 +}
 +
 +static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
 +{
 +    uint8_t *pci_conf = pci_dev->config;
 +
 +    pci_conf[PCI_INTERRUPT_PIN] = 1;
 +    pci_config_set_prog_interface(pci_conf, 0x1);
 +
 +    memory_region_init_io(&u->iomem, OBJECT(u), &ufs_mmio_ops, u, "ufs",
 +                          u->reg_size);
 +    pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &u->iomem);
 +    u->irq = pci_allocate_irq(pci_dev);
 +}
 +
 +static void ufs_init_hc(UfsHc *u)
 +{
 +    uint32_t cap = 0;
 +
 +    u->reg_size = pow2ceil(sizeof(UfsReg));
 +
 +    memset(&u->reg, 0, sizeof(u->reg));
 +    cap = FIELD_DP32(cap, CAP, NUTRS, (u->params.nutrs - 1));
 +    cap = FIELD_DP32(cap, CAP, RTT, 2);
 +    cap = FIELD_DP32(cap, CAP, NUTMRS, (u->params.nutmrs - 1));
 +    cap = FIELD_DP32(cap, CAP, AUTOH8, 0);
 +    cap = FIELD_DP32(cap, CAP, 64AS, 1);
 +    cap = FIELD_DP32(cap, CAP, OODDS, 0);
 +    cap = FIELD_DP32(cap, CAP, UICDMETMS, 0);
 +    cap = FIELD_DP32(cap, CAP, CS, 0);
 +    u->reg.cap = cap;
 +    u->reg.ver = UFS_SPEC_VER;
 +}
 +
 +static void ufs_realize(PCIDevice *pci_dev, Error **errp)
 +{
 +    UfsHc *u = UFS(pci_dev);
 +
 +    if (!ufs_check_constraints(u, errp)) {
 +        return;
 +    }
 +
-+    bs->bl.request_alignment = bdi.cluster_size;
++    ufs_init_hc(u);
 +    ufs_init_pci(u, pci_dev);
 +}
 +
-+
++static Property ufs_props[] = {
-+static void compress_eject(BlockDriverState *bs, bool eject_flag)
++    DEFINE_PROP_STRING("serial", UfsHc, params.serial),
 +    DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
 +    DEFINE_PROP_UINT8("nutmrs", UfsHc, params.nutmrs, 8),
 +    DEFINE_PROP_END_OF_LIST(),
 +};
 +
 +static const VMStateDescription ufs_vmstate = {
 +    .name = "ufs",
 +    .unmigratable = 1,
 +};
 +
 +static void ufs_class_init(ObjectClass *oc, void *data)
 +{
-+    bdrv_eject(bs->file->bs, eject_flag);
++    DeviceClass *dc = DEVICE_CLASS(oc);
 +    PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
 +
 +    pc->realize = ufs_realize;
 +    pc->vendor_id = PCI_VENDOR_ID_REDHAT;
 +    pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
 +    pc->class_id = PCI_CLASS_STORAGE_UFS;
 +
 +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 +    dc->desc = "Universal Flash Storage";
 +    device_class_set_props(dc, ufs_props);
 +    dc->vmsd = &ufs_vmstate;
 +}
 +
-+
++static const TypeInfo ufs_info = {
-+static void compress_lock_medium(BlockDriverState *bs, bool locked)
++    .name = TYPE_UFS,
 +    .parent = TYPE_PCI_DEVICE,
 +    .class_init = ufs_class_init,
 +    .instance_size = sizeof(UfsHc),
 +    .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
 +};
 +
 +static void ufs_register_types(void)
 +{
-+    bdrv_lock_medium(bs->file->bs, locked);
++    type_register_static(&ufs_info);
 +}
 +
-+
++type_init(ufs_register_types)
-+static bool compress_recurse_is_first_non_filter(BlockDriverState *bs,
+diff --git a/hw/Kconfig b/hw/Kconfig
 +                                                 BlockDriverState *candidate)
 +{
 +    return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate);
 +}
 +
 +
 +static BlockDriver bdrv_compress = {
 +    .format_name                        = "compress",
 +
 +    .bdrv_open                          = compress_open,
 +    .bdrv_child_perm                    = bdrv_filter_default_perms,
 +
 +    .bdrv_getlength                     = compress_getlength,
 +
 +    .bdrv_co_preadv_part                = compress_co_preadv_part,
 +    .bdrv_co_pwritev_part               = compress_co_pwritev_part,
 +    .bdrv_co_pwrite_zeroes              = compress_co_pwrite_zeroes,
 +    .bdrv_co_pdiscard                   = compress_co_pdiscard,
 +    .bdrv_refresh_limits                = compress_refresh_limits,
 +
 +    .bdrv_eject                         = compress_eject,
 +    .bdrv_lock_medium                   = compress_lock_medium,
 +
 +    .bdrv_co_block_status               = bdrv_co_block_status_from_file,
 +
 +    .bdrv_recurse_is_first_non_filter   = compress_recurse_is_first_non_filter,
 +
 +    .has_variable_length                = true,
 +    .is_filter                          = true,
 +};
 +
 +static void bdrv_compress_init(void)
 +{
 +    bdrv_register(&bdrv_compress);
 +}
 +
 +block_init(bdrv_compress_init);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/Kconfig
-+++ b/qapi/block-core.json
++++ b/hw/Kconfig
@@ -XXX,XX +XXX,XX @@ source smbios/Kconfig
  source ssi/Kconfig
  source timer/Kconfig
  source tpm/Kconfig
 +source ufs/Kconfig
  source usb/Kconfig
  source virtio/Kconfig
  source vfio/Kconfig
 diff --git a/hw/meson.build b/hw/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/meson.build
 +++ b/hw/meson.build
@@ -XXX,XX +XXX,XX @@ subdir('smbios')
  subdir('ssi')
  subdir('timer')
  subdir('tpm')
 +subdir('ufs')
  subdir('usb')
  subdir('vfio')
  subdir('virtio')
 diff --git a/hw/ufs/Kconfig b/hw/ufs/Kconfig
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/Kconfig
 @@ -XXX,XX +XXX,XX @@
- # @copy-on-read: Since 3.0
++config UFS_PCI
- # @blklogwrites: Since 3.0
++    bool
- # @blkreplay: Since 4.2
++    default y if PCI_DEVICES
-+# @compress: Since 5.0
++    depends on PCI
- #
+diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
- # Since: 2.9
+new file mode 100644
- ##
+index XXXXXXX..XXXXXXX
- { 'enum': 'BlockdevDriver',
+--- /dev/null
-   'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
++++ b/hw/ufs/meson.build
--            'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster',
+@@ -0,0 +1 @@
--            'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
++system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
--            'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
+diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
--            'qcow2', 'qed', 'quorum', 'raw', 'rbd',
+new file mode 100644
-+            'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps',
+index XXXXXXX..XXXXXXX
-+            'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi',
+--- /dev/null
-+            'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
++++ b/hw/ufs/trace-events
 +            'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
              { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
              'sheepdog',
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 @@ -XXX,XX +XXX,XX @@
-       'blkreplay':  'BlockdevOptionsBlkreplay',
++# ufs.c
-       'bochs':      'BlockdevOptionsGenericFormat',
++ufs_irq_raise(void) "INTx"
-       'cloop':      'BlockdevOptionsGenericFormat',
++ufs_irq_lower(void) "INTx"
-+      'compress':   'BlockdevOptionsGenericFormat',
++ufs_mmio_read(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
-       'copy-on-read':'BlockdevOptionsGenericFormat',
++ufs_mmio_write(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
-       'dmg':        'BlockdevOptionsGenericFormat',
++ufs_process_db(uint32_t slot) "UTRLDBR slot %"PRIu32""
-       'file':       'BlockdevOptionsFile',
++ufs_process_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_complete_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_sendback_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_exec_nop_cmd(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", lun 0x%"PRIx8", opcode 0x%"PRIx8""
 +ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
 +ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
 +
 +# error condition
 +ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 +ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
 +ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
 +ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 +ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
 +ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
 +ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
 +ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
 +ufs_err_scsi_cmd_invalid_lun(uint8_t lun) "scsi command has invalid lun: 0x%"PRIx8""
 +ufs_err_query_flag_not_readable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to read"
 +ufs_err_query_flag_not_writable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to write"
 +ufs_err_query_attr_not_readable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to read"
 +ufs_err_query_attr_not_writable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to write"
 +ufs_err_query_invalid_opcode(uint8_t opcode) "query request has invalid opcode. opcode: 0x%"PRIx8""
 +ufs_err_query_invalid_idn(uint8_t opcode, uint8_t idn) "query request has invalid idn. opcode: 0x%"PRIx8", idn 0x%"PRIx8""
 +ufs_err_query_invalid_index(uint8_t opcode, uint8_t index) "query request has invalid index. opcode: 0x%"PRIx8", index 0x%"PRIx8""
 +ufs_err_invalid_trans_code(uint32_t slot, uint8_t trans_code) "request upiu has invalid transaction code. slot: %"PRIu32", trans_code: 0x%"PRIx8""
 --
-.24.1
+.41.0

-[PULL 03/34] blkdebug: Allow taking/unsharing permissions
+[PULL 3/5] hw/ufs: Support for Query Transfer Requests
-Sometimes it is useful to be able to add a node to the block graph that
+From: Jeuk Kim <jeuk20.kim@samsung.com>
 takes or unshare a certain set of permissions for debugging purposes.
 This patch adds this capability to blkdebug.
-(Note that you cannot make blkdebug release or share permissions that it
+This commit makes the UFS device support query
-needs to take or cannot share, because this might result in assertion
+and nop out transfer requests.
 failures in the block layer.  But if the blkdebug node has no parents,
 it will not take any permissions and share everything by default, so you
 can then freely choose what permissions to take and share.)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+The next patch would be support for UFS logical
-Message-id: 20191108123455.39445-4-mreitz@redhat.com
+unit and scsi command transfer request.
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: ff7a5f0fd26761936a553ffb89d3df0ba62844e9.1693980783.git.jeuk20.kim@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/blkdebug.c     | 93 +++++++++++++++++++++++++++++++++++++++++++-
+ hw/ufs/ufs.h        |  46 +++
- qapi/block-core.json | 14 ++++++-
+ hw/ufs/ufs.c        | 988 +++++++++++++++++++++++++++++++++++++++++++-
-files changed, 105 insertions(+), 2 deletions(-)
+ hw/ufs/trace-events |   1 +
 files changed, 1033 insertions(+), 2 deletions(-)
-diff --git a/block/blkdebug.c b/block/blkdebug.c
+diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
 index XXXXXXX..XXXXXXX 100644
---- a/block/blkdebug.c
+--- a/hw/ufs/ufs.h
-+++ b/block/blkdebug.c
++++ b/hw/ufs/ufs.h
 @@ -XXX,XX +XXX,XX @@
- #include "qemu/cutils.h"
+ #define UFS_MAX_LUS 32
- #include "qemu/config-file.h"
+ #define UFS_BLOCK_SIZE 4096
- #include "block/block_int.h"
-+#include "block/qdict.h"
++typedef enum UfsRequestState {
- #include "qemu/module.h"
++    UFS_REQUEST_IDLE = 0,
- #include "qemu/option.h"
++    UFS_REQUEST_READY = 1,
-+#include "qapi/qapi-visit-block-core.h"
++    UFS_REQUEST_RUNNING = 2,
- #include "qapi/qmp/qdict.h"
++    UFS_REQUEST_COMPLETE = 3,
-+#include "qapi/qmp/qlist.h"
++    UFS_REQUEST_ERROR = 4,
- #include "qapi/qmp/qstring.h"
++} UfsRequestState;
-+#include "qapi/qobject-input-visitor.h"
++
- #include "sysemu/qtest.h"
++typedef enum UfsReqResult {
++    UFS_REQUEST_SUCCESS = 0,
- typedef struct BDRVBlkdebugState {
++    UFS_REQUEST_FAIL = 1,
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVBlkdebugState {
++} UfsReqResult;
-     uint64_t opt_discard;
++
-     uint64_t max_discard;
++typedef struct UfsRequest {
++    struct UfsHc *hc;
-+    uint64_t take_child_perms;
++    UfsRequestState state;
-+    uint64_t unshare_child_perms;
++    int slot;
 +
-     /* For blkdebug_refresh_filename() */
++    UtpTransferReqDesc utrd;
-     char *config_file;
++    UtpUpiuReq req_upiu;
++    UtpUpiuRsp rsp_upiu;
-@@ -XXX,XX +XXX,XX @@ static void blkdebug_parse_filename(const char *filename, QDict *options,
++
-     qdict_put_str(options, "x-image", filename);
++    /* for scsi command */
 +    QEMUSGList *sg;
 +} UfsRequest;
 +
  typedef struct UfsParams {
      char *serial;
      uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
      UfsReg reg;
      UfsParams params;
      uint32_t reg_size;
 +    UfsRequest *req_list;
 +
 +    DeviceDescriptor device_desc;
 +    GeometryDescriptor geometry_desc;
 +    Attributes attributes;
 +    Flags flags;
      qemu_irq irq;
      QEMUBH *doorbell_bh;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
  #define TYPE_UFS "ufs"
  #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 +typedef enum UfsQueryFlagPerm {
 +    UFS_QUERY_FLAG_NONE = 0x0,
 +    UFS_QUERY_FLAG_READ = 0x1,
 +    UFS_QUERY_FLAG_SET = 0x2,
 +    UFS_QUERY_FLAG_CLEAR = 0x4,
 +    UFS_QUERY_FLAG_TOGGLE = 0x8,
 +} UfsQueryFlagPerm;
 +
 +typedef enum UfsQueryAttrPerm {
 +    UFS_QUERY_ATTR_NONE = 0x0,
 +    UFS_QUERY_ATTR_READ = 0x1,
 +    UFS_QUERY_ATTR_WRITE = 0x2,
 +} UfsQueryAttrPerm;
 +
  #endif /* HW_UFS_UFS_H */
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/ufs.c
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
  #include "ufs.h"
  /* The QEMU-UFS device follows spec version 3.1 */
 -#define UFS_SPEC_VER 0x00000310
 +#define UFS_SPEC_VER 0x0310
  #define UFS_MAX_NUTRS 32
  #define UFS_MAX_NUTMRS 8
 +static MemTxResult ufs_addr_read(UfsHc *u, hwaddr addr, void *buf, int size)
 +{
 +    hwaddr hi = addr + size - 1;
 +
 +    if (hi < addr) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    return pci_dma_read(PCI_DEVICE(u), addr, buf, size);
 +}
 +
 +static MemTxResult ufs_addr_write(UfsHc *u, hwaddr addr, const void *buf,
 +                                  int size)
 +{
 +    hwaddr hi = addr + size - 1;
 +    if (hi < addr) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    return pci_dma_write(PCI_DEVICE(u), addr, buf, size);
 +}
 +
 +static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result);
 +
 +static inline hwaddr ufs_get_utrd_addr(UfsHc *u, uint32_t slot)
 +{
 +    hwaddr utrl_base_addr = (((hwaddr)u->reg.utrlbau) << 32) + u->reg.utrlba;
 +    hwaddr utrd_addr = utrl_base_addr + slot * sizeof(UtpTransferReqDesc);
 +
 +    return utrd_addr;
 +}
 +
 +static inline hwaddr ufs_get_req_upiu_base_addr(const UtpTransferReqDesc *utrd)
 +{
 +    uint32_t cmd_desc_base_addr_lo =
 +        le32_to_cpu(utrd->command_desc_base_addr_lo);
 +    uint32_t cmd_desc_base_addr_hi =
 +        le32_to_cpu(utrd->command_desc_base_addr_hi);
 +
 +    return (((hwaddr)cmd_desc_base_addr_hi) << 32) + cmd_desc_base_addr_lo;
 +}
 +
 +static inline hwaddr ufs_get_rsp_upiu_base_addr(const UtpTransferReqDesc *utrd)
 +{
 +    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(utrd);
 +    uint32_t rsp_upiu_byte_off =
 +        le16_to_cpu(utrd->response_upiu_offset) * sizeof(uint32_t);
 +    return req_upiu_base_addr + rsp_upiu_byte_off;
 +}
 +
 +static MemTxResult ufs_dma_read_utrd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
 +    MemTxResult ret;
 +
 +    ret = ufs_addr_read(u, utrd_addr, &req->utrd, sizeof(req->utrd));
 +    if (ret) {
 +        trace_ufs_err_dma_read_utrd(req->slot, utrd_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_read_req_upiu(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
 +    UtpUpiuReq *req_upiu = &req->req_upiu;
 +    uint32_t copy_size;
 +    uint16_t data_segment_length;
 +    MemTxResult ret;
 +
 +    /*
 +     * To know the size of the req_upiu, we need to read the
 +     * data_segment_length in the header first.
 +     */
 +    ret = ufs_addr_read(u, req_upiu_base_addr, &req_upiu->header,
 +                        sizeof(UtpUpiuHeader));
 +    if (ret) {
 +        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
 +        return ret;
 +    }
 +    data_segment_length = be16_to_cpu(req_upiu->header.data_segment_length);
 +
 +    copy_size = sizeof(UtpUpiuHeader) + UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
 +                data_segment_length;
 +
 +    ret = ufs_addr_read(u, req_upiu_base_addr, &req->req_upiu, copy_size);
 +    if (ret) {
 +        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_read_prdt(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint16_t prdt_len = le16_to_cpu(req->utrd.prd_table_length);
 +    uint16_t prdt_byte_off =
 +        le16_to_cpu(req->utrd.prd_table_offset) * sizeof(uint32_t);
 +    uint32_t prdt_size = prdt_len * sizeof(UfshcdSgEntry);
 +    g_autofree UfshcdSgEntry *prd_entries = NULL;
 +    hwaddr req_upiu_base_addr, prdt_base_addr;
 +    int err;
 +
 +    assert(!req->sg);
 +
 +    if (prdt_size == 0) {
 +        return MEMTX_OK;
 +    }
 +    prd_entries = g_new(UfshcdSgEntry, prdt_size);
 +
 +    req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
 +    prdt_base_addr = req_upiu_base_addr + prdt_byte_off;
 +
 +    err = ufs_addr_read(u, prdt_base_addr, prd_entries, prdt_size);
 +    if (err) {
 +        trace_ufs_err_dma_read_prdt(req->slot, prdt_base_addr);
 +        return err;
 +    }
 +
 +    req->sg = g_malloc0(sizeof(QEMUSGList));
 +    pci_dma_sglist_init(req->sg, PCI_DEVICE(u), prdt_len);
 +
 +    for (uint16_t i = 0; i < prdt_len; ++i) {
 +        hwaddr data_dma_addr = le64_to_cpu(prd_entries[i].addr);
 +        uint32_t data_byte_count = le32_to_cpu(prd_entries[i].size) + 1;
 +        qemu_sglist_add(req->sg, data_dma_addr, data_byte_count);
 +    }
 +    return MEMTX_OK;
 +}
 +
 +static MemTxResult ufs_dma_read_upiu(UfsRequest *req)
 +{
 +    MemTxResult ret;
 +
 +    ret = ufs_dma_read_utrd(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    ret = ufs_dma_read_req_upiu(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    ret = ufs_dma_read_prdt(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    return 0;
 +}
 +
 +static MemTxResult ufs_dma_write_utrd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
 +    MemTxResult ret;
 +
 +    ret = ufs_addr_write(u, utrd_addr, &req->utrd, sizeof(req->utrd));
 +    if (ret) {
 +        trace_ufs_err_dma_write_utrd(req->slot, utrd_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_write_rsp_upiu(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr rsp_upiu_base_addr = ufs_get_rsp_upiu_base_addr(&req->utrd);
 +    uint32_t rsp_upiu_byte_len =
 +        le16_to_cpu(req->utrd.response_upiu_length) * sizeof(uint32_t);
 +    uint16_t data_segment_length =
 +        be16_to_cpu(req->rsp_upiu.header.data_segment_length);
 +    uint32_t copy_size = sizeof(UtpUpiuHeader) +
 +                         UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
 +                         data_segment_length;
 +    MemTxResult ret;
 +
 +    if (copy_size > rsp_upiu_byte_len) {
 +        copy_size = rsp_upiu_byte_len;
 +    }
 +
 +    ret = ufs_addr_write(u, rsp_upiu_base_addr, &req->rsp_upiu, copy_size);
 +    if (ret) {
 +        trace_ufs_err_dma_write_rsp_upiu(req->slot, rsp_upiu_base_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_write_upiu(UfsRequest *req)
 +{
 +    MemTxResult ret;
 +
 +    ret = ufs_dma_write_rsp_upiu(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    return ufs_dma_write_utrd(req);
 +}
 +
  static void ufs_irq_check(UfsHc *u)
  {
      PCIDevice *pci = PCI_DEVICE(u);
@@ -XXX,XX +XXX,XX @@ static void ufs_irq_check(UfsHc *u)
      }
  }
-+static int blkdebug_parse_perm_list(uint64_t *dest, QDict *options,
++static void ufs_process_db(UfsHc *u, uint32_t val)
-+                                    const char *prefix, Error **errp)
++{
-+{
++    unsigned long doorbell;
-+    int ret = 0;
++    uint32_t slot;
-+    QDict *subqdict = NULL;
++    uint32_t nutrs = u->params.nutrs;
-+    QObject *crumpled_subqdict = NULL;
++    UfsRequest *req;
-+    Visitor *v = NULL;
++
-+    BlockPermissionList *perm_list = NULL, *element;
++    val &= ~u->reg.utrldbr;
-+    Error *local_err = NULL;
++    if (!val) {
-+
++        return;
-+    *dest = 0;
++    }
 +
-+    qdict_extract_subqdict(options, &subqdict, prefix);
++    doorbell = val;
-+    if (!qdict_size(subqdict)) {
++    slot = find_first_bit(&doorbell, nutrs);
-+        goto out;
++
-+    }
++    while (slot < nutrs) {
-+
++        req = &u->req_list[slot];
-+    crumpled_subqdict = qdict_crumple(subqdict, errp);
++        if (req->state == UFS_REQUEST_ERROR) {
-+    if (!crumpled_subqdict) {
++            trace_ufs_err_utrl_slot_error(req->slot);
-+        ret = -EINVAL;
++            return;
-+        goto out;
++        }
-+    }
++
-+
++        if (req->state != UFS_REQUEST_IDLE) {
-+    v = qobject_input_visitor_new(crumpled_subqdict);
++            trace_ufs_err_utrl_slot_busy(req->slot);
-+    visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err);
++            return;
-+    if (local_err) {
++        }
-+        error_propagate(errp, local_err);
++
-+        ret = -EINVAL;
++        trace_ufs_process_db(slot);
-+        goto out;
++        req->state = UFS_REQUEST_READY;
-+    }
++        slot = find_next_bit(&doorbell, nutrs, slot + 1);
-+
++    }
-+    for (element = perm_list; element; element = element->next) {
++
-+        *dest |= bdrv_qapi_perm_to_blk_perm(element->value);
++    qemu_bh_schedule(u->doorbell_bh);
-+    }
++}
 +
-+out:
+ static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
-+    qapi_free_BlockPermissionList(perm_list);
+ {
-+    visit_free(v);
+     trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
-+    qobject_unref(subqdict);
+@@ -XXX,XX +XXX,XX @@ static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
-+    qobject_unref(crumpled_subqdict);
+         u->reg.utrlbau = data;
-+    return ret;
+         break;
-+}
+     case A_UTRLDBR:
-+
+-        /* Not yet supported */
-+static int blkdebug_parse_perms(BDRVBlkdebugState *s, QDict *options,
++        ufs_process_db(u, data);
-+                                Error **errp)
++        u->reg.utrldbr |= data;
-+{
+         break;
-+    int ret;
+     case A_UTRLRSR:
-+
+         u->reg.utrlrsr = data;
-+    ret = blkdebug_parse_perm_list(&s->take_child_perms, options,
+@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
-+                                   "take-child-perms.", errp);
+     },
-+    if (ret < 0) {
+ };
 +static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
 +                                  uint8_t flags, uint8_t response,
 +                                  uint8_t scsi_status,
 +                                  uint16_t data_segment_length)
 +{
 +    memcpy(&req->rsp_upiu.header, &req->req_upiu.header, sizeof(UtpUpiuHeader));
 +    req->rsp_upiu.header.trans_type = trans_type;
 +    req->rsp_upiu.header.flags = flags;
 +    req->rsp_upiu.header.response = response;
 +    req->rsp_upiu.header.scsi_status = scsi_status;
 +    req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
 +}
 +
 +static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
 +{
 +    trace_ufs_exec_nop_cmd(req->slot);
 +    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_NOP_IN, 0, 0, 0, 0);
 +    return UFS_REQUEST_SUCCESS;
 +}
 +
 +/*
 + * This defines the permission of flags based on their IDN. There are some
 + * things that are declared read-only, which is inconsistent with the ufs spec,
 + * because we want to return an error for features that are not yet supported.
 + */
 +static const int flag_permission[UFS_QUERY_FLAG_IDN_COUNT] = {
 +    [UFS_QUERY_FLAG_IDN_FDEVICEINIT] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET,
 +    /* Write protection is not supported */
 +    [UFS_QUERY_FLAG_IDN_PERMANENT_WPE] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_PWR_ON_WPE] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_BKOPS_EN] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET |
 +                                    UFS_QUERY_FLAG_CLEAR |
 +                                    UFS_QUERY_FLAG_TOGGLE,
 +    [UFS_QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE] =
 +        UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET | UFS_QUERY_FLAG_CLEAR |
 +        UFS_QUERY_FLAG_TOGGLE,
 +    /* Purge Operation is not supported */
 +    [UFS_QUERY_FLAG_IDN_PURGE_ENABLE] = UFS_QUERY_FLAG_NONE,
 +    /* Refresh Operation is not supported */
 +    [UFS_QUERY_FLAG_IDN_REFRESH_ENABLE] = UFS_QUERY_FLAG_NONE,
 +    /* Physical Resource Removal is not supported */
 +    [UFS_QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_BUSY_RTC] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE] = UFS_QUERY_FLAG_READ,
 +    /* Write Booster is not supported */
 +    [UFS_QUERY_FLAG_IDN_WB_EN] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN] = UFS_QUERY_FLAG_READ,
 +    [UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8] = UFS_QUERY_FLAG_READ,
 +};
 +
 +static inline QueryRespCode ufs_flag_check_idn_valid(uint8_t idn, int op)
 +{
 +    if (idn >= UFS_QUERY_FLAG_IDN_COUNT) {
 +        return UFS_QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (!(flag_permission[idn] & op)) {
 +        if (op == UFS_QUERY_FLAG_READ) {
 +            trace_ufs_err_query_flag_not_readable(idn);
 +            return UFS_QUERY_RESULT_NOT_READABLE;
 +        }
 +        trace_ufs_err_query_flag_not_writable(idn);
 +        return UFS_QUERY_RESULT_NOT_WRITEABLE;
 +    }
 +
 +    return UFS_QUERY_RESULT_SUCCESS;
 +}
 +
 +static const int attr_permission[UFS_QUERY_ATTR_IDN_COUNT] = {
 +    /* booting is not supported */
 +    [UFS_QUERY_ATTR_IDN_BOOT_LU_EN] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_POWER_MODE] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_OOO_DATA_EN] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_BKOPS_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_PURGE_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_MAX_DATA_IN] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_MAX_DATA_OUT] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_REF_CLK_FREQ] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_EE_CONTROL] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_EE_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_SECONDS_PASSED] = UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_CNTX_CONF] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_FFU_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_PSA_STATE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_THROTTLING_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
 +    /* refresh operation is not supported */
 +    [UFS_QUERY_ATTR_IDN_REFRESH_STATUS] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_REFRESH_FREQ] = UFS_QUERY_ATTR_READ,
 +    [UFS_QUERY_ATTR_IDN_REFRESH_UNIT] = UFS_QUERY_ATTR_READ,
 +};
 +
 +static inline QueryRespCode ufs_attr_check_idn_valid(uint8_t idn, int op)
 +{
 +    if (idn >= UFS_QUERY_ATTR_IDN_COUNT) {
 +        return UFS_QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (!(attr_permission[idn] & op)) {
 +        if (op == UFS_QUERY_ATTR_READ) {
 +            trace_ufs_err_query_attr_not_readable(idn);
 +            return UFS_QUERY_RESULT_NOT_READABLE;
 +        }
 +        trace_ufs_err_query_attr_not_writable(idn);
 +        return UFS_QUERY_RESULT_NOT_WRITEABLE;
 +    }
 +
 +    return UFS_QUERY_RESULT_SUCCESS;
 +}
 +
 +static QueryRespCode ufs_exec_query_flag(UfsRequest *req, int op)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint32_t value;
 +    QueryRespCode ret;
 +
 +    ret = ufs_flag_check_idn_valid(idn, op);
 +    if (ret) {
 +        return ret;
 +    }
 +
-+    ret = blkdebug_parse_perm_list(&s->unshare_child_perms, options,
++    if (idn == UFS_QUERY_FLAG_IDN_FDEVICEINIT) {
-+                                   "unshare-child-perms.", errp);
++        value = 0;
-+    if (ret < 0) {
++    } else if (op == UFS_QUERY_FLAG_READ) {
 +        value = *(((uint8_t *)&u->flags) + idn);
 +    } else if (op == UFS_QUERY_FLAG_SET) {
 +        value = 1;
 +    } else if (op == UFS_QUERY_FLAG_CLEAR) {
 +        value = 0;
 +    } else if (op == UFS_QUERY_FLAG_TOGGLE) {
 +        value = *(((uint8_t *)&u->flags) + idn);
 +        value = !value;
 +    } else {
 +        trace_ufs_err_query_invalid_opcode(op);
 +        return UFS_QUERY_RESULT_INVALID_OPCODE;
 +    }
 +
 +    *(((uint8_t *)&u->flags) + idn) = value;
 +    req->rsp_upiu.qr.value = cpu_to_be32(value);
 +    return UFS_QUERY_RESULT_SUCCESS;
 +}
 +
 +static uint32_t ufs_read_attr_value(UfsHc *u, uint8_t idn)
 +{
 +    switch (idn) {
 +    case UFS_QUERY_ATTR_IDN_BOOT_LU_EN:
 +        return u->attributes.boot_lun_en;
 +    case UFS_QUERY_ATTR_IDN_POWER_MODE:
 +        return u->attributes.current_power_mode;
 +    case UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
 +        return u->attributes.active_icc_level;
 +    case UFS_QUERY_ATTR_IDN_OOO_DATA_EN:
 +        return u->attributes.out_of_order_data_en;
 +    case UFS_QUERY_ATTR_IDN_BKOPS_STATUS:
 +        return u->attributes.background_op_status;
 +    case UFS_QUERY_ATTR_IDN_PURGE_STATUS:
 +        return u->attributes.purge_status;
 +    case UFS_QUERY_ATTR_IDN_MAX_DATA_IN:
 +        return u->attributes.max_data_in_size;
 +    case UFS_QUERY_ATTR_IDN_MAX_DATA_OUT:
 +        return u->attributes.max_data_out_size;
 +    case UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED:
 +        return be32_to_cpu(u->attributes.dyn_cap_needed);
 +    case UFS_QUERY_ATTR_IDN_REF_CLK_FREQ:
 +        return u->attributes.ref_clk_freq;
 +    case UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK:
 +        return u->attributes.config_descr_lock;
 +    case UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
 +        return u->attributes.max_num_of_rtt;
 +    case UFS_QUERY_ATTR_IDN_EE_CONTROL:
 +        return be16_to_cpu(u->attributes.exception_event_control);
 +    case UFS_QUERY_ATTR_IDN_EE_STATUS:
 +        return be16_to_cpu(u->attributes.exception_event_status);
 +    case UFS_QUERY_ATTR_IDN_SECONDS_PASSED:
 +        return be32_to_cpu(u->attributes.seconds_passed);
 +    case UFS_QUERY_ATTR_IDN_CNTX_CONF:
 +        return be16_to_cpu(u->attributes.context_conf);
 +    case UFS_QUERY_ATTR_IDN_FFU_STATUS:
 +        return u->attributes.device_ffu_status;
 +    case UFS_QUERY_ATTR_IDN_PSA_STATE:
 +        return be32_to_cpu(u->attributes.psa_state);
 +    case UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE:
 +        return be32_to_cpu(u->attributes.psa_data_size);
 +    case UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME:
 +        return u->attributes.ref_clk_gating_wait_time;
 +    case UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP:
 +        return u->attributes.device_case_rough_temperaure;
 +    case UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND:
 +        return u->attributes.device_too_high_temp_boundary;
 +    case UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND:
 +        return u->attributes.device_too_low_temp_boundary;
 +    case UFS_QUERY_ATTR_IDN_THROTTLING_STATUS:
 +        return u->attributes.throttling_status;
 +    case UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS:
 +        return u->attributes.wb_buffer_flush_status;
 +    case UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE:
 +        return u->attributes.available_wb_buffer_size;
 +    case UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST:
 +        return u->attributes.wb_buffer_life_time_est;
 +    case UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE:
 +        return be32_to_cpu(u->attributes.current_wb_buffer_size);
 +    case UFS_QUERY_ATTR_IDN_REFRESH_STATUS:
 +        return u->attributes.refresh_status;
 +    case UFS_QUERY_ATTR_IDN_REFRESH_FREQ:
 +        return u->attributes.refresh_freq;
 +    case UFS_QUERY_ATTR_IDN_REFRESH_UNIT:
 +        return u->attributes.refresh_unit;
 +    }
 +    return 0;
 +}
 +
 +static void ufs_write_attr_value(UfsHc *u, uint8_t idn, uint32_t value)
 +{
 +    switch (idn) {
 +    case UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
 +        u->attributes.active_icc_level = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_MAX_DATA_IN:
 +        u->attributes.max_data_in_size = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_MAX_DATA_OUT:
 +        u->attributes.max_data_out_size = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_REF_CLK_FREQ:
 +        u->attributes.ref_clk_freq = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
 +        u->attributes.max_num_of_rtt = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_EE_CONTROL:
 +        u->attributes.exception_event_control = cpu_to_be16(value);
 +        break;
 +    case UFS_QUERY_ATTR_IDN_SECONDS_PASSED:
 +        u->attributes.seconds_passed = cpu_to_be32(value);
 +        break;
 +    case UFS_QUERY_ATTR_IDN_PSA_STATE:
 +        u->attributes.psa_state = value;
 +        break;
 +    case UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE:
 +        u->attributes.psa_data_size = cpu_to_be32(value);
 +        break;
 +    }
 +}
 +
 +static QueryRespCode ufs_exec_query_attr(UfsRequest *req, int op)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint32_t value;
 +    QueryRespCode ret;
 +
 +    ret = ufs_attr_check_idn_valid(idn, op);
 +    if (ret) {
 +        return ret;
 +    }
 +
-+    return 0;
++    if (op == UFS_QUERY_ATTR_READ) {
-+}
++        value = ufs_read_attr_value(u, idn);
-+
++    } else {
- static QemuOptsList runtime_opts = {
++        value = be32_to_cpu(req->req_upiu.qr.value);
-     .name = "blkdebug",
++        ufs_write_attr_value(u, idn, value);
-     .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
++    }
-@@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
++
-     /* Set initial state */
++    req->rsp_upiu.qr.value = cpu_to_be32(value);
-     s->state = 1;
++    return UFS_QUERY_RESULT_SUCCESS;
++}
-+    /* Parse permissions modifiers before opening the image file */
++
-+    ret = blkdebug_parse_perms(s, options, errp);
++static const RpmbUnitDescriptor rpmb_unit_desc = {
-+    if (ret < 0) {
++    .length = sizeof(RpmbUnitDescriptor),
-+        goto out;
++    .descriptor_idn = 2,
-+    }
++    .unit_index = UFS_UPIU_RPMB_WLUN,
-+
++    .lu_enable = 0,
-     /* Open the image file */
++};
-     bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",
++
-                                bs, &child_file, false, &local_err);
++static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
-@@ -XXX,XX +XXX,XX @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,
++{
-     return 0;
++    uint8_t lun = req->req_upiu.qr.index;
 +
 +    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
 +        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
 +        return UFS_QUERY_RESULT_INVALID_INDEX;
 +    }
 +
 +    if (lun == UFS_UPIU_RPMB_WLUN) {
 +        memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
 +    } else {
 +        /* unit descriptor is not yet supported */
 +        return UFS_QUERY_RESULT_INVALID_INDEX;
 +    }
 +
 +    return UFS_QUERY_RESULT_SUCCESS;
 +}
 +
 +static inline StringDescriptor manufacturer_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x12,
 +        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('R');
 +    desc.UC[1] = cpu_to_be16('E');
 +    desc.UC[2] = cpu_to_be16('D');
 +    desc.UC[3] = cpu_to_be16('H');
 +    desc.UC[4] = cpu_to_be16('A');
 +    desc.UC[5] = cpu_to_be16('T');
 +    return desc;
 +}
 +
 +static inline StringDescriptor product_name_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x22,
 +        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('Q');
 +    desc.UC[1] = cpu_to_be16('E');
 +    desc.UC[2] = cpu_to_be16('M');
 +    desc.UC[3] = cpu_to_be16('U');
 +    desc.UC[4] = cpu_to_be16(' ');
 +    desc.UC[5] = cpu_to_be16('U');
 +    desc.UC[6] = cpu_to_be16('F');
 +    desc.UC[7] = cpu_to_be16('S');
 +    return desc;
 +}
 +
 +static inline StringDescriptor product_rev_level_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x0a,
 +        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('0');
 +    desc.UC[1] = cpu_to_be16('0');
 +    desc.UC[2] = cpu_to_be16('0');
 +    desc.UC[3] = cpu_to_be16('1');
 +    return desc;
 +}
 +
 +static const StringDescriptor null_str_desc = {
 +    .length = 0x02,
 +    .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
 +};
 +
 +static QueryRespCode ufs_read_string_desc(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t index = req->req_upiu.qr.index;
 +    StringDescriptor desc;
 +
 +    if (index == u->device_desc.manufacturer_name) {
 +        desc = manufacturer_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else if (index == u->device_desc.product_name) {
 +        desc = product_name_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else if (index == u->device_desc.serial_number) {
 +        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
 +    } else if (index == u->device_desc.oem_id) {
 +        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
 +    } else if (index == u->device_desc.product_revision_level) {
 +        desc = product_rev_level_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else {
 +        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, index);
 +        return UFS_QUERY_RESULT_INVALID_INDEX;
 +    }
 +    return UFS_QUERY_RESULT_SUCCESS;
 +}
 +
 +static inline InterconnectDescriptor interconnect_desc(void)
 +{
 +    InterconnectDescriptor desc = {
 +        .length = sizeof(InterconnectDescriptor),
 +        .descriptor_idn = UFS_QUERY_DESC_IDN_INTERCONNECT,
 +    };
 +    desc.bcd_unipro_version = cpu_to_be16(0x180);
 +    desc.bcd_mphy_version = cpu_to_be16(0x410);
 +    return desc;
 +}
 +
 +static QueryRespCode ufs_read_desc(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    QueryRespCode status;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint16_t length = be16_to_cpu(req->req_upiu.qr.length);
 +    InterconnectDescriptor desc;
 +
 +    switch (idn) {
 +    case UFS_QUERY_DESC_IDN_DEVICE:
 +        memcpy(&req->rsp_upiu.qr.data, &u->device_desc, sizeof(u->device_desc));
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    case UFS_QUERY_DESC_IDN_UNIT:
 +        status = ufs_read_unit_desc(req);
 +        break;
 +    case UFS_QUERY_DESC_IDN_GEOMETRY:
 +        memcpy(&req->rsp_upiu.qr.data, &u->geometry_desc,
 +               sizeof(u->geometry_desc));
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    case UFS_QUERY_DESC_IDN_INTERCONNECT: {
 +        desc = interconnect_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, sizeof(InterconnectDescriptor));
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    }
 +    case UFS_QUERY_DESC_IDN_STRING:
 +        status = ufs_read_string_desc(req);
 +        break;
 +    case UFS_QUERY_DESC_IDN_POWER:
 +        /* mocking of power descriptor is not supported */
 +        memset(&req->rsp_upiu.qr.data, 0, sizeof(PowerParametersDescriptor));
 +        req->rsp_upiu.qr.data[0] = sizeof(PowerParametersDescriptor);
 +        req->rsp_upiu.qr.data[1] = UFS_QUERY_DESC_IDN_POWER;
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    case UFS_QUERY_DESC_IDN_HEALTH:
 +        /* mocking of health descriptor is not supported */
 +        memset(&req->rsp_upiu.qr.data, 0, sizeof(DeviceHealthDescriptor));
 +        req->rsp_upiu.qr.data[0] = sizeof(DeviceHealthDescriptor);
 +        req->rsp_upiu.qr.data[1] = UFS_QUERY_DESC_IDN_HEALTH;
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    default:
 +        length = 0;
 +        trace_ufs_err_query_invalid_idn(req->req_upiu.qr.opcode, idn);
 +        status = UFS_QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (length > req->rsp_upiu.qr.data[0]) {
 +        length = req->rsp_upiu.qr.data[0];
 +    }
 +    req->rsp_upiu.qr.opcode = req->req_upiu.qr.opcode;
 +    req->rsp_upiu.qr.idn = req->req_upiu.qr.idn;
 +    req->rsp_upiu.qr.index = req->req_upiu.qr.index;
 +    req->rsp_upiu.qr.selector = req->req_upiu.qr.selector;
 +    req->rsp_upiu.qr.length = cpu_to_be16(length);
 +
 +    return status;
 +}
 +
 +static QueryRespCode ufs_exec_query_read(UfsRequest *req)
 +{
 +    QueryRespCode status;
 +    switch (req->req_upiu.qr.opcode) {
 +    case UFS_UPIU_QUERY_OPCODE_NOP:
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_READ_DESC:
 +        status = ufs_read_desc(req);
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_READ_ATTR:
 +        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_READ);
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_READ_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_READ);
 +        break;
 +    default:
 +        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
 +        status = UFS_QUERY_RESULT_INVALID_OPCODE;
 +        break;
 +    }
 +
 +    return status;
 +}
 +
 +static QueryRespCode ufs_exec_query_write(UfsRequest *req)
 +{
 +    QueryRespCode status;
 +    switch (req->req_upiu.qr.opcode) {
 +    case UFS_UPIU_QUERY_OPCODE_NOP:
 +        status = UFS_QUERY_RESULT_SUCCESS;
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_WRITE_DESC:
 +        /* write descriptor is not supported */
 +        status = UFS_QUERY_RESULT_NOT_WRITEABLE;
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_WRITE_ATTR:
 +        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_WRITE);
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_SET_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_SET);
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_CLEAR_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_CLEAR);
 +        break;
 +    case UFS_UPIU_QUERY_OPCODE_TOGGLE_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_TOGGLE);
 +        break;
 +    default:
 +        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
 +        status = UFS_QUERY_RESULT_INVALID_OPCODE;
 +        break;
 +    }
 +
 +    return status;
 +}
 +
 +static UfsReqResult ufs_exec_query_cmd(UfsRequest *req)
 +{
 +    uint8_t query_func = req->req_upiu.header.query_func;
 +    uint16_t data_segment_length;
 +    QueryRespCode status;
 +
 +    trace_ufs_exec_query_cmd(req->slot, req->req_upiu.qr.opcode);
 +    if (query_func == UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST) {
 +        status = ufs_exec_query_read(req);
 +    } else if (query_func == UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST) {
 +        status = ufs_exec_query_write(req);
 +    } else {
 +        status = UFS_QUERY_RESULT_GENERAL_FAILURE;
 +    }
 +
 +    data_segment_length = be16_to_cpu(req->rsp_upiu.qr.length);
 +    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_QUERY_RSP, 0, status, 0,
 +                          data_segment_length);
 +
 +    if (status != UFS_QUERY_RESULT_SUCCESS) {
 +        return UFS_REQUEST_FAIL;
 +    }
 +    return UFS_REQUEST_SUCCESS;
 +}
 +
 +static void ufs_exec_req(UfsRequest *req)
 +{
 +    UfsReqResult req_result;
 +
 +    if (ufs_dma_read_upiu(req)) {
 +        return;
 +    }
 +
 +    switch (req->req_upiu.header.trans_type) {
 +    case UFS_UPIU_TRANSACTION_NOP_OUT:
 +        req_result = ufs_exec_nop_cmd(req);
 +        break;
 +    case UFS_UPIU_TRANSACTION_COMMAND:
 +        /* Not yet implemented */
 +        req_result = UFS_REQUEST_FAIL;
 +        break;
 +    case UFS_UPIU_TRANSACTION_QUERY_REQ:
 +        req_result = ufs_exec_query_cmd(req);
 +        break;
 +    default:
 +        trace_ufs_err_invalid_trans_code(req->slot,
 +                                         req->req_upiu.header.trans_type);
 +        req_result = UFS_REQUEST_FAIL;
 +    }
 +
 +    ufs_complete_req(req, req_result);
 +}
 +
 +static void ufs_process_req(void *opaque)
 +{
 +    UfsHc *u = opaque;
 +    UfsRequest *req;
 +    int slot;
 +
 +    for (slot = 0; slot < u->params.nutrs; slot++) {
 +        req = &u->req_list[slot];
 +
 +        if (req->state != UFS_REQUEST_READY) {
 +            continue;
 +        }
 +        trace_ufs_process_req(slot);
 +        req->state = UFS_REQUEST_RUNNING;
 +
 +        ufs_exec_req(req);
 +    }
 +}
 +
 +static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result)
 +{
 +    UfsHc *u = req->hc;
 +    assert(req->state == UFS_REQUEST_RUNNING);
 +
 +    if (req_result == UFS_REQUEST_SUCCESS) {
 +        req->utrd.header.dword_2 = cpu_to_le32(UFS_OCS_SUCCESS);
 +    } else {
 +        req->utrd.header.dword_2 = cpu_to_le32(UFS_OCS_INVALID_CMD_TABLE_ATTR);
 +    }
 +
 +    trace_ufs_complete_req(req->slot);
 +    req->state = UFS_REQUEST_COMPLETE;
 +    qemu_bh_schedule(u->complete_bh);
 +}
 +
 +static void ufs_clear_req(UfsRequest *req)
 +{
 +    if (req->sg != NULL) {
 +        qemu_sglist_destroy(req->sg);
 +        g_free(req->sg);
 +        req->sg = NULL;
 +    }
 +
 +    memset(&req->utrd, 0, sizeof(req->utrd));
 +    memset(&req->req_upiu, 0, sizeof(req->req_upiu));
 +    memset(&req->rsp_upiu, 0, sizeof(req->rsp_upiu));
 +}
 +
 +static void ufs_sendback_req(void *opaque)
 +{
 +    UfsHc *u = opaque;
 +    UfsRequest *req;
 +    int slot;
 +
 +    for (slot = 0; slot < u->params.nutrs; slot++) {
 +        req = &u->req_list[slot];
 +
 +        if (req->state != UFS_REQUEST_COMPLETE) {
 +            continue;
 +        }
 +
 +        if (ufs_dma_write_upiu(req)) {
 +            req->state = UFS_REQUEST_ERROR;
 +            continue;
 +        }
 +
 +        /*
 +         * TODO: UTP Transfer Request Interrupt Aggregation Control is not yet
 +         * supported
 +         */
 +        if (le32_to_cpu(req->utrd.header.dword_2) != UFS_OCS_SUCCESS ||
 +            le32_to_cpu(req->utrd.header.dword_0) & UFS_UTP_REQ_DESC_INT_CMD) {
 +            u->reg.is = FIELD_DP32(u->reg.is, IS, UTRCS, 1);
 +        }
 +
 +        u->reg.utrldbr &= ~(1 << slot);
 +        u->reg.utrlcnr |= (1 << slot);
 +
 +        trace_ufs_sendback_req(req->slot);
 +
 +        ufs_clear_req(req);
 +        req->state = UFS_REQUEST_IDLE;
 +    }
 +
 +    ufs_irq_check(u);
 +}
 +
  static bool ufs_check_constraints(UfsHc *u, Error **errp)
  {
      if (u->params.nutrs > UFS_MAX_NUTRS) {
@@ -XXX,XX +XXX,XX @@ static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
      u->irq = pci_allocate_irq(pci_dev);
  }
-+static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c,
++static void ufs_init_state(UfsHc *u)
-+                                const BdrvChildRole *role,
++{
-+                                BlockReopenQueue *reopen_queue,
++    u->req_list = g_new0(UfsRequest, u->params.nutrs);
-+                                uint64_t perm, uint64_t shared,
++
-+                                uint64_t *nperm, uint64_t *nshared)
++    for (int i = 0; i < u->params.nutrs; i++) {
-+{
++        u->req_list[i].hc = u;
-+    BDRVBlkdebugState *s = bs->opaque;
++        u->req_list[i].slot = i;
-+
++        u->req_list[i].sg = NULL;
-+    bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
++        u->req_list[i].state = UFS_REQUEST_IDLE;
-+                              nperm, nshared);
++    }
 +
-+    *nperm |= s->take_child_perms;
++    u->doorbell_bh = qemu_bh_new_guarded(ufs_process_req, u,
-+    *nshared &= ~s->unshare_child_perms;
++                                         &DEVICE(u)->mem_reentrancy_guard);
-+}
++    u->complete_bh = qemu_bh_new_guarded(ufs_sendback_req, u,
-+
++                                         &DEVICE(u)->mem_reentrancy_guard);
- static const char *const blkdebug_strong_runtime_opts[] = {
++}
-     "config",
++
-     "inject-error.",
+ static void ufs_init_hc(UfsHc *u)
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkdebug = {
+ {
-     .bdrv_file_open         = blkdebug_open,
+     uint32_t cap = 0;
-     .bdrv_close             = blkdebug_close,
+@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
-     .bdrv_reopen_prepare    = blkdebug_reopen_prepare,
+     cap = FIELD_DP32(cap, CAP, CS, 0);
--    .bdrv_child_perm        = bdrv_filter_default_perms,
+     u->reg.cap = cap;
-+    .bdrv_child_perm        = blkdebug_child_perm,
+     u->reg.ver = UFS_SPEC_VER;
++
-     .bdrv_getlength         = blkdebug_getlength,
++    memset(&u->device_desc, 0, sizeof(DeviceDescriptor));
-     .bdrv_refresh_filename  = blkdebug_refresh_filename,
++    u->device_desc.length = sizeof(DeviceDescriptor);
-diff --git a/qapi/block-core.json b/qapi/block-core.json
++    u->device_desc.descriptor_idn = UFS_QUERY_DESC_IDN_DEVICE;
 +    u->device_desc.device_sub_class = 0x01;
 +    u->device_desc.number_lu = 0x00;
 +    u->device_desc.number_wlu = 0x04;
 +    /* TODO: Revisit it when Power Management is implemented */
 +    u->device_desc.init_power_mode = 0x01; /* Active Mode */
 +    u->device_desc.high_priority_lun = 0x7F; /* Same Priority */
 +    u->device_desc.spec_version = cpu_to_be16(UFS_SPEC_VER);
 +    u->device_desc.manufacturer_name = 0x00;
 +    u->device_desc.product_name = 0x01;
 +    u->device_desc.serial_number = 0x02;
 +    u->device_desc.oem_id = 0x03;
 +    u->device_desc.ud_0_base_offset = 0x16;
 +    u->device_desc.ud_config_p_length = 0x1A;
 +    u->device_desc.device_rtt_cap = 0x02;
 +    u->device_desc.queue_depth = u->params.nutrs;
 +    u->device_desc.product_revision_level = 0x04;
 +
 +    memset(&u->geometry_desc, 0, sizeof(GeometryDescriptor));
 +    u->geometry_desc.length = sizeof(GeometryDescriptor);
 +    u->geometry_desc.descriptor_idn = UFS_QUERY_DESC_IDN_GEOMETRY;
 +    u->geometry_desc.max_number_lu = (UFS_MAX_LUS == 32) ? 0x1 : 0x0;
 +    u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4KB */
 +    u->geometry_desc.allocation_unit_size = 0x1; /* 4KB */
 +    u->geometry_desc.min_addr_block_size = 0x8; /* 4KB */
 +    u->geometry_desc.max_in_buffer_size = 0x8;
 +    u->geometry_desc.max_out_buffer_size = 0x8;
 +    u->geometry_desc.rpmb_read_write_size = 0x40;
 +    u->geometry_desc.data_ordering =
 +        0x0; /* out-of-order data transfer is not supported */
 +    u->geometry_desc.max_context_id_number = 0x5;
 +    u->geometry_desc.supported_memory_types = cpu_to_be16(0x8001);
 +
 +    memset(&u->attributes, 0, sizeof(u->attributes));
 +    u->attributes.max_data_in_size = 0x08;
 +    u->attributes.max_data_out_size = 0x08;
 +    u->attributes.ref_clk_freq = 0x01; /* 26 MHz */
 +    /* configure descriptor is not supported */
 +    u->attributes.config_descr_lock = 0x01;
 +    u->attributes.max_num_of_rtt = 0x02;
 +
 +    memset(&u->flags, 0, sizeof(u->flags));
 +    u->flags.permanently_disable_fw_update = 1;
  }
  static void ufs_realize(PCIDevice *pci_dev, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
          return;
      }
 +    ufs_init_state(u);
      ufs_init_hc(u);
      ufs_init_pci(u, pci_dev);
  }
 +static void ufs_exit(PCIDevice *pci_dev)
 +{
 +    UfsHc *u = UFS(pci_dev);
 +
 +    qemu_bh_delete(u->doorbell_bh);
 +    qemu_bh_delete(u->complete_bh);
 +
 +    for (int i = 0; i < u->params.nutrs; i++) {
 +        ufs_clear_req(&u->req_list[i]);
 +    }
 +    g_free(u->req_list);
 +}
 +
  static Property ufs_props[] = {
      DEFINE_PROP_STRING("serial", UfsHc, params.serial),
      DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
      PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
      pc->realize = ufs_realize;
 +    pc->exit = ufs_exit;
      pc->vendor_id = PCI_VENDOR_ID_REDHAT;
      pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
      pc->class_id = PCI_CLASS_STORAGE_UFS;
 diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/ufs/trace-events
-+++ b/qapi/block-core.json
++++ b/hw/ufs/trace-events
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu
- #
+ ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
- # @set-state:       array of state-change descriptions
+ ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
- #
+ ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
-+# @take-child-perms: Permissions to take on @image in addition to what
++ufs_err_utrl_slot_error(uint32_t slot) "UTRLDBR slot %"PRIu32" is in error"
-+#                    is necessary anyway (which depends on how the
+ ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
-+#                    blkdebug node is used).  Defaults to none.
+ ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
-+#                    (since 5.0)
+ ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
 +#
 +# @unshare-child-perms: Permissions not to share on @image in addition
 +#                       to what cannot be shared anyway (which depends
 +#                       on how the blkdebug node is used).  Defaults
 +#                       to none.  (since 5.0)
 +#
  # Since: 2.9
  ##
  { 'struct': 'BlockdevOptionsBlkdebug',
@@ -XXX,XX +XXX,XX @@
              '*opt-write-zero': 'int32', '*max-write-zero': 'int32',
              '*opt-discard': 'int32', '*max-discard': 'int32',
              '*inject-error': ['BlkdebugInjectErrorOptions'],
 -            '*set-state': ['BlkdebugSetStateOptions'] } }
 +            '*set-state': ['BlkdebugSetStateOptions'],
 +            '*take-child-perms': ['BlockPermission'],
 +            '*unshare-child-perms': ['BlockPermission'] } }
  ##
  # @BlockdevOptionsBlklogwrites:
 --
-.24.1
+.41.0

-[PULL 04/34] iotests: Add @error to wait_until_completed
+Deleted patch
-Callers can use this new parameter to expect failure during the
-completion process.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191108123455.39445-5-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/iotests.py | 18 ++++++++++++------
-file changed, 12 insertions(+), 6 deletions(-)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         self.assert_no_active_block_jobs()
-         return result
--    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0):
-+    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0,
-+                             error=None):
-         '''Wait for a block job to finish, returning the event'''
-         while True:
-             for event in self.vm.get_qmp_events(wait=wait):
-                 if event['event'] == 'BLOCK_JOB_COMPLETED':
-                     self.assert_qmp(event, 'data/device', drive)
--                    self.assert_qmp_absent(event, 'data/error')
--                    if check_offset:
--                        self.assert_qmp(event, 'data/offset', event['data']['len'])
-+                    if error is None:
-+                        self.assert_qmp_absent(event, 'data/error')
-+                        if check_offset:
-+                            self.assert_qmp(event, 'data/offset',
-+                                            event['data']['len'])
-+                    else:
-+                        self.assert_qmp(event, 'data/error', error)
-                     self.assert_no_active_block_jobs()
-                     return event
-                 elif event['event'] == 'JOB_STATUS_CHANGE':
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         self.assert_qmp(event, 'data/type', 'mirror')
-         self.assert_qmp(event, 'data/offset', event['data']['len'])
--    def complete_and_wait(self, drive='drive0', wait_ready=True):
-+    def complete_and_wait(self, drive='drive0', wait_ready=True,
-+                          completion_error=None):
-         '''Complete a block job and wait for it to finish'''
-         if wait_ready:
-             self.wait_ready(drive=drive)
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         result = self.vm.qmp('block-job-complete', device=drive)
-         self.assert_qmp(result, 'return', {})
--        event = self.wait_until_completed(drive=drive)
-+        event = self.wait_until_completed(drive=drive, error=completion_error)
-         self.assert_qmp(event, 'data/type', 'mirror')
-     def pause_wait(self, job_id='job0'):
---
-.24.1

-[PULL 05/34] iotests: Add test for failing mirror complete
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20191108123455.39445-6-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/041     | 44 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/041.out |  4 ++--
-files changed, 46 insertions(+), 2 deletions(-)
-diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/041
-+++ b/tests/qemu-iotests/041
-@@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase):
-                              target='dest-ro')
-         self.assert_qmp(result, 'error/class', 'GenericError')
-+    def test_failing_permission_in_complete(self):
-+        self.assert_no_active_block_jobs()
-+
-+        # Unshare consistent-read on the target
-+        # (The mirror job does not care)
-+        result = self.vm.qmp('blockdev-add',
-+                             driver='blkdebug',
-+                             node_name='dest-perm',
-+                             image='dest',
-+                             unshare_child_perms=['consistent-read'])
-+        self.assert_qmp(result, 'return', {})
-+
-+        result = self.vm.qmp('blockdev-mirror', job_id='job', device='src',
-+                             sync='full', target='dest',
-+                             filter_node_name='mirror-filter')
-+        self.assert_qmp(result, 'return', {})
-+
-+        # Require consistent-read on the source
-+        # (We can only add this node once the job has started, or it
-+        # will complain that it does not want to run on non-root nodes)
-+        result = self.vm.qmp('blockdev-add',
-+                             driver='blkdebug',
-+                             node_name='src-perm',
-+                             image='src',
-+                             take_child_perms=['consistent-read'])
-+        self.assert_qmp(result, 'return', {})
-+
-+        # While completing, mirror will attempt to replace src by
-+        # dest, which must fail because src-perm requires
-+        # consistent-read but dest-perm does not share it; thus
-+        # aborting the job when it is supposed to complete
-+        self.complete_and_wait('job',
-+                               completion_error='Operation not permitted')
-+
-+        # Assert that all of our nodes are still there (except for the
-+        # mirror filter, which should be gone despite the failure)
-+        nodes = self.vm.qmp('query-named-block-nodes')['return']
-+        nodes = [node['node-name'] for node in nodes]
-+
-+        for expect in ('src', 'src-perm', 'dest', 'dest-perm'):
-+            self.assertTrue(expect in nodes, '%s disappeared' % expect)
-+        self.assertFalse('mirror-filter' in nodes,
-+                         'Mirror filter node did not disappear')
-+
- if __name__ == '__main__':
-     iotests.main(supported_fmts=['qcow2', 'qed'],
-                  supported_protocols=['file'])
-diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/041.out
-+++ b/tests/qemu-iotests/041.out
-@@ -XXX,XX +XXX,XX @@
--..........................................................................................
-+...........................................................................................
- ----------------------------------------------------------------------
--Ran 90 tests
-+Ran 91 tests
- OK
---
-.24.1

-[PULL 06/34] throttle-groups: fix memory leak in throttle_group_set_limit:
+Deleted patch
-From: PanNengyuan <pannengyuan@huawei.com>
-This avoid a memory leak when qom-set is called to set throttle_group
-limits, here is an easy way to reproduce:
-. run qemu-iotests as follow and check the result with asan:
-       ./check -qcow2 184
-Following is the asan output backtrack:
-Direct leak of 912 byte(s) in 3 object(s) allocated from:
-    #0 0xffff8d7ab3c3 in __interceptor_calloc   (/lib64/libasan.so.4+0xd33c3)
-    #1 0xffff8d4c31cb in g_malloc0   (/lib64/libglib-2.0.so.0+0x571cb)
-    #2 0x190c857 in qobject_input_start_struct  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qobject-input-visitor.c:295
-    #3 0x19070df in visit_start_struct   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qapi-visit-core.c:49
-    #4 0x1948b87 in visit_type_ThrottleLimits   qapi/qapi-visit-block-core.c:3759
-    #5 0x17e4aa3 in throttle_group_set_limits   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/block/throttle-groups.c:900
-    #6 0x1650eff in object_property_set     /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/object.c:1272
-    #7 0x1658517 in object_property_set_qobject   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qobject.c:26
-    #8 0x15880bb in qmp_qom_set  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qmp-cmds.c:74
-    #9 0x157e3e3 in qmp_marshal_qom_set  qapi/qapi-commands-qom.c:154
-Reported-by: Euler Robot <euler.robot@huawei.com>
-Signed-off-by: PanNengyuan <pannengyuan@huawei.com>
-Message-id: 1574835614-42028-1-git-send-email-pannengyuan@huawei.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/throttle-groups.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/throttle-groups.c b/block/throttle-groups.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/throttle-groups.c
-+++ b/block/throttle-groups.c
-@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
- {
-     ThrottleGroup *tg = THROTTLE_GROUP(obj);
-     ThrottleConfig cfg;
--    ThrottleLimits arg = { 0 };
--    ThrottleLimits *argp = &arg;
-+    ThrottleLimits *argp;
-     Error *local_err = NULL;
-     visit_type_ThrottleLimits(v, name, &argp, &local_err);
-@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
- unlock:
-     qemu_mutex_unlock(&tg->lock);
- ret:
-+    qapi_free_ThrottleLimits(argp);
-     error_propagate(errp, local_err);
-     return;
- }
---
-.24.1

-[PULL 07/34] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap
+[PULL 4/5] hw/ufs: Support for UFS logical unit
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Jeuk Kim <jeuk20.kim@samsung.com>
-qcow2_can_store_new_dirty_bitmap works wrong, as it considers only
+This commit adds support for ufs logical unit.
-bitmaps already stored in the qcow2 image and ignores persistent
+The LU handles processing for the SCSI command,
-BdrvDirtyBitmap objects.
+unit descriptor query request.
-So, let's instead count persistent BdrvDirtyBitmaps. We load all qcow2
+This commit enables the UFS device to process
-bitmaps on open, so there should not be any bitmap in the image for
+IO requests.
 which we don't have BdrvDirtyBitmaps version. If it is - it's a kind of
 corruption, and no reason to check for corruptions here (open() and
 close() are better places for it).
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-Message-id: 20191014115126.15360-2-vsementsov@virtuozzo.com
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-id: beacc504376ab6a14b1a3830bb3c69382cf6aebc.1693980783.git.jeuk20.kim@gmail.com
-Cc: qemu-stable@nongnu.org
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block/qcow2-bitmap.c | 41 ++++++++++++++++++-----------------------
+ hw/ufs/ufs.h             |   43 ++
-file changed, 18 insertions(+), 23 deletions(-)
+ include/scsi/constants.h |    1 +
  hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++++
  hw/ufs/ufs.c             |  252 ++++++-
  hw/ufs/meson.build       |    2 +-
  hw/ufs/trace-events      |   25 +
 files changed, 1761 insertions(+), 7 deletions(-)
  create mode 100644 hw/ufs/lu.c
-diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2-bitmap.c
+--- a/hw/ufs/ufs.h
-+++ b/block/qcow2-bitmap.c
++++ b/hw/ufs/ufs.h
-@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@
-                                                       Error **errp)
+ #define UFS_MAX_LUS 32
  #define UFS_BLOCK_SIZE 4096
 +typedef struct UfsBusClass {
 +    BusClass parent_class;
 +    bool (*parent_check_address)(BusState *bus, DeviceState *dev, Error **errp);
 +} UfsBusClass;
 +
 +typedef struct UfsBus {
 +    SCSIBus parent_bus;
 +} UfsBus;
 +
 +#define TYPE_UFS_BUS "ufs-bus"
 +DECLARE_OBJ_CHECKERS(UfsBus, UfsBusClass, UFS_BUS, TYPE_UFS_BUS)
 +
  typedef enum UfsRequestState {
      UFS_REQUEST_IDLE = 0,
      UFS_REQUEST_READY = 1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsRequestState {
  typedef enum UfsReqResult {
      UFS_REQUEST_SUCCESS = 0,
      UFS_REQUEST_FAIL = 1,
 +    UFS_REQUEST_NO_COMPLETE = 2,
  } UfsReqResult;
  typedef struct UfsRequest {
@@ -XXX,XX +XXX,XX @@ typedef struct UfsRequest {
      QEMUSGList *sg;
  } UfsRequest;
 +typedef struct UfsLu {
 +    SCSIDevice qdev;
 +    uint8_t lun;
 +    UnitDescriptor unit_desc;
 +} UfsLu;
 +
 +typedef struct UfsWLu {
 +    SCSIDevice qdev;
 +    uint8_t lun;
 +} UfsWLu;
 +
  typedef struct UfsParams {
      char *serial;
      uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsParams {
  typedef struct UfsHc {
      PCIDevice parent_obj;
 +    UfsBus bus;
      MemoryRegion iomem;
      UfsReg reg;
      UfsParams params;
      uint32_t reg_size;
      UfsRequest *req_list;
 +    UfsLu *lus[UFS_MAX_LUS];
 +    UfsWLu *report_wlu;
 +    UfsWLu *dev_wlu;
 +    UfsWLu *boot_wlu;
 +    UfsWLu *rpmb_wlu;
      DeviceDescriptor device_desc;
      GeometryDescriptor geometry_desc;
      Attributes attributes;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
  #define TYPE_UFS "ufs"
  #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 +#define TYPE_UFS_LU "ufs-lu"
 +#define UFSLU(obj) OBJECT_CHECK(UfsLu, (obj), TYPE_UFS_LU)
 +
 +#define TYPE_UFS_WLU "ufs-wlu"
 +#define UFSWLU(obj) OBJECT_CHECK(UfsWLu, (obj), TYPE_UFS_WLU)
 +
  typedef enum UfsQueryFlagPerm {
      UFS_QUERY_FLAG_NONE = 0x0,
      UFS_QUERY_FLAG_READ = 0x1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsQueryAttrPerm {
      UFS_QUERY_ATTR_WRITE = 0x2,
  } UfsQueryAttrPerm;
 +static inline bool is_wlun(uint8_t lun)
 +{
 +    return (lun == UFS_UPIU_REPORT_LUNS_WLUN ||
 +            lun == UFS_UPIU_UFS_DEVICE_WLUN || lun == UFS_UPIU_BOOT_WLUN ||
 +            lun == UFS_UPIU_RPMB_WLUN);
 +}
 +
  #endif /* HW_UFS_UFS_H */
 diff --git a/include/scsi/constants.h b/include/scsi/constants.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/scsi/constants.h
 +++ b/include/scsi/constants.h
@@ -XXX,XX +XXX,XX @@
  #define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
  #define MODE_PAGE_CACHING                     0x08
  #define MODE_PAGE_AUDIO_CTL                   0x0e
 +#define MODE_PAGE_CONTROL                     0x0a
  #define MODE_PAGE_POWER                       0x1a
  #define MODE_PAGE_FAULT_FAIL                  0x1c
  #define MODE_PAGE_TO_PROTECT                  0x1d
 diff --git a/hw/ufs/lu.c b/hw/ufs/lu.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/lu.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * QEMU UFS Logical Unit
 + *
 + * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + *
 + * Written by Jeuk Kim <jeuk20.kim@samsung.com>
 + *
 + * This code is licensed under the GNU GPL v2 or later.
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qemu/units.h"
 +#include "qapi/error.h"
 +#include "qemu/memalign.h"
 +#include "hw/scsi/scsi.h"
 +#include "scsi/constants.h"
 +#include "sysemu/block-backend.h"
 +#include "qemu/cutils.h"
 +#include "trace.h"
 +#include "ufs.h"
 +
 +/*
 + * The code below handling SCSI commands is copied from hw/scsi/scsi-disk.c,
 + * with minor adjustments to make it work for UFS.
 + */
 +
 +#define SCSI_DMA_BUF_SIZE (128 * KiB)
 +#define SCSI_MAX_INQUIRY_LEN 256
 +#define SCSI_INQUIRY_DATA_SIZE 36
 +#define SCSI_MAX_MODE_LEN 256
 +
 +typedef struct UfsSCSIReq {
 +    SCSIRequest req;
 +    /* Both sector and sector_count are in terms of BDRV_SECTOR_SIZE bytes.  */
 +    uint64_t sector;
 +    uint32_t sector_count;
 +    uint32_t buflen;
 +    bool started;
 +    bool need_fua_emulation;
 +    struct iovec iov;
 +    QEMUIOVector qiov;
 +    BlockAcctCookie acct;
 +} UfsSCSIReq;
 +
 +static void ufs_scsi_free_request(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    qemu_vfree(r->iov.iov_base);
 +}
 +
 +static void scsi_check_condition(UfsSCSIReq *r, SCSISense sense)
 +{
 +    trace_ufs_scsi_check_condition(r->req.tag, sense.key, sense.asc,
 +                                   sense.ascq);
 +    scsi_req_build_sense(&r->req, sense);
 +    scsi_req_complete(&r->req, CHECK_CONDITION);
 +}
 +
 +static int ufs_scsi_emulate_vpd_page(SCSIRequest *req, uint8_t *outbuf,
 +                                     uint32_t outbuf_len)
 +{
 +    UfsHc *u = UFS(req->bus->qbus.parent);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint8_t page_code = req->cmd.buf[2];
 +    int start, buflen = 0;
 +
 +    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
 +        return -1;
 +    }
 +
 +    outbuf[buflen++] = lu->qdev.type & 0x1f;
 +    outbuf[buflen++] = page_code;
 +    outbuf[buflen++] = 0x00;
 +    outbuf[buflen++] = 0x00;
 +    start = buflen;
 +
 +    switch (page_code) {
 +    case 0x00: /* Supported page codes, mandatory */
 +    {
 +        trace_ufs_scsi_emulate_vpd_page_00(req->cmd.xfer);
 +        outbuf[buflen++] = 0x00; /* list of supported pages (this page) */
 +        if (u->params.serial) {
 +            outbuf[buflen++] = 0x80; /* unit serial number */
 +        }
 +        outbuf[buflen++] = 0x87; /* mode page policy */
 +        break;
 +    }
 +    case 0x80: /* Device serial number, optional */
 +    {
 +        int l;
 +
 +        if (!u->params.serial) {
 +            trace_ufs_scsi_emulate_vpd_page_80_not_supported();
 +            return -1;
 +        }
 +
 +        l = strlen(u->params.serial);
 +        if (l > SCSI_INQUIRY_DATA_SIZE) {
 +            l = SCSI_INQUIRY_DATA_SIZE;
 +        }
 +
 +        trace_ufs_scsi_emulate_vpd_page_80(req->cmd.xfer);
 +        memcpy(outbuf + buflen, u->params.serial, l);
 +        buflen += l;
 +        break;
 +    }
 +    case 0x87: /* Mode Page Policy, mandatory */
 +    {
 +        trace_ufs_scsi_emulate_vpd_page_87(req->cmd.xfer);
 +        outbuf[buflen++] = 0x3f; /* apply to all mode pages and subpages */
 +        outbuf[buflen++] = 0xff;
 +        outbuf[buflen++] = 0; /* shared */
 +        outbuf[buflen++] = 0;
 +        break;
 +    }
 +    default:
 +        return -1;
 +    }
 +    /* done with EVPD */
 +    assert(buflen - start <= 255);
 +    outbuf[start - 1] = buflen - start;
 +    return buflen;
 +}
 +
 +static int ufs_scsi_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf,
 +                                    uint32_t outbuf_len)
 +{
 +    int buflen = 0;
 +
 +    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
 +        return -1;
 +    }
 +
 +    if (req->cmd.buf[1] & 0x1) {
 +        /* Vital product data */
 +        return ufs_scsi_emulate_vpd_page(req, outbuf, outbuf_len);
 +    }
 +
 +    /* Standard INQUIRY data */
 +    if (req->cmd.buf[2] != 0) {
 +        return -1;
 +    }
 +
 +    /* PAGE CODE == 0 */
 +    buflen = req->cmd.xfer;
 +    if (buflen > SCSI_MAX_INQUIRY_LEN) {
 +        buflen = SCSI_MAX_INQUIRY_LEN;
 +    }
 +
 +    if (is_wlun(req->lun)) {
 +        outbuf[0] = TYPE_WLUN;
 +    } else {
 +        outbuf[0] = 0;
 +    }
 +    outbuf[1] = 0;
 +
 +    strpadcpy((char *)&outbuf[16], 16, "QEMU UFS", ' ');
 +    strpadcpy((char *)&outbuf[8], 8, "QEMU", ' ');
 +
 +    memset(&outbuf[32], 0, 4);
 +
 +    outbuf[2] = 0x06; /* SPC-4 */
 +    outbuf[3] = 0x2;
 +
 +    if (buflen > SCSI_INQUIRY_DATA_SIZE) {
 +        outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */
 +    } else {
 +        /*
 +         * If the allocation length of CDB is too small, the additional
 +         * length is not adjusted
 +         */
 +        outbuf[4] = SCSI_INQUIRY_DATA_SIZE - 5;
 +    }
 +
 +    /* Support TCQ.  */
 +    outbuf[7] = req->bus->info->tcq ? 0x02 : 0;
 +    return buflen;
 +}
 +
 +static int mode_sense_page(UfsLu *lu, int page, uint8_t **p_outbuf,
 +                           int page_control)
 +{
 +    static const int mode_sense_valid[0x3f] = {
 +        [MODE_PAGE_CACHING] = 1,
 +        [MODE_PAGE_R_W_ERROR] = 1,
 +        [MODE_PAGE_CONTROL] = 1,
 +    };
 +
 +    uint8_t *p = *p_outbuf + 2;
 +    int length;
 +
 +    assert(page < ARRAY_SIZE(mode_sense_valid));
 +    if ((mode_sense_valid[page]) == 0) {
 +        return -1;
 +    }
 +
 +    /*
 +     * If Changeable Values are requested, a mask denoting those mode parameters
 +     * that are changeable shall be returned. As we currently don't support
 +     * parameter changes via MODE_SELECT all bits are returned set to zero.
 +     * The buffer was already memset to zero by the caller of this function.
 +     */
 +    switch (page) {
 +    case MODE_PAGE_CACHING:
 +        length = 0x12;
 +        if (page_control == 1 || /* Changeable Values */
 +            blk_enable_write_cache(lu->qdev.conf.blk)) {
 +            p[0] = 4; /* WCE */
 +        }
 +        break;
 +
 +    case MODE_PAGE_R_W_ERROR:
 +        length = 10;
 +        if (page_control == 1) { /* Changeable Values */
 +            break;
 +        }
 +        p[0] = 0x80; /* Automatic Write Reallocation Enabled */
 +        break;
 +
 +    case MODE_PAGE_CONTROL:
 +        length = 10;
 +        if (page_control == 1) { /* Changeable Values */
 +            break;
 +        }
 +        p[1] = 0x10; /* Queue Algorithm modifier */
 +        p[8] = 0xff; /* Busy Timeout Period */
 +        p[9] = 0xff;
 +        break;
 +
 +    default:
 +        return -1;
 +    }
 +
 +    assert(length < 256);
 +    (*p_outbuf)[0] = page;
 +    (*p_outbuf)[1] = length;
 +    *p_outbuf += length + 2;
 +    return length + 2;
 +}
 +
 +static int ufs_scsi_emulate_mode_sense(UfsSCSIReq *r, uint8_t *outbuf)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    bool dbd;
 +    int page, buflen, ret, page_control;
 +    uint8_t *p;
 +    uint8_t dev_specific_param = 0;
 +
 +    dbd = (r->req.cmd.buf[1] & 0x8) != 0;
 +    if (!dbd) {
 +        return -1;
 +    }
 +
 +    page = r->req.cmd.buf[2] & 0x3f;
 +    page_control = (r->req.cmd.buf[2] & 0xc0) >> 6;
 +
 +    trace_ufs_scsi_emulate_mode_sense((r->req.cmd.buf[0] == MODE_SENSE) ? 6 :
 +                                                                          10,
 +                                      page, r->req.cmd.xfer, page_control);
 +    memset(outbuf, 0, r->req.cmd.xfer);
 +    p = outbuf;
 +
 +    if (!blk_is_writable(lu->qdev.conf.blk)) {
 +        dev_specific_param |= 0x80; /* Readonly.  */
 +    }
 +
 +    p[2] = 0; /* Medium type.  */
 +    p[3] = dev_specific_param;
 +    p[6] = p[7] = 0; /* Block descriptor length.  */
 +    p += 8;
 +
 +    if (page_control == 3) {
 +        /* Saved Values */
 +        scsi_check_condition(r, SENSE_CODE(SAVING_PARAMS_NOT_SUPPORTED));
 +        return -1;
 +    }
 +
 +    if (page == 0x3f) {
 +        for (page = 0; page <= 0x3e; page++) {
 +            mode_sense_page(lu, page, &p, page_control);
 +        }
 +    } else {
 +        ret = mode_sense_page(lu, page, &p, page_control);
 +        if (ret == -1) {
 +            return -1;
 +        }
 +    }
 +
 +    buflen = p - outbuf;
 +    /*
 +     * The mode data length field specifies the length in bytes of the
 +     * following data that is available to be transferred. The mode data
 +     * length does not include itself.
 +     */
 +    outbuf[0] = ((buflen - 2) >> 8) & 0xff;
 +    outbuf[1] = (buflen - 2) & 0xff;
 +    return buflen;
 +}
 +
 +/*
 + * scsi_handle_rw_error has two return values.  False means that the error
 + * must be ignored, true means that the error has been processed and the
 + * caller should not do anything else for this request.  Note that
 + * scsi_handle_rw_error always manages its reference counts, independent
 + * of the return value.
 + */
 +static bool scsi_handle_rw_error(UfsSCSIReq *r, int ret, bool acct_failed)
 +{
 +    bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    SCSISense sense = SENSE_CODE(NO_SENSE);
 +    int error = 0;
 +    bool req_has_sense = false;
 +    BlockErrorAction action;
 +    int status;
 +
 +    if (ret < 0) {
 +        status = scsi_sense_from_errno(-ret, &sense);
 +        error = -ret;
 +    } else {
 +        /* A passthrough command has completed with nonzero status.  */
 +        status = ret;
 +        if (status == CHECK_CONDITION) {
 +            req_has_sense = true;
 +            error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
 +        } else {
 +            error = EINVAL;
 +        }
 +    }
 +
 +    /*
 +     * Check whether the error has to be handled by the guest or should
 +     * rather follow the rerror=/werror= settings.  Guest-handled errors
 +     * are usually retried immediately, so do not post them to QMP and
 +     * do not account them as failed I/O.
 +     */
 +    if (req_has_sense && scsi_sense_buf_is_guest_recoverable(
 +                             r->req.sense, sizeof(r->req.sense))) {
 +        action = BLOCK_ERROR_ACTION_REPORT;
 +        acct_failed = false;
 +    } else {
 +        action = blk_get_error_action(lu->qdev.conf.blk, is_read, error);
 +        blk_error_action(lu->qdev.conf.blk, action, is_read, error);
 +    }
 +
 +    switch (action) {
 +    case BLOCK_ERROR_ACTION_REPORT:
 +        if (acct_failed) {
 +            block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +        }
 +        if (!req_has_sense && status == CHECK_CONDITION) {
 +            scsi_req_build_sense(&r->req, sense);
 +        }
 +        scsi_req_complete(&r->req, status);
 +        return true;
 +
 +    case BLOCK_ERROR_ACTION_IGNORE:
 +        return false;
 +
 +    case BLOCK_ERROR_ACTION_STOP:
 +        scsi_req_retry(&r->req);
 +        return true;
 +
 +    default:
 +        g_assert_not_reached();
 +    }
 +}
 +
 +static bool ufs_scsi_req_check_error(UfsSCSIReq *r, int ret, bool acct_failed)
 +{
 +    if (r->req.io_canceled) {
 +        scsi_req_cancel_complete(&r->req);
 +        return true;
 +    }
 +
 +    if (ret < 0) {
 +        return scsi_handle_rw_error(r, ret, acct_failed);
 +    }
 +
 +    return false;
 +}
 +
 +static void scsi_aio_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ufs_scsi_req_check_error(r, ret, true)) {
 +        goto done;
 +    }
 +
 +    block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    scsi_req_complete(&r->req, GOOD);
 +
 +done:
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +    scsi_req_unref(&r->req);
 +}
 +
 +static int32_t ufs_scsi_emulate_command(SCSIRequest *req, uint8_t *buf)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint32_t last_block = 0;
 +    uint8_t *outbuf;
 +    int buflen;
 +
 +    switch (req->cmd.buf[0]) {
 +    case INQUIRY:
 +    case MODE_SENSE_10:
 +    case START_STOP:
 +    case REQUEST_SENSE:
 +        break;
 +
 +    default:
 +        if (!blk_is_available(lu->qdev.conf.blk)) {
 +            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
 +            return 0;
 +        }
 +        break;
 +    }
 +
 +    /*
 +     * FIXME: we shouldn't return anything bigger than 4k, but the code
 +     * requires the buffer to be as big as req->cmd.xfer in several
 +     * places.  So, do not allow CDBs with a very large ALLOCATION
 +     * LENGTH.  The real fix would be to modify scsi_read_data and
 +     * dma_buf_read, so that they return data beyond the buflen
 +     * as all zeros.
 +     */
 +    if (req->cmd.xfer > 65536) {
 +        goto illegal_request;
 +    }
 +    r->buflen = MAX(4096, req->cmd.xfer);
 +
 +    if (!r->iov.iov_base) {
 +        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
 +    }
 +
 +    outbuf = r->iov.iov_base;
 +    memset(outbuf, 0, r->buflen);
 +    switch (req->cmd.buf[0]) {
 +    case TEST_UNIT_READY:
 +        assert(blk_is_available(lu->qdev.conf.blk));
 +        break;
 +    case INQUIRY:
 +        buflen = ufs_scsi_emulate_inquiry(req, outbuf, r->buflen);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case MODE_SENSE_10:
 +        buflen = ufs_scsi_emulate_mode_sense(r, outbuf);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case READ_CAPACITY_10:
 +        /* The normal LEN field for this command is zero.  */
 +        memset(outbuf, 0, 8);
 +        if (lu->qdev.max_lba > 0) {
 +            last_block = lu->qdev.max_lba - 1;
 +        };
 +        outbuf[0] = (last_block >> 24) & 0xff;
 +        outbuf[1] = (last_block >> 16) & 0xff;
 +        outbuf[2] = (last_block >> 8) & 0xff;
 +        outbuf[3] = last_block & 0xff;
 +        outbuf[4] = (lu->qdev.blocksize >> 24) & 0xff;
 +        outbuf[5] = (lu->qdev.blocksize >> 16) & 0xff;
 +        outbuf[6] = (lu->qdev.blocksize >> 8) & 0xff;
 +        outbuf[7] = lu->qdev.blocksize & 0xff;
 +        break;
 +    case REQUEST_SENSE:
 +        /* Just return "NO SENSE".  */
 +        buflen = scsi_convert_sense(NULL, 0, outbuf, r->buflen,
 +                                    (req->cmd.buf[1] & 1) == 0);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case SYNCHRONIZE_CACHE:
 +        /* The request is used as the AIO opaque value, so add a ref.  */
 +        scsi_req_ref(&r->req);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return 0;
 +    case VERIFY_10:
 +        trace_ufs_scsi_emulate_command_VERIFY((req->cmd.buf[1] >> 1) & 3);
 +        if (req->cmd.buf[1] & 6) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case SERVICE_ACTION_IN_16:
 +        /* Service Action In subcommands. */
 +        if ((req->cmd.buf[1] & 31) == SAI_READ_CAPACITY_16) {
 +            trace_ufs_scsi_emulate_command_SAI_16();
 +            memset(outbuf, 0, req->cmd.xfer);
 +
 +            if (lu->qdev.max_lba > 0) {
 +                last_block = lu->qdev.max_lba - 1;
 +            };
 +            outbuf[0] = 0;
 +            outbuf[1] = 0;
 +            outbuf[2] = 0;
 +            outbuf[3] = 0;
 +            outbuf[4] = (last_block >> 24) & 0xff;
 +            outbuf[5] = (last_block >> 16) & 0xff;
 +            outbuf[6] = (last_block >> 8) & 0xff;
 +            outbuf[7] = last_block & 0xff;
 +            outbuf[8] = (lu->qdev.blocksize >> 24) & 0xff;
 +            outbuf[9] = (lu->qdev.blocksize >> 16) & 0xff;
 +            outbuf[10] = (lu->qdev.blocksize >> 8) & 0xff;
 +            outbuf[11] = lu->qdev.blocksize & 0xff;
 +            outbuf[12] = 0;
 +            outbuf[13] = get_physical_block_exp(&lu->qdev.conf);
 +
 +            if (lu->unit_desc.provisioning_type == 2 ||
 +                lu->unit_desc.provisioning_type == 3) {
 +                outbuf[14] = 0x80;
 +            }
 +            /* Protection, exponent and lowest lba field left blank. */
 +            break;
 +        }
 +        trace_ufs_scsi_emulate_command_SAI_unsupported();
 +        goto illegal_request;
 +    case MODE_SELECT_10:
 +        trace_ufs_scsi_emulate_command_MODE_SELECT_10(r->req.cmd.xfer);
 +        break;
 +    case START_STOP:
 +        /*
 +         * TODO: START_STOP is not yet implemented. It always returns success.
 +         * Revisit it when ufs power management is implemented.
 +         */
 +        trace_ufs_scsi_emulate_command_START_STOP();
 +        break;
 +    case FORMAT_UNIT:
 +        trace_ufs_scsi_emulate_command_FORMAT_UNIT();
 +        break;
 +    case SEND_DIAGNOSTIC:
 +        trace_ufs_scsi_emulate_command_SEND_DIAGNOSTIC();
 +        break;
 +    default:
 +        trace_ufs_scsi_emulate_command_UNKNOWN(buf[0],
 +                                               scsi_command_name(buf[0]));
 +        scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
 +        return 0;
 +    }
 +    assert(!r->req.aiocb);
 +    r->iov.iov_len = MIN(r->buflen, req->cmd.xfer);
 +    if (r->iov.iov_len == 0) {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        assert(r->iov.iov_len == req->cmd.xfer);
 +        return -r->iov.iov_len;
 +    } else {
 +        return r->iov.iov_len;
 +    }
 +
 +illegal_request:
 +    if (r->req.status == -1) {
 +        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +    }
 +    return 0;
 +}
 +
 +static void ufs_scsi_emulate_read_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    int buflen = r->iov.iov_len;
 +
 +    if (buflen) {
 +        trace_ufs_scsi_emulate_read_data(buflen);
 +        r->iov.iov_len = 0;
 +        r->started = true;
 +        scsi_req_data(&r->req, buflen);
 +        return;
 +    }
 +
 +    /* This also clears the sense buffer for REQUEST SENSE.  */
 +    scsi_req_complete(&r->req, GOOD);
 +}
 +
 +static int ufs_scsi_check_mode_select(UfsLu *lu, int page, uint8_t *inbuf,
 +                                      int inlen)
 +{
 +    uint8_t mode_current[SCSI_MAX_MODE_LEN];
 +    uint8_t mode_changeable[SCSI_MAX_MODE_LEN];
 +    uint8_t *p;
 +    int len, expected_len, changeable_len, i;
 +
 +    /*
 +     * The input buffer does not include the page header, so it is
 +     * off by 2 bytes.
 +     */
 +    expected_len = inlen + 2;
 +    if (expected_len > SCSI_MAX_MODE_LEN) {
 +        return -1;
 +    }
 +
 +    /* MODE_PAGE_ALLS is only valid for MODE SENSE commands */
 +    if (page == MODE_PAGE_ALLS) {
 +        return -1;
 +    }
 +
 +    p = mode_current;
 +    memset(mode_current, 0, inlen + 2);
 +    len = mode_sense_page(lu, page, &p, 0);
 +    if (len < 0 || len != expected_len) {
 +        return -1;
 +    }
 +
 +    p = mode_changeable;
 +    memset(mode_changeable, 0, inlen + 2);
 +    changeable_len = mode_sense_page(lu, page, &p, 1);
 +    assert(changeable_len == len);
 +
 +    /*
 +     * Check that unchangeable bits are the same as what MODE SENSE
 +     * would return.
 +     */
 +    for (i = 2; i < len; i++) {
 +        if (((mode_current[i] ^ inbuf[i - 2]) & ~mode_changeable[i]) != 0) {
 +            return -1;
 +        }
 +    }
 +    return 0;
 +}
 +
 +static void ufs_scsi_apply_mode_select(UfsLu *lu, int page, uint8_t *p)
 +{
 +    switch (page) {
 +    case MODE_PAGE_CACHING:
 +        blk_set_enable_write_cache(lu->qdev.conf.blk, (p[0] & 4) != 0);
 +        break;
 +
 +    default:
 +        break;
 +    }
 +}
 +
 +static int mode_select_pages(UfsSCSIReq *r, uint8_t *p, int len, bool change)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    while (len > 0) {
 +        int page, page_len;
 +
 +        page = p[0] & 0x3f;
 +        if (p[0] & 0x40) {
 +            goto invalid_param;
 +        } else {
 +            if (len < 2) {
 +                goto invalid_param_len;
 +            }
 +            page_len = p[1];
 +            p += 2;
 +            len -= 2;
 +        }
 +
 +        if (page_len > len) {
 +            goto invalid_param_len;
 +        }
 +
 +        if (!change) {
 +            if (ufs_scsi_check_mode_select(lu, page, p, page_len) < 0) {
 +                goto invalid_param;
 +            }
 +        } else {
 +            ufs_scsi_apply_mode_select(lu, page, p);
 +        }
 +
 +        p += page_len;
 +        len -= page_len;
 +    }
 +    return 0;
 +
 +invalid_param:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
 +    return -1;
 +
 +invalid_param_len:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
 +    return -1;
 +}
 +
 +static void ufs_scsi_emulate_mode_select(UfsSCSIReq *r, uint8_t *inbuf)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    uint8_t *p = inbuf;
 +    int len = r->req.cmd.xfer;
 +    int hdr_len = 8;
 +    int bd_len;
 +    int pass;
 +
 +    /* We only support PF=1, SP=0.  */
 +    if ((r->req.cmd.buf[1] & 0x11) != 0x10) {
 +        goto invalid_field;
 +    }
 +
 +    if (len < hdr_len) {
 +        goto invalid_param_len;
 +    }
 +
 +    bd_len = lduw_be_p(&p[6]);
 +    if (bd_len != 0) {
 +        goto invalid_param;
 +    }
 +
 +    len -= hdr_len;
 +    p += hdr_len;
 +
 +    /* Ensure no change is made if there is an error!  */
 +    for (pass = 0; pass < 2; pass++) {
 +        if (mode_select_pages(r, p, len, pass == 1) < 0) {
 +            assert(pass == 0);
 +            return;
 +        }
 +    }
 +
 +    if (!blk_enable_write_cache(lu->qdev.conf.blk)) {
 +        /* The request is used as the AIO opaque value, so add a ref.  */
 +        scsi_req_ref(&r->req);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return;
 +    }
 +
 +    scsi_req_complete(&r->req, GOOD);
 +    return;
 +
 +invalid_param:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
 +    return;
 +
 +invalid_param_len:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
 +    return;
 +
 +invalid_field:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +}
 +
 +/* block_num and nb_blocks expected to be in qdev blocksize */
 +static inline bool check_lba_range(UfsLu *lu, uint64_t block_num,
 +                                   uint32_t nb_blocks)
 +{
 +    /*
 +     * The first line tests that no overflow happens when computing the last
 +     * block.  The second line tests that the last accessed block is in
 +     * range.
 +     *
 +     * Careful, the computations should not underflow for nb_blocks == 0,
 +     * and a 0-block read to the first LBA beyond the end of device is
 +     * valid.
 +     */
 +    return (block_num <= block_num + nb_blocks &&
 +            block_num + nb_blocks <= lu->qdev.max_lba + 1);
 +}
 +
 +static void ufs_scsi_emulate_write_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    if (r->iov.iov_len) {
 +        int buflen = r->iov.iov_len;
 +        trace_ufs_scsi_emulate_write_data(buflen);
 +        r->iov.iov_len = 0;
 +        scsi_req_data(&r->req, buflen);
 +        return;
 +    }
 +
 +    switch (req->cmd.buf[0]) {
 +    case MODE_SELECT_10:
 +        /* This also clears the sense buffer for REQUEST SENSE.  */
 +        ufs_scsi_emulate_mode_select(r, r->iov.iov_base);
 +        break;
 +    default:
 +        abort();
 +    }
 +}
 +
 +/* Return a pointer to the data buffer.  */
 +static uint8_t *ufs_scsi_get_buf(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    return (uint8_t *)r->iov.iov_base;
 +}
 +
 +static int32_t ufs_scsi_dma_command(SCSIRequest *req, uint8_t *buf)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint32_t len;
 +    uint8_t command;
 +
 +    command = buf[0];
 +
 +    if (!blk_is_available(lu->qdev.conf.blk)) {
 +        scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
 +        return 0;
 +    }
 +
 +    len = scsi_data_cdb_xfer(r->req.cmd.buf);
 +    switch (command) {
 +    case READ_6:
 +    case READ_10:
 +        trace_ufs_scsi_dma_command_READ(r->req.cmd.lba, len);
 +        if (r->req.cmd.buf[1] & 0xe0) {
 +            goto illegal_request;
 +        }
 +        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
 +            goto illegal_lba;
 +        }
 +        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        break;
 +    case WRITE_6:
 +    case WRITE_10:
 +        trace_ufs_scsi_dma_command_WRITE(r->req.cmd.lba, len);
 +        if (!blk_is_writable(lu->qdev.conf.blk)) {
 +            scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
 +            return 0;
 +        }
 +        if (r->req.cmd.buf[1] & 0xe0) {
 +            goto illegal_request;
 +        }
 +        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
 +            goto illegal_lba;
 +        }
 +        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        break;
 +    default:
 +        abort();
 +    illegal_request:
 +        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +        return 0;
 +    illegal_lba:
 +        scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
 +        return 0;
 +    }
 +    r->need_fua_emulation = ((r->req.cmd.buf[1] & 8) != 0);
 +    if (r->sector_count == 0) {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +    assert(r->iov.iov_len == 0);
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        return -r->sector_count * BDRV_SECTOR_SIZE;
 +    } else {
 +        return r->sector_count * BDRV_SECTOR_SIZE;
 +    }
 +}
 +
 +static void scsi_write_do_fua(UfsSCSIReq *r)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb == NULL);
 +    assert(!r->req.io_canceled);
 +
 +    if (r->need_fua_emulation) {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return;
 +    }
 +
 +    scsi_req_complete(&r->req, GOOD);
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_dma_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    r->sector += r->sector_count;
 +    r->sector_count = 0;
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        scsi_write_do_fua(r);
 +        return;
 +    } else {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_dma_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_dma_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +static BlockAIOCB *scsi_dma_readv(int64_t offset, QEMUIOVector *iov,
 +                                  BlockCompletionFunc *cb, void *cb_opaque,
 +                                  void *opaque)
 +{
 +    UfsSCSIReq *r = opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    return blk_aio_preadv(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
 +}
 +
 +static void scsi_init_iovec(UfsSCSIReq *r, size_t size)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    if (!r->iov.iov_base) {
 +        r->buflen = size;
 +        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
 +    }
 +    r->iov.iov_len = MIN(r->sector_count * BDRV_SECTOR_SIZE, r->buflen);
 +    qemu_iovec_init_external(&r->qiov, &r->iov, 1);
 +}
 +
 +static void scsi_read_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    uint32_t n;
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    n = r->qiov.size / BDRV_SECTOR_SIZE;
 +    r->sector += n;
 +    r->sector_count -= n;
 +    scsi_req_data(&r->req, r->qiov.size);
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_read_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +    trace_ufs_scsi_read_data_count(r->sector_count);
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +        trace_ufs_scsi_read_complete(r->req.tag, r->qiov.size);
 +    }
 +    scsi_read_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +/* Actually issue a read to the block device.  */
 +static void scsi_do_read(UfsSCSIReq *r, int ret)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +
 +    if (r->req.sg) {
 +        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_READ);
 +        r->req.residual -= r->req.sg->size;
 +        r->req.aiocb = dma_blk_io(
 +            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
 +            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_readv, r,
 +            scsi_dma_complete, r, DMA_DIRECTION_FROM_DEVICE);
 +    } else {
 +        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
 +                         r->qiov.size, BLOCK_ACCT_READ);
 +        r->req.aiocb = scsi_dma_readv(r->sector << BDRV_SECTOR_BITS, &r->qiov,
 +                                      scsi_read_complete, r, r);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_do_read_cb(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_do_read(opaque, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +/* Read more data from scsi device into buffer.  */
 +static void scsi_read_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    bool first;
 +
 +    trace_ufs_scsi_read_data_count(r->sector_count);
 +    if (r->sector_count == 0) {
 +        /* This also clears the sense buffer for REQUEST SENSE.  */
 +        scsi_req_complete(&r->req, GOOD);
 +        return;
 +    }
 +
 +    /* No data transfer may already be in progress */
 +    assert(r->req.aiocb == NULL);
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        trace_ufs_scsi_read_data_invalid();
 +        scsi_read_complete_noio(r, -EINVAL);
 +        return;
 +    }
 +
 +    if (!blk_is_available(req->dev->conf.blk)) {
 +        scsi_read_complete_noio(r, -ENOMEDIUM);
 +        return;
 +    }
 +
 +    first = !r->started;
 +    r->started = true;
 +    if (first && r->need_fua_emulation) {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_do_read_cb, r);
 +    } else {
 +        scsi_do_read(r, 0);
 +    }
 +}
 +
 +static void scsi_write_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    uint32_t n;
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    n = r->qiov.size / BDRV_SECTOR_SIZE;
 +    r->sector += n;
 +    r->sector_count -= n;
 +    if (r->sector_count == 0) {
 +        scsi_write_do_fua(r);
 +        return;
 +    } else {
 +        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
 +        trace_ufs_scsi_write_complete_noio(r->req.tag, r->qiov.size);
 +        scsi_req_data(&r->req, r->qiov.size);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_write_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_write_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +static BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVector *iov,
 +                                   BlockCompletionFunc *cb, void *cb_opaque,
 +                                   void *opaque)
 +{
 +    UfsSCSIReq *r = opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    return blk_aio_pwritev(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
 +}
 +
 +static void scsi_write_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    /* No data transfer may already be in progress */
 +    assert(r->req.aiocb == NULL);
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +    if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
 +        trace_ufs_scsi_write_data_invalid();
 +        scsi_write_complete_noio(r, -EINVAL);
 +        return;
 +    }
 +
 +    if (!r->req.sg && !r->qiov.size) {
 +        /* Called for the first time.  Ask the driver to send us more data.  */
 +        r->started = true;
 +        scsi_write_complete_noio(r, 0);
 +        return;
 +    }
 +    if (!blk_is_available(req->dev->conf.blk)) {
 +        scsi_write_complete_noio(r, -ENOMEDIUM);
 +        return;
 +    }
 +
 +    if (r->req.sg) {
 +        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg,
 +                       BLOCK_ACCT_WRITE);
 +        r->req.residual -= r->req.sg->size;
 +        r->req.aiocb = dma_blk_io(
 +            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
 +            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_writev, r,
 +            scsi_dma_complete, r, DMA_DIRECTION_TO_DEVICE);
 +    } else {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
 +                         r->qiov.size, BLOCK_ACCT_WRITE);
 +        r->req.aiocb = scsi_dma_writev(r->sector << BDRV_SECTOR_BITS, &r->qiov,
 +                                       scsi_write_complete, r, r);
 +    }
 +}
 +
 +static const SCSIReqOps ufs_scsi_emulate_reqops = {
 +    .size = sizeof(UfsSCSIReq),
 +    .free_req = ufs_scsi_free_request,
 +    .send_command = ufs_scsi_emulate_command,
 +    .read_data = ufs_scsi_emulate_read_data,
 +    .write_data = ufs_scsi_emulate_write_data,
 +    .get_buf = ufs_scsi_get_buf,
 +};
 +
 +static const SCSIReqOps ufs_scsi_dma_reqops = {
 +    .size = sizeof(UfsSCSIReq),
 +    .free_req = ufs_scsi_free_request,
 +    .send_command = ufs_scsi_dma_command,
 +    .read_data = scsi_read_data,
 +    .write_data = scsi_write_data,
 +    .get_buf = ufs_scsi_get_buf,
 +};
 +
 +/*
 + * Following commands are not yet supported
 + * PRE_FETCH(10),
 + * UNMAP,
 + * WRITE_BUFFER, READ_BUFFER,
 + * SECURITY_PROTOCOL_IN, SECURITY_PROTOCOL_OUT
 + */
 +static const SCSIReqOps *const ufs_scsi_reqops_dispatch[256] = {
 +    [TEST_UNIT_READY] = &ufs_scsi_emulate_reqops,
 +    [INQUIRY] = &ufs_scsi_emulate_reqops,
 +    [MODE_SENSE_10] = &ufs_scsi_emulate_reqops,
 +    [START_STOP] = &ufs_scsi_emulate_reqops,
 +    [READ_CAPACITY_10] = &ufs_scsi_emulate_reqops,
 +    [REQUEST_SENSE] = &ufs_scsi_emulate_reqops,
 +    [SYNCHRONIZE_CACHE] = &ufs_scsi_emulate_reqops,
 +    [MODE_SELECT_10] = &ufs_scsi_emulate_reqops,
 +    [VERIFY_10] = &ufs_scsi_emulate_reqops,
 +    [FORMAT_UNIT] = &ufs_scsi_emulate_reqops,
 +    [SERVICE_ACTION_IN_16] = &ufs_scsi_emulate_reqops,
 +    [SEND_DIAGNOSTIC] = &ufs_scsi_emulate_reqops,
 +
 +    [READ_6] = &ufs_scsi_dma_reqops,
 +    [READ_10] = &ufs_scsi_dma_reqops,
 +    [WRITE_6] = &ufs_scsi_dma_reqops,
 +    [WRITE_10] = &ufs_scsi_dma_reqops,
 +};
 +
 +static SCSIRequest *scsi_new_request(SCSIDevice *dev, uint32_t tag,
 +                                     uint32_t lun, uint8_t *buf,
 +                                     void *hba_private)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +    SCSIRequest *req;
 +    const SCSIReqOps *ops;
 +    uint8_t command;
 +
 +    command = buf[0];
 +    ops = ufs_scsi_reqops_dispatch[command];
 +    if (!ops) {
 +        ops = &ufs_scsi_emulate_reqops;
 +    }
 +    req = scsi_req_alloc(ops, &lu->qdev, tag, lun, hba_private);
 +
 +    return req;
 +}
 +
 +static Property ufs_lu_props[] = {
 +    DEFINE_PROP_DRIVE("drive", UfsLu, qdev.conf.blk),
 +    DEFINE_PROP_END_OF_LIST(),
 +};
 +
 +static bool ufs_lu_brdv_init(UfsLu *lu, Error **errp)
 +{
 +    SCSIDevice *dev = &lu->qdev;
 +    bool read_only;
 +
 +    if (!lu->qdev.conf.blk) {
 +        error_setg(errp, "drive property not set");
 +        return false;
 +    }
 +
 +    if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
 +        return false;
 +    }
 +
 +    if (blk_get_aio_context(lu->qdev.conf.blk) != qemu_get_aio_context() &&
 +        !lu->qdev.hba_supports_iothread) {
 +        error_setg(errp, "HBA does not support iothreads");
 +        return false;
 +    }
 +
 +    read_only = !blk_supports_write_perm(lu->qdev.conf.blk);
 +
 +    if (!blkconf_apply_backend_options(&dev->conf, read_only,
 +                                       dev->type == TYPE_DISK, errp)) {
 +        return false;
 +    }
 +
 +    if (blk_is_sg(lu->qdev.conf.blk)) {
 +        error_setg(errp, "unwanted /dev/sg*");
 +        return false;
 +    }
 +
 +    blk_iostatus_enable(lu->qdev.conf.blk);
 +    return true;
 +}
 +
 +static bool ufs_add_lu(UfsHc *u, UfsLu *lu, Error **errp)
 +{
 +    BlockBackend *blk = lu->qdev.conf.blk;
 +    int64_t brdv_len = blk_getlength(blk);
 +    uint64_t raw_dev_cap =
 +        be64_to_cpu(u->geometry_desc.total_raw_device_capacity);
 +
 +    if (u->device_desc.number_lu >= UFS_MAX_LUS) {
 +        error_setg(errp, "ufs host controller has too many logical units.");
 +        return false;
 +    }
 +
 +    if (u->lus[lu->lun] != NULL) {
 +        error_setg(errp, "ufs logical unit %d already exists.", lu->lun);
 +        return false;
 +    }
 +
 +    u->lus[lu->lun] = lu;
 +    u->device_desc.number_lu++;
 +    raw_dev_cap += (brdv_len >> UFS_GEOMETRY_CAPACITY_SHIFT);
 +    u->geometry_desc.total_raw_device_capacity = cpu_to_be64(raw_dev_cap);
 +    return true;
 +}
 +
 +static inline uint8_t ufs_log2(uint64_t input)
 +{
 +    int log = 0;
 +    while (input >>= 1) {
 +        log++;
 +    }
 +    return log;
 +}
 +
 +static void ufs_init_lu(UfsLu *lu)
 +{
 +    BlockBackend *blk = lu->qdev.conf.blk;
 +    int64_t brdv_len = blk_getlength(blk);
 +
 +    lu->lun = lu->qdev.lun;
 +    memset(&lu->unit_desc, 0, sizeof(lu->unit_desc));
 +    lu->unit_desc.length = sizeof(UnitDescriptor);
 +    lu->unit_desc.descriptor_idn = UFS_QUERY_DESC_IDN_UNIT;
 +    lu->unit_desc.lu_enable = 0x01;
 +    lu->unit_desc.logical_block_size = ufs_log2(lu->qdev.blocksize);
 +    lu->unit_desc.unit_index = lu->qdev.lun;
 +    lu->unit_desc.logical_block_count =
 +        cpu_to_be64(brdv_len / (1 << lu->unit_desc.logical_block_size));
 +}
 +
 +static bool ufs_lu_check_constraints(UfsLu *lu, Error **errp)
 +{
 +    if (!lu->qdev.conf.blk) {
 +        error_setg(errp, "drive property not set");
 +        return false;
 +    }
 +
 +    if (lu->qdev.channel != 0) {
 +        error_setg(errp, "ufs logical unit does not support channel");
 +        return false;
 +    }
 +
 +    if (lu->qdev.lun >= UFS_MAX_LUS) {
 +        error_setg(errp, "lun must be between 1 and %d", UFS_MAX_LUS - 1);
 +        return false;
 +    }
 +
 +    return true;
 +}
 +
 +static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +    BusState *s = qdev_get_parent_bus(&dev->qdev);
 +    UfsHc *u = UFS(s->parent);
 +    AioContext *ctx = NULL;
 +    uint64_t nb_sectors, nb_blocks;
 +
 +    if (!ufs_lu_check_constraints(lu, errp)) {
 +        return;
 +    }
 +
 +    if (lu->qdev.conf.blk) {
 +        ctx = blk_get_aio_context(lu->qdev.conf.blk);
 +        aio_context_acquire(ctx);
 +        if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
 +            goto out;
 +        }
 +    }
 +    lu->qdev.blocksize = UFS_BLOCK_SIZE;
 +    blk_get_geometry(lu->qdev.conf.blk, &nb_sectors);
 +    nb_blocks = nb_sectors / (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +    if (nb_blocks > UINT32_MAX) {
 +        nb_blocks = UINT32_MAX;
 +    }
 +    lu->qdev.max_lba = nb_blocks;
 +    lu->qdev.type = TYPE_DISK;
 +
 +    ufs_init_lu(lu);
 +    if (!ufs_add_lu(u, lu, errp)) {
 +        goto out;
 +    }
 +
 +    ufs_lu_brdv_init(lu, errp);
 +out:
 +    if (ctx) {
 +        aio_context_release(ctx);
 +    }
 +}
 +
 +static void ufs_lu_unrealize(SCSIDevice *dev)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +
 +    blk_drain(lu->qdev.conf.blk);
 +}
 +
 +static void ufs_wlu_realize(DeviceState *qdev, Error **errp)
 +{
 +    UfsWLu *wlu = UFSWLU(qdev);
 +    SCSIDevice *dev = &wlu->qdev;
 +
 +    if (!is_wlun(dev->lun)) {
 +        error_setg(errp, "not well-known logical unit number");
 +        return;
 +    }
 +
 +    QTAILQ_INIT(&dev->requests);
 +}
 +
 +static void ufs_lu_class_init(ObjectClass *oc, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(oc);
 +    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
 +
 +    sc->realize = ufs_lu_realize;
 +    sc->unrealize = ufs_lu_unrealize;
 +    sc->alloc_req = scsi_new_request;
 +    dc->bus_type = TYPE_UFS_BUS;
 +    device_class_set_props(dc, ufs_lu_props);
 +    dc->desc = "Virtual UFS logical unit";
 +}
 +
 +static void ufs_wlu_class_init(ObjectClass *oc, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(oc);
 +    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
 +
 +    /*
 +     * The realize() function of TYPE_SCSI_DEVICE causes a segmentation fault
 +     * if a block drive does not exist. Define a new realize function for
 +     * well-known LUs that do not have a block drive.
 +     */
 +    dc->realize = ufs_wlu_realize;
 +    sc->alloc_req = scsi_new_request;
 +    dc->bus_type = TYPE_UFS_BUS;
 +    dc->desc = "Virtual UFS well-known logical unit";
 +}
 +
 +static const TypeInfo ufs_lu_info = {
 +    .name = TYPE_UFS_LU,
 +    .parent = TYPE_SCSI_DEVICE,
 +    .class_init = ufs_lu_class_init,
 +    .instance_size = sizeof(UfsLu),
 +};
 +
 +static const TypeInfo ufs_wlu_info = {
 +    .name = TYPE_UFS_WLU,
 +    .parent = TYPE_SCSI_DEVICE,
 +    .class_init = ufs_wlu_class_init,
 +    .instance_size = sizeof(UfsWLu),
 +};
 +
 +static void ufs_lu_register_types(void)
 +{
 +    type_register_static(&ufs_lu_info);
 +    type_register_static(&ufs_wlu_info);
 +}
 +
 +type_init(ufs_lu_register_types)
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/ufs.c
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
   * SPDX-License-Identifier: GPL-2.0-or-later
   */
 +/**
 + * Reference Specs: https://www.jedec.org/, 3.1
 + *
 + * Usage
 + * -----
 + *
 + * Add options:
 + *      -drive file=<file>,if=none,id=<drive_id>
 + *      -device ufs,serial=<serial>,id=<bus_name>, \
 + *              nutrs=<N[optional]>,nutmrs=<N[optional]>
 + *      -device ufs-lu,drive=<drive_id>,bus=<bus_name>
 + */
 +
  #include "qemu/osdep.h"
  #include "qapi/error.h"
  #include "migration/vmstate.h"
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
      },
  };
 +static QEMUSGList *ufs_get_sg_list(SCSIRequest *scsi_req)
 +{
 +    UfsRequest *req = scsi_req->hba_private;
 +    return req->sg;
 +}
 +
 +static void ufs_build_upiu_sense_data(UfsRequest *req, SCSIRequest *scsi_req)
 +{
 +    req->rsp_upiu.sr.sense_data_len = cpu_to_be16(scsi_req->sense_len);
 +    assert(scsi_req->sense_len <= SCSI_SENSE_LEN);
 +    memcpy(req->rsp_upiu.sr.sense_data, scsi_req->sense, scsi_req->sense_len);
 +}
 +
  static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
                                    uint8_t flags, uint8_t response,
                                    uint8_t scsi_status,
@@ -XXX,XX +XXX,XX @@ static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
      req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
  }
 +static void ufs_scsi_command_complete(SCSIRequest *scsi_req, size_t resid)
 +{
 +    UfsRequest *req = scsi_req->hba_private;
 +    int16_t status = scsi_req->status;
 +    uint32_t expected_len = be32_to_cpu(req->req_upiu.sc.exp_data_transfer_len);
 +    uint32_t transfered_len = scsi_req->cmd.xfer - resid;
 +    uint8_t flags = 0, response = UFS_COMMAND_RESULT_SUCESS;
 +    uint16_t data_segment_length;
 +
 +    if (expected_len > transfered_len) {
 +        req->rsp_upiu.sr.residual_transfer_count =
 +            cpu_to_be32(expected_len - transfered_len);
 +        flags |= UFS_UPIU_FLAG_UNDERFLOW;
 +    } else if (expected_len < transfered_len) {
 +        req->rsp_upiu.sr.residual_transfer_count =
 +            cpu_to_be32(transfered_len - expected_len);
 +        flags |= UFS_UPIU_FLAG_OVERFLOW;
 +    }
 +
 +    if (status != 0) {
 +        ufs_build_upiu_sense_data(req, scsi_req);
 +        response = UFS_COMMAND_RESULT_FAIL;
 +    }
 +
 +    data_segment_length = cpu_to_be16(scsi_req->sense_len +
 +                                      sizeof(req->rsp_upiu.sr.sense_data_len));
 +    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_RESPONSE, flags, response,
 +                          status, data_segment_length);
 +
 +    ufs_complete_req(req, UFS_REQUEST_SUCCESS);
 +
 +    scsi_req->hba_private = NULL;
 +    scsi_req_unref(scsi_req);
 +}
 +
 +static const struct SCSIBusInfo ufs_scsi_info = {
 +    .tcq = true,
 +    .max_target = 0,
 +    .max_lun = UFS_MAX_LUS,
 +    .max_channel = 0,
 +
 +    .get_sg_list = ufs_get_sg_list,
 +    .complete = ufs_scsi_command_complete,
 +};
 +
 +static UfsReqResult ufs_exec_scsi_cmd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t lun = req->req_upiu.header.lun;
 +    uint8_t task_tag = req->req_upiu.header.task_tag;
 +    SCSIDevice *dev = NULL;
 +
 +    trace_ufs_exec_scsi_cmd(req->slot, lun, req->req_upiu.sc.cdb[0]);
 +
 +    if (!is_wlun(lun)) {
 +        if (lun >= u->device_desc.number_lu) {
 +            trace_ufs_err_scsi_cmd_invalid_lun(lun);
 +            return UFS_REQUEST_FAIL;
 +        } else if (u->lus[lun] == NULL) {
 +            trace_ufs_err_scsi_cmd_invalid_lun(lun);
 +            return UFS_REQUEST_FAIL;
 +        }
 +    }
 +
 +    switch (lun) {
 +    case UFS_UPIU_REPORT_LUNS_WLUN:
 +        dev = &u->report_wlu->qdev;
 +        break;
 +    case UFS_UPIU_UFS_DEVICE_WLUN:
 +        dev = &u->dev_wlu->qdev;
 +        break;
 +    case UFS_UPIU_BOOT_WLUN:
 +        dev = &u->boot_wlu->qdev;
 +        break;
 +    case UFS_UPIU_RPMB_WLUN:
 +        dev = &u->rpmb_wlu->qdev;
 +        break;
 +    default:
 +        dev = &u->lus[lun]->qdev;
 +    }
 +
 +    SCSIRequest *scsi_req = scsi_req_new(
 +        dev, task_tag, lun, req->req_upiu.sc.cdb, UFS_CDB_SIZE, req);
 +
 +    uint32_t len = scsi_req_enqueue(scsi_req);
 +    if (len) {
 +        scsi_req_continue(scsi_req);
 +    }
 +
 +    return UFS_REQUEST_NO_COMPLETE;
 +}
 +
  static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
  {
-     BDRVQcow2State *s = bs->opaque;
+     trace_ufs_exec_nop_cmd(req->slot);
--    bool found;
+@@ -XXX,XX +XXX,XX @@ static const RpmbUnitDescriptor rpmb_unit_desc = {
--    Qcow2BitmapList *bm_list;
-+    BdrvDirtyBitmap *bitmap;
+ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
-+    uint64_t bitmap_directory_size = 0;
+ {
-+    uint32_t nb_bitmaps = 0;
++    UfsHc *u = req->hc;
-+
+     uint8_t lun = req->req_upiu.qr.index;
-+    if (bdrv_find_dirty_bitmap(bs, name)) {
-+        error_setg(errp, "Bitmap already exists: %s", name);
+-    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
 +    if (lun != UFS_UPIU_RPMB_WLUN &&
 +        (lun > UFS_MAX_LUS || u->lus[lun] == NULL)) {
          trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
          return UFS_QUERY_RESULT_INVALID_INDEX;
      }
@@ -XXX,XX +XXX,XX @@ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
      if (lun == UFS_UPIU_RPMB_WLUN) {
          memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
      } else {
 -        /* unit descriptor is not yet supported */
 -        return UFS_QUERY_RESULT_INVALID_INDEX;
 +        memcpy(&req->rsp_upiu.qr.data, &u->lus[lun]->unit_desc,
 +               sizeof(u->lus[lun]->unit_desc));
      }
      return UFS_QUERY_RESULT_SUCCESS;
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
          req_result = ufs_exec_nop_cmd(req);
          break;
      case UFS_UPIU_TRANSACTION_COMMAND:
 -        /* Not yet implemented */
 -        req_result = UFS_REQUEST_FAIL;
 +        req_result = ufs_exec_scsi_cmd(req);
          break;
      case UFS_UPIU_TRANSACTION_QUERY_REQ:
          req_result = ufs_exec_query_cmd(req);
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
          req_result = UFS_REQUEST_FAIL;
      }
 -    ufs_complete_req(req, req_result);
 +    /*
 +     * The ufs_complete_req for scsi commands is handled by the
 +     * ufs_scsi_command_complete() callback function. Therefore, to avoid
 +     * duplicate processing, ufs_complete_req() is not called for scsi commands.
 +     */
 +    if (req_result != UFS_REQUEST_NO_COMPLETE) {
 +        ufs_complete_req(req, req_result);
 +    }
  }
  static void ufs_process_req(void *opaque)
@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
      u->flags.permanently_disable_fw_update = 1;
  }
 +static bool ufs_init_wlu(UfsHc *u, UfsWLu **wlu, uint8_t wlun, Error **errp)
 +{
 +    UfsWLu *new_wlu = UFSWLU(qdev_new(TYPE_UFS_WLU));
 +
 +    qdev_prop_set_uint32(DEVICE(new_wlu), "lun", wlun);
 +
 +    /*
 +     * The well-known lu shares the same bus as the normal lu. If the well-known
 +     * lu writes the same channel value as the normal lu, the report will be
 +     * made not only for the normal lu but also for the well-known lu at
 +     * REPORT_LUN time. To prevent this, the channel value of normal lu is fixed
 +     * to 0 and the channel value of well-known lu is fixed to 1.
 +     */
 +    qdev_prop_set_uint32(DEVICE(new_wlu), "channel", 1);
 +    if (!qdev_realize_and_unref(DEVICE(new_wlu), BUS(&u->bus), errp)) {
 +        return false;
 +    }
++
-     if (s->qcow_version < 3) {
++    *wlu = new_wlu;
-         /* Without autoclear_features, we would always have to assume
++    return true;
-@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
++}
-         goto fail;
++
  static void ufs_realize(PCIDevice *pci_dev, Error **errp)
  {
      UfsHc *u = UFS(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
          return;
      }
--    if (s->nb_bitmaps == 0) {
++    qbus_init(&u->bus, sizeof(UfsBus), TYPE_UFS_BUS, &pci_dev->qdev,
--        return true;
++              u->parent_obj.qdev.id);
-+    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
++    u->bus.parent_bus.info = &ufs_scsi_info;
-+        if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
++
-+            nb_bitmaps++;
+     ufs_init_state(u);
-+            bitmap_directory_size +=
+     ufs_init_hc(u);
-+                calc_dir_entry_size(strlen(bdrv_dirty_bitmap_name(bitmap)), 0);
+     ufs_init_pci(u, pci_dev);
-+        }
++
-     }
++    if (!ufs_init_wlu(u, &u->report_wlu, UFS_UPIU_REPORT_LUNS_WLUN, errp)) {
-+    nb_bitmaps++;
++        return;
-+    bitmap_directory_size += calc_dir_entry_size(strlen(name), 0);
++    }
++
--    if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) {
++    if (!ufs_init_wlu(u, &u->dev_wlu, UFS_UPIU_UFS_DEVICE_WLUN, errp)) {
-+    if (nb_bitmaps > QCOW2_MAX_BITMAPS) {
++        return;
-         error_setg(errp,
++    }
-                    "Maximum number of persistent bitmaps is already reached");
++
-         goto fail;
++    if (!ufs_init_wlu(u, &u->boot_wlu, UFS_UPIU_BOOT_WLUN, errp)) {
-     }
++        return;
++    }
--    if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) >
++
--        QCOW2_MAX_BITMAP_DIRECTORY_SIZE)
++    if (!ufs_init_wlu(u, &u->rpmb_wlu, UFS_UPIU_RPMB_WLUN, errp)) {
--    {
++        return;
-+    if (bitmap_directory_size > QCOW2_MAX_BITMAP_DIRECTORY_SIZE) {
++    }
-         error_setg(errp, "Not enough space in the bitmap directory");
+ }
-         goto fail;
-     }
+ static void ufs_exit(PCIDevice *pci_dev)
+ {
--    qemu_co_mutex_lock(&s->lock);
+     UfsHc *u = UFS(pci_dev);
--    bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
--                               s->bitmap_directory_size, errp);
++    if (u->dev_wlu) {
--    qemu_co_mutex_unlock(&s->lock);
++        object_unref(OBJECT(u->dev_wlu));
--    if (bm_list == NULL) {
++        u->dev_wlu = NULL;
--        goto fail;
++    }
--    }
++
--
++    if (u->report_wlu) {
--    found = find_bitmap_by_name(bm_list, name);
++        object_unref(OBJECT(u->report_wlu));
--    bitmap_list_free(bm_list);
++        u->report_wlu = NULL;
--    if (found) {
++    }
--        error_setg(errp, "Bitmap with the same name is already stored");
++
--        goto fail;
++    if (u->rpmb_wlu) {
--    }
++        object_unref(OBJECT(u->rpmb_wlu));
--
++        u->rpmb_wlu = NULL;
-     return true;
++    }
++
- fail:
++    if (u->boot_wlu) {
 +        object_unref(OBJECT(u->boot_wlu));
 +        u->boot_wlu = NULL;
 +    }
 +
      qemu_bh_delete(u->doorbell_bh);
      qemu_bh_delete(u->complete_bh);
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
      dc->vmsd = &ufs_vmstate;
  }
 +static bool ufs_bus_check_address(BusState *qbus, DeviceState *qdev,
 +                                  Error **errp)
 +{
 +    SCSIDevice *dev = SCSI_DEVICE(qdev);
 +    UfsBusClass *ubc = UFS_BUS_GET_CLASS(qbus);
 +    UfsHc *u = UFS(qbus->parent);
 +
 +    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_WLU) == 0) {
 +        if (dev->lun != UFS_UPIU_REPORT_LUNS_WLUN &&
 +            dev->lun != UFS_UPIU_UFS_DEVICE_WLUN &&
 +            dev->lun != UFS_UPIU_BOOT_WLUN && dev->lun != UFS_UPIU_RPMB_WLUN) {
 +            error_setg(errp, "bad well-known lun: %d", dev->lun);
 +            return false;
 +        }
 +
 +        if ((dev->lun == UFS_UPIU_REPORT_LUNS_WLUN && u->report_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_UFS_DEVICE_WLUN && u->dev_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_BOOT_WLUN && u->boot_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_RPMB_WLUN && u->rpmb_wlu != NULL)) {
 +            error_setg(errp, "well-known lun %d already exists", dev->lun);
 +            return false;
 +        }
 +
 +        return true;
 +    }
 +
 +    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_LU) != 0) {
 +        error_setg(errp, "%s cannot be connected to ufs-bus",
 +                   object_get_typename(OBJECT(dev)));
 +        return false;
 +    }
 +
 +    return ubc->parent_check_address(qbus, qdev, errp);
 +}
 +
 +static void ufs_bus_class_init(ObjectClass *class, void *data)
 +{
 +    BusClass *bc = BUS_CLASS(class);
 +    UfsBusClass *ubc = UFS_BUS_CLASS(class);
 +    ubc->parent_check_address = bc->check_address;
 +    bc->check_address = ufs_bus_check_address;
 +}
 +
  static const TypeInfo ufs_info = {
      .name = TYPE_UFS,
      .parent = TYPE_PCI_DEVICE,
@@ -XXX,XX +XXX,XX @@ static const TypeInfo ufs_info = {
      .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
  };
 +static const TypeInfo ufs_bus_info = {
 +    .name = TYPE_UFS_BUS,
 +    .parent = TYPE_SCSI_BUS,
 +    .class_init = ufs_bus_class_init,
 +    .class_size = sizeof(UfsBusClass),
 +    .instance_size = sizeof(UfsBus),
 +};
 +
  static void ufs_register_types(void)
  {
      type_register_static(&ufs_info);
 +    type_register_static(&ufs_bus_info);
  }
  type_init(ufs_register_types)
 diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/meson.build
 +++ b/hw/ufs/meson.build
@@ -1 +1 @@
 -system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
 +system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c', 'lu.c'))
 diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/trace-events
 +++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@ ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", l
  ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
  ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
 +# lu.c
 +ufs_scsi_check_condition(uint32_t tag, uint8_t key, uint8_t asc, uint8_t ascq) "Command complete tag=0x%x sense=%d/%d/%d"
 +ufs_scsi_read_complete(uint32_t tag, size_t size) "Data ready tag=0x%x len=%zd"
 +ufs_scsi_read_data_count(uint32_t sector_count) "Read sector_count=%d"
 +ufs_scsi_read_data_invalid(void) "Data transfer direction invalid"
 +ufs_scsi_write_complete_noio(uint32_t tag, size_t size) "Write complete tag=0x%x more=%zd"
 +ufs_scsi_write_data_invalid(void) "Data transfer direction invalid"
 +ufs_scsi_emulate_vpd_page_00(size_t xfer) "Inquiry EVPD[Supported pages] buffer size %zd"
 +ufs_scsi_emulate_vpd_page_80_not_supported(void) "Inquiry EVPD[Serial number] not supported"
 +ufs_scsi_emulate_vpd_page_80(size_t xfer) "Inquiry EVPD[Serial number] buffer size %zd"
 +ufs_scsi_emulate_vpd_page_87(size_t xfer) "Inquiry EVPD[Mode Page Policy] buffer size %zd"
 +ufs_scsi_emulate_mode_sense(int cmd, int page, size_t xfer, int control) "Mode Sense(%d) (page %d, xfer %zd, page_control %d)"
 +ufs_scsi_emulate_read_data(int buflen) "Read buf_len=%d"
 +ufs_scsi_emulate_write_data(int buflen) "Write buf_len=%d"
 +ufs_scsi_emulate_command_START_STOP(void) "START STOP UNIT"
 +ufs_scsi_emulate_command_FORMAT_UNIT(void) "FORMAT UNIT"
 +ufs_scsi_emulate_command_SEND_DIAGNOSTIC(void) "SEND DIAGNOSTIC"
 +ufs_scsi_emulate_command_SAI_16(void) "SAI READ CAPACITY(16)"
 +ufs_scsi_emulate_command_SAI_unsupported(void) "Unsupported Service Action In"
 +ufs_scsi_emulate_command_MODE_SELECT_10(size_t xfer) "Mode Select(10) (len %zd)"
 +ufs_scsi_emulate_command_VERIFY(int bytchk) "Verify (bytchk %d)"
 +ufs_scsi_emulate_command_UNKNOWN(int cmd, const char *name) "Unknown SCSI command (0x%2.2x=%s)"
 +ufs_scsi_dma_command_READ(uint64_t lba, uint32_t len) "Read (block %" PRIu64 ", count %u)"
 +ufs_scsi_dma_command_WRITE(uint64_t lba, int len) "Write (block %" PRIu64 ", count %u)"
 +
  # error condition
  ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
  ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
 --
-.24.1
+.41.0

-[PULL 08/34] iotests: s/qocw2/qcow2/
+Deleted patch
-Probably due to blind copy-pasting, we have several instances of "qocw2"
-in our iotests.  Fix them.
-Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191107163708.833192-2-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/060 | 2 +-
- tests/qemu-iotests/061 | 2 +-
- tests/qemu-iotests/062 | 2 +-
- tests/qemu-iotests/066 | 2 +-
- tests/qemu-iotests/068 | 2 +-
- tests/qemu-iotests/108 | 2 +-
- tests/qemu-iotests/138 | 2 +-
- tests/qemu-iotests/261 | 2 +-
-files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _filter_io_error()
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/062
-+++ b/tests/qemu-iotests/062
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/066
-+++ b/tests/qemu-iotests/066
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/068
-+++ b/tests/qemu-iotests/068
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/108
-+++ b/tests/qemu-iotests/108
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/138
-+++ b/tests/qemu-iotests/138
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/261
-+++ b/tests/qemu-iotests/261
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
---
-.24.1

-[PULL 09/34] iotests/qcow2.py: Add dump-header-exts
+Deleted patch
-This is useful for tests that want to whitelist fields from dump-header
-(with grep) but still print all header extensions.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-3-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/qcow2.py | 5 +++++
-file changed, 5 insertions(+)
-diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/qcow2.py
-+++ b/tests/qemu-iotests/qcow2.py
-@@ -XXX,XX +XXX,XX @@ def cmd_dump_header(fd):
-     h.dump()
-     h.dump_extensions()
-+def cmd_dump_header_exts(fd):
-+    h = QcowHeader(fd)
-+    h.dump_extensions()
-+
- def cmd_set_header(fd, name, value):
-     try:
-         value = int(value, 0)
-@@ -XXX,XX +XXX,XX @@ def cmd_set_feature_bit(fd, group, bit):
- cmds = [
-     [ 'dump-header',          cmd_dump_header,          0, 'Dump image header and header extensions' ],
-+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],
-     [ 'set-header',           cmd_set_header,           2, 'Set a field in the header'],
-     [ 'add-header-ext',       cmd_add_header_ext,       2, 'Add a header extension' ],
-     [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ],
---
-.24.1

-[PULL 10/34] iotests/qcow2.py: Split feature fields into bits
+Deleted patch
-Print the feature fields as a set of bits so that filtering is easier.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-4-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/031.out  | 36 +++++++++----------
- tests/qemu-iotests/036.out  | 18 +++++-----
- tests/qemu-iotests/039.out  | 22 ++++++------
- tests/qemu-iotests/060.out  | 20 +++++------
- tests/qemu-iotests/061.out  | 72 ++++++++++++++++++-------------------
- tests/qemu-iotests/137.out  |  2 +-
- tests/qemu-iotests/qcow2.py | 18 +++++++---
-files changed, 99 insertions(+), 89 deletions(-)
-diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/031.out
-+++ b/tests/qemu-iotests/031.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/036.out
-+++ b/tests/qemu-iotests/036.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x8000000000000000
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     [63]
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x8000000000000000
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        [63]
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/039.out
-+++ b/tests/qemu-iotests/039.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 039
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- == Creating a dirty image file ==
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
-@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
- == Read-only access must still work ==
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x1
-+incompatible_features     [0]
- == Repairing the image file must succeed ==
- ERROR cluster 5 refcount=0 reference=1
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- == Data should still be accessible after repair ==
- read 512/512 bytes at offset 0
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- Rebuilding refcount structure
- Repairing cluster 1 refcount=1 reference=0
- Repairing cluster 2 refcount=1 reference=0
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- == Creating an image file with lazy_refcounts=off ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- == Committing to a backing file with lazy_refcounts=on ==
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- Image committed.
--incompatible_features     0x0
--incompatible_features     0x0
-+incompatible_features     []
-+incompatible_features     []
- No errors were found on the image.
- No errors were found on the image.
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- *** done
-diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/060.out
-+++ b/tests/qemu-iotests/060.out
-@@ -XXX,XX +XXX,XX @@ ERROR cluster 3 refcount=1 reference=3
-errors were found on the image.
- Data may be corrupted, or further writes to the image may corrupt it.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
-@@ -XXX,XX +XXX,XX @@ ERROR cluster 2 refcount=1 reference=2
-errors were found on the image.
- Data may be corrupted, or further writes to the image may corrupt it.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- ERROR refcount block 0 refcount=2
- ERROR cluster 2 refcount=1 reference=2
- Rebuilding refcount structure
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- === Testing cluster data reference into inactive L2 table ===
-@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
-leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- ERROR cluster 4 refcount=1 reference=2
- Leaked cluster 9 refcount=1 reference=0
- Repairing cluster 4 refcount=1 reference=2
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- No errors were found on the image.
-diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/061.out
-+++ b/tests/qemu-iotests/061.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x1
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     [0]
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x40000000000
--autoclear_features        0x40000000000
-+incompatible_features     []
-+compatible_features       [42]
-+autoclear_features        [42]
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x1
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     [0]
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-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 @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/qcow2.py
-+++ b/tests/qemu-iotests/qcow2.py
-@@ -XXX,XX +XXX,XX @@ class QcowHeader:
-         [ uint64_t, '%#x',  'snapshot_offset' ],
-         # Version 3 header fields
--        [ uint64_t, '%#x',  'incompatible_features' ],
--        [ uint64_t, '%#x',  'compatible_features' ],
--        [ uint64_t, '%#x',  'autoclear_features' ],
-+        [ uint64_t, 'mask', 'incompatible_features' ],
-+        [ uint64_t, 'mask', 'compatible_features' ],
-+        [ uint64_t, 'mask', 'autoclear_features' ],
-         [ uint32_t, '%d',   'refcount_order' ],
-         [ uint32_t, '%d',   'header_length' ],
-     ];
-@@ -XXX,XX +XXX,XX @@ class QcowHeader:
-     def dump(self):
-         for f in QcowHeader.fields:
--            print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
-+            value = self.__dict__[f[2]]
-+            if f[1] == 'mask':
-+                bits = []
-+                for bit in range(64):
-+                    if value & (1 << bit):
-+                        bits.append(bit)
-+                value_str = str(bits)
-+            else:
-+                value_str = f[1] % value
-+
-+            print("%-25s" % f[2], value_str)
-         print("")
-     def dump_extensions(self):
---
-.24.1

-[PULL 11/34] iotests: Add _filter_json_filename
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-5-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.filter | 24 ++++++++++++++++++++++++
-file changed, 24 insertions(+)
-diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.filter
-+++ b/tests/qemu-iotests/common.filter
-@@ -XXX,XX +XXX,XX @@ _filter_qmp_empty_return()
-     grep -v '{"return": {}}'
- }
-+_filter_json_filename()
-+{
-+    $PYTHON -c 'import sys
-+result, *fnames = sys.stdin.read().split("json:{")
-+depth = 0
-+for fname in fnames:
-+    depth += 1 # For the opening brace in the split separator
-+    for chr_i, chr in enumerate(fname):
-+        if chr == "{":
-+            depth += 1
-+        elif chr == "}":
-+            depth -= 1
-+            if depth == 0:
-+                break
-+
-+    # json:{} filenames may be nested; filter out everything from
-+    # inside the outermost one
-+    if depth == 0:
-+        chr_i += 1 # First character past the filename
-+        result += "json:{ /* filtered */ }" + fname[chr_i:]
-+
-+sys.stdout.write(result)'
-+}
-+
- # make sure this script returns success
- true
---
-.24.1

-[PULL 12/34] iotests: Filter refcount_order in 036
+Deleted patch
-This test can run just fine with other values for refcount_bits, so we
-should filter the value from qcow2.py's dump-header.  In fact, we can
-filter everything but the feature bits and header extensions, because
-that is what the test is about.
-(036 currently ignores user-specified image options, but that will be
-fixed in the next patch.)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-6-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/036     |  9 ++++---
- tests/qemu-iotests/036.out | 48 --------------------------------------
-files changed, 6 insertions(+), 51 deletions(-)
-diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/036
-+++ b/tests/qemu-iotests/036
-@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
- # Without feature table
- $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
--$PYTHON qcow2.py "$TEST_IMG" dump-header
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- _img_info
- # With feature table containing bit 63
-@@ -XXX,XX +XXX,XX @@ echo === Create image with unknown autoclear feature bit ===
- echo
- _make_test_img 64M
- $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
--$PYTHON qcow2.py "$TEST_IMG" dump-header
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- echo
- echo === Repair image ===
- echo
- _check_test_img -r all
--$PYTHON qcow2.py "$TEST_IMG" dump-header
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- # success, all done
- echo "*** done"
-diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/036.out
-+++ b/tests/qemu-iotests/036.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 036
- === Image with unknown incompatible feature bit ===
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     [63]
- compatible_features       []
- autoclear_features        []
--refcount_order            4
--header_length             104
--
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes
- === Create image with unknown autoclear feature bit ===
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     []
- compatible_features       []
- autoclear_features        [63]
--refcount_order            4
--header_length             104
--
- Header extension:
- magic                     0x6803f857
- length                    192
-@@ -XXX,XX +XXX,XX @@ data                      <binary>
- === Repair image ===
- No errors were found on the image.
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     []
- compatible_features       []
- autoclear_features        []
--refcount_order            4
--header_length             104
--
- Header extension:
- magic                     0x6803f857
- length                    192
---
-.24.1

-[PULL 13/34] iotests: Replace IMGOPTS by _unsupported_imgopts
+Deleted patch
-Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
-globally.  That is not how it should be done; instead, they should
-simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
-default anyway).
-This makes the tests heed user-specified $IMGOPTS.  Some do not work
-with all image options, though, so we need to disable them accordingly.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com>
-Message-id: 20191107163708.833192-7-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/036 | 3 +--
- tests/qemu-iotests/060 | 4 ++--
- tests/qemu-iotests/062 | 3 ++-
- tests/qemu-iotests/066 | 3 ++-
- tests/qemu-iotests/068 | 3 ++-
- tests/qemu-iotests/098 | 4 ++--
-files changed, 11 insertions(+), 9 deletions(-)
-diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/036
-+++ b/tests/qemu-iotests/036
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
--
- # Only qcow2v3 and later supports feature bits
--IMGOPTS="compat=1.1"
-+_unsupported_imgopts 'compat=0.10'
- echo
- echo === Image with unknown incompatible feature bit ===
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _filter_io_error()
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# These tests only work for compat=1.1 images with refcount_bits=16
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- # The repair process will create a large file - so check for availability first
- _require_large_file 64G
-@@ -XXX,XX +XXX,XX @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
- l2_offset=262144 # 0x40000 (XXX: just an assumption)
- l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
--IMGOPTS="compat=1.1"
--
- OPEN_RW="open -o overlap-check=all $TEST_IMG"
- # Overlap checks are done before write operations only, therefore opening an
- # image read-only makes the overlap-check option irrelevant
-diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/062
-+++ b/tests/qemu-iotests/062
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# We need zero clusters and snapshots
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
--IMGOPTS="compat=1.1"
- IMG_SIZE=64M
- echo
-diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/066
-+++ b/tests/qemu-iotests/066
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# We need zero clusters and snapshots
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
- # Intentionally create an unaligned image
--IMGOPTS="compat=1.1"
- IMG_SIZE=$((64 * 1024 * 1024 + 512))
- echo
-diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/068
-+++ b/tests/qemu-iotests/068
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# Internal snapshots are (currently) impossible with refcount_bits=1
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
--IMGOPTS="compat=1.1"
- IMG_SIZE=128K
- case "$QEMU_DEFAULT_MACHINE" in
-diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/098
-+++ b/tests/qemu-iotests/098
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
--
--IMGOPTS="compat=1.1"
-+# The code path we want to test here only works for compat=1.1 images
-+_unsupported_imgopts 'compat=0.10'
- for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
---
-.24.1

-[PULL 14/34] iotests: Drop compat=1.1 in 050
+Deleted patch
-IMGOPTS can never be empty for qcow2, because the check scripts adds
-compat=1.1 unless the user specified any compat option themselves.
-Thus, this block does not do anything and can be dropped.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-8-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/050 | 4 ----
-file changed, 4 deletions(-)
-diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/050
-+++ b/tests/qemu-iotests/050
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2 qed
- _supported_proto file
--if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
--  IMGOPTS=compat=1.1
--fi
--
- echo
- echo "== Creating images =="
---
-.24.1

-[PULL 15/34] iotests: Let _make_test_img parse its parameters
+Deleted patch
-This will allow us to add more options than just -b.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-9-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
-file changed, 20 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     # extra qemu-img options can be added by tests
-     # at least one argument (the image size) needs to be added
-     local extra_img_options=""
--    local image_size=$*
-     local optstr=""
-     local img_name=""
-     local use_backing=0
-     local backing_file=""
-     local object_options=""
-+    local misc_params=()
-     if [ -n "$TEST_IMG_FILE" ]; then
-         img_name=$TEST_IMG_FILE
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-         optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
-     fi
--    if [ "$1" = "-b" ]; then
--        use_backing=1
--        backing_file=$2
--        image_size=$3
--    fi
-+    for param; do
-+        if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
-+            backing_file=$param
-+            continue
-+        fi
-+
-+        case "$param" in
-+            -b)
-+                use_backing=1
-+                ;;
-+
-+            *)
-+                misc_params=("${misc_params[@]}" "$param")
-+                ;;
-+        esac
-+    done
-+
-     if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
-         optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
-     fi
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     # XXX(hch): have global image options?
-     (
-      if [ $use_backing = 1 ]; then
--        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
-+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
-      else
--        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
-+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
-      fi
-     ) | _filter_img_create
---
-.24.1

-[PULL 16/34] iotests: Add -o and --no-opts to _make_test_img
+Deleted patch
-Blindly overriding IMGOPTS is suboptimal as this discards user-specified
-options.  Whatever options the test needs should simply be appended.
-Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
-that is cumbersome.  It’s simpler to just give _make_test_img an -o
-parameter with which tests can add options.
-Some tests actually must override the user-specified options, though,
-for example when creating an image in a different format than the test
-$IMGFMT.  For such cases, --no-opts allows clearing the current option
-list.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-10-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.rc | 13 +++++++++++++
-file changed, 13 insertions(+)
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     local use_backing=0
-     local backing_file=""
-     local object_options=""
-+    local opts_param=false
-     local misc_params=()
-     if [ -n "$TEST_IMG_FILE" ]; then
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-         if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
-             backing_file=$param
-             continue
-+        elif $opts_param; then
-+            optstr=$(_optstr_add "$optstr" "$param")
-+            opts_param=false
-+            continue
-         fi
-         case "$param" in
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-                 use_backing=1
-                 ;;
-+            -o)
-+                opts_param=true
-+                ;;
-+
-+            --no-opts)
-+                optstr=""
-+                ;;
-+
-             *)
-                 misc_params=("${misc_params[@]}" "$param")
-                 ;;
---
-.24.1

-[PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051
+Deleted patch
-It did not matter before, but now that _make_test_img understands -o, we
-should use it properly here.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-11-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/051 | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/051
-+++ b/tests/qemu-iotests/051
-@@ -XXX,XX +XXX,XX @@ echo
- echo === With version 2 images enabling lazy refcounts must fail ===
- echo
--_make_test_img -ocompat=0.10 $size
-+_make_test_img -o compat=0.10 $size
- run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=on
- run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=off
---
-.24.1

-[PULL 18/34] iotests: Replace IMGOPTS= by -o
+Deleted patch
-Tests should not overwrite all user-supplied image options, but only add
-to it (which will effectively overwrite conflicting values).  Accomplish
-this by passing options to _make_test_img via -o instead of $IMGOPTS.
-For some tests, there is no functional change because they already only
-appended options to IMGOPTS.  For these, this patch is just a
-simplification.
-For others, this is a change, so they now heed user-specified $IMGOPTS.
-Some of those tests do not work with all image options, though, so we
-need to disable them accordingly.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-12-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/031 |  9 ++++---
- tests/qemu-iotests/039 | 24 ++++++------------
- tests/qemu-iotests/059 | 18 ++++++-------
- tests/qemu-iotests/060 |  6 ++---
- tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
- tests/qemu-iotests/079 |  3 +--
- tests/qemu-iotests/106 |  2 +-
- tests/qemu-iotests/108 |  2 +-
- tests/qemu-iotests/112 | 32 ++++++++++++------------
- tests/qemu-iotests/115 |  3 +--
- tests/qemu-iotests/121 |  6 ++---
- tests/qemu-iotests/125 |  2 +-
- tests/qemu-iotests/137 |  2 +-
- tests/qemu-iotests/138 |  3 +--
- tests/qemu-iotests/175 |  2 +-
- tests/qemu-iotests/190 |  2 +-
- tests/qemu-iotests/191 |  3 +--
- tests/qemu-iotests/220 |  4 ++-
- tests/qemu-iotests/243 |  6 +++--
- tests/qemu-iotests/244 | 10 +++++---
- tests/qemu-iotests/250 |  3 +--
- tests/qemu-iotests/265 |  2 +-
-files changed, 100 insertions(+), 101 deletions(-)
-diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/031
-+++ b/tests/qemu-iotests/031
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
-+# We want to test compat=0.10, which does not support refcount widths
-+# other than 16
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- CLUSTER_SIZE=65536
- # qcow2.py output depends on the exact options used, so override the command
- # line here as an exception
--for IMGOPTS in "compat=0.10" "compat=1.1"; do
-+for compat in "compat=0.10" "compat=1.1"; do
-     echo
--    echo ===== Testing with -o $IMGOPTS =====
-+    echo ===== Testing with -o $compat =====
-     echo
-     echo === Create image with unknown header extension ===
-     echo
--    _make_test_img 64M
-+    _make_test_img -o $compat 64M
-     $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension"
-     $PYTHON qcow2.py "$TEST_IMG" dump-header
-     _check_test_img
-diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/039
-+++ b/tests/qemu-iotests/039
-@@ -XXX,XX +XXX,XX @@ size=128M
- echo
- echo "== Checking that image is clean on shutdown =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "== Creating a dirty image file =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "== Opening a dirty image read/write should repair it =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
- echo
- echo "== Creating an image file with lazy_refcounts=off =="
--IMGOPTS="compat=1.1,lazy_refcounts=off"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "== Committing to a backing file with lazy_refcounts=on =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--TEST_IMG="$TEST_IMG".base _make_test_img $size
-+TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
--IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
- $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG commit "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG".base _check_test_img
- echo
- echo "== Changing lazy_refcounts setting at runtime =="
--IMGOPTS="compat=1.1,lazy_refcounts=off"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
- _NO_VALGRIND \
- $QEMU_IO -c "reopen -o lazy-refcounts=on" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
- $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
- _check_test_img
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "reopen -o lazy-refcounts=off" \
-diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/059
-+++ b/tests/qemu-iotests/059
-@@ -XXX,XX +XXX,XX @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
- echo
- echo "=== Testing monolithicFlat creation and opening ==="
--IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
-+_make_test_img -o "subformat=monolithicFlat" 2G
- _img_info
- _cleanup_test_img
- echo
- echo "=== Testing monolithicFlat with zeroed_grain ==="
--IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
-+_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
- _cleanup_test_img
- echo
- echo "=== Testing big twoGbMaxExtentFlat ==="
--IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
-+_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
- $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
- _cleanup_test_img
-@@ -XXX,XX +XXX,XX @@ _img_info
- echo
- echo "=== Testing truncated sparse ==="
--IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
-+_make_test_img -o "subformat=monolithicSparse" 100G
- truncate -s 10M $TEST_IMG
- _img_info
- echo
- echo "=== Converting to streamOptimized from image with small cluster size==="
--TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
-+TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
- $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
- $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
- $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
-@@ -XXX,XX +XXX,XX @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
- echo '--- blkdebug ---'
- # Should work, because bdrv_dirname() works fine with blkdebug
--IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-+_make_test_img -o "subformat=monolithicFlat" 64M
- $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
-          -c info \
->&1 \
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo '--- quorum ---'
- # Should not work, because bdrv_dirname() does not work with quorum
--IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-+_make_test_img -o "subformat=monolithicFlat" 64M
- cp "$TEST_IMG" "$TEST_IMG.orig"
- filename="json:{
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo
- echo "=== Testing 4TB monolithicFlat creation and IO ==="
--IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
-+_make_test_img -o "subformat=monolithicFlat" 4T
- _img_info
- $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo
- echo "=== Testing qemu-img map on extents ==="
- for fmt in monolithicSparse twoGbMaxExtentSparse; do
--    IMGOPTS="subformat=$fmt" _make_test_img 31G
-+    _make_test_img -o "subformat=$fmt" 31G
-     $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
-     $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
-     $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
- # compat=0.10 is required in order to make the following discard actually
- # unallocate the sector rather than make it a zero sector - we want COW, after
- # all.
--IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
-+_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
- # Write two clusters, the second one enforces creation of an L2 table after
- # the first data cluster.
- $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Discarding a non-covered in-bounds refblock ==="
- echo
--IMGOPTS='refcount_bits=1' _make_test_img 64M
-+_make_test_img -o 'refcount_bits=1' 64M
- # Pretend there's a refblock somewhere where there is no refblock to
- # cover it (but the covering refblock has a valid index in the
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Discarding a refblock covered by an unaligned refblock ==="
- echo
--IMGOPTS='refcount_bits=1' _make_test_img 64M
-+_make_test_img -o 'refcount_bits=1' 64M
- # Same as above
- poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# Conversion between different compat versions can only really work
-+# with refcount_bits=16
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- echo
- echo "=== Testing version downgrade with zero expansion ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $PYTHON qcow2.py "$TEST_IMG" dump-header
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing dirty version downgrade ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
-          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42
- $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42
- $PYTHON qcow2.py "$TEST_IMG" dump-header
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version upgrade and resize ==="
- echo
--IMGOPTS="compat=0.10" _make_test_img 64M
-+_make_test_img -o "compat=0.10" 64M
- $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
- $PYTHON qcow2.py "$TEST_IMG" dump-header
- $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing dirty lazy_refcounts=off ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
-          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing backing file ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
- $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing invalid configurations ==="
- echo
--IMGOPTS="compat=0.10" _make_test_img 64M
-+_make_test_img -o "compat=0.10" 64M
- $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
- $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
- $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
- echo
- echo "=== Testing correct handling of unset value ==="
- echo
--IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
-+_make_test_img -o "compat=1.1,cluster_size=1k" 64M
- echo "Should work:"
- $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
- echo "Should not work:" # Just to know which of these tests actually fails
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
- echo
- echo "=== Testing zero expansion on inactive clusters ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing zero expansion on shared L2 table ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing zero expansion on backed image ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
- echo
- echo "=== Testing zero expansion on backed inactive clusters ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
- echo
- echo "=== Testing zero expansion on backed image with shared L2 table ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing preallocated zero expansion on full image ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
-+TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing progress report without snapshot ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
- $QEMU_IO -c "write -z 0  64k" \
-          -c "write -z 1G 64k" \
-          -c "write -z 2G 64k" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing progress report with snapshot ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
- $QEMU_IO -c "write -z 0  64k" \
-          -c "write -z 1G 64k" \
-          -c "write -z 2G 64k" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with external data file ==="
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _img_info --format-specific
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Try changing the external data file ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
- $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
- _img_info --format-specific
- TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
- echo
- echo "=== Clearing and setting data-file-raw ==="
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
- $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
- _img_info --format-specific
- _check_test_img
-diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/079
-+++ b/tests/qemu-iotests/079
-@@ -XXX,XX +XXX,XX @@ echo
- cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
- for s in $cluster_sizes; do
--    IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
--        _make_test_img 4G
-+    _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
- done
- # success, all done
-diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/106
-+++ b/tests/qemu-iotests/106
-@@ -XXX,XX +XXX,XX @@ for create_mode in off falloc full; do
-         echo
-         echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
--        IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
-+        _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
-         $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
-         expected_size=0
-diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/108
-+++ b/tests/qemu-iotests/108
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Repairing unreferenced data cluster in new refblock area ==='
- echo
--IMGOPTS='cluster_size=512' _make_test_img 64M
-+_make_test_img -o 'cluster_size=512' 64M
- # Allocate the first 128 kB in the image (first refblock)
- $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
- # should be 131072 == 0x20000
-diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/112
-+++ b/tests/qemu-iotests/112
-@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits limits ==='
- echo
- # Must be positive (non-zero)
--IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
-+_make_test_img -o "refcount_bits=0" 64M
- # Must be positive (non-negative)
--IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=-1" 64M
- # May not exceed 64
--IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
-+_make_test_img -o "refcount_bits=128" 64M
- # Must be a power of two
--IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
-+_make_test_img -o "refcount_bits=42" 64M
- # 1 is the minimum
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # 64 is the maximum
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- # 16 is the default
-@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits and compat=0.10 ==='
- echo
- # Should work
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
-+_make_test_img -o "compat=0.10,refcount_bits=16" 64M
- print_refcount_bits
- # Should not work
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "compat=0.10,refcount_bits=1" 64M
-+_make_test_img -o "compat=0.10,refcount_bits=64" 64M
- echo
- echo '=== Snapshot limit on refcount_bits=1 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Snapshot limit on refcount_bits=2 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
-+_make_test_img -o "refcount_bits=2" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Compressed clusters with refcount_bits=1 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # Both should fit into a single host cluster; instead of failing to increase the
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== MSb set in 64 bit refcount ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Snapshot on maximum 64 bit refcount value ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Testing too many references for check ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # This cluster should be created at 0x50000
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Multiple walks necessary during amend ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
-+_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
- # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
- # single L2 table, the reftable and a single refblock. This creates 58 data
-diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/115
-+++ b/tests/qemu-iotests/115
-@@ -XXX,XX +XXX,XX @@ echo
- # least 256 MB. We can achieve that by using preallocation=metadata for an image
- # which has a guest disk size of 256 MB.
--IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
--    _make_test_img 256M
-+_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
- # We know for sure that the L1 and refcount tables do not overlap with any other
- # structure because the metadata overlap checks would have caught that case.
-diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/121
-+++ b/tests/qemu-iotests/121
-@@ -XXX,XX +XXX,XX @@ echo
- # Preallocation speeds up the write operation, but preallocating everything will
- # destroy the purpose of the write; so preallocate one KB less than what would
- # cause a reftable growth...
--IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
-+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
- # ...and make the image the desired size afterwards.
- $QEMU_IMG resize "$TEST_IMG" 65M
-@@ -XXX,XX +XXX,XX @@ echo
- echo '--- Test 2 ---'
- echo
--IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
-+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
- # This results in an L1 table growth which in turn results in some clusters at
- # the start of the image becoming free
- $QEMU_IMG resize "$TEST_IMG" 65M
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Allocating a new refcount block must not leave holes in the image ==='
- echo
--IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
-+_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
- # This results in an image with 256 used clusters: the qcow2 header,
- # the refcount table, one refcount block, the L1 table, four L2 tables
-diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/125
-+++ b/tests/qemu-iotests/125
-@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
-         for growth_mode in off metadata falloc full; do
-             echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
--            IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
-+            _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
-             $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
-             host_size_0=$(get_image_size_on_host)
-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-clean-interval=-1" \
-     "$TEST_IMG" | _filter_qemu_io
--IMGOPTS="cluster_size=256k" _make_test_img 32P
-+_make_test_img -o "cluster_size=256k" 32P
- $QEMU_IO \
-     -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
-     "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/138
-+++ b/tests/qemu-iotests/138
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Check on an image with a multiple of 2^32 clusters ==='
- echo
--IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
--    _make_test_img 512
-+_make_test_img -o "cluster_size=512" 512
- # Allocate L2 table
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/175
-+++ b/tests/qemu-iotests/175
-@@ -XXX,XX +XXX,XX @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
- for mode in off full falloc; do
-     echo
-     echo "== creating image with preallocation $mode =="
--    IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
-+    _make_test_img -o preallocation=$mode $size | _filter_imgfmt
-     stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
- done
-diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/190
-+++ b/tests/qemu-iotests/190
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- echo "== Huge file =="
- echo
--IMGOPTS='cluster_size=2M' _make_test_img 2T
-+_make_test_img -o 'cluster_size=2M' 2T
- $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
- $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
-diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/191
-+++ b/tests/qemu-iotests/191
-@@ -XXX,XX +XXX,XX @@ echo === Preparing and starting VM ===
- echo
- TEST_IMG="${TEST_IMG}.base" _make_test_img $size
--IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
--    TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
-+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
- _make_test_img -b "${TEST_IMG}.mid"
- TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
-diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/220
-+++ b/tests/qemu-iotests/220
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# To use a different refcount width but 16 bits we need compat=1.1
-+_unsupported_imgopts 'compat=0.10'
- echo "== Creating huge file =="
-@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
- # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
- _require_large_file 513T
--IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
-+_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
- echo "== Populating refcounts =="
- # We want an image with 256M refcounts * 2M clusters = 512T referenced.
-diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/243
-+++ b/tests/qemu-iotests/243
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# External data files do not work with compat=0.10
-+_unsupported_imgopts 'compat=0.10'
- for mode in off metadata falloc full; do
-@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
-     echo "=== preallocation=$mode ==="
-     echo
--    IMGOPTS="preallocation=$mode" _make_test_img 64M
-+    _make_test_img -o "preallocation=$mode" 64M
-     printf "File size: "
-     du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
-     echo "=== External data file: preallocation=$mode ==="
-     echo
--    IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
-+    _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
-     echo -n "qcow2 file size: "
-     du -b $TEST_IMG | cut -f1
-diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/244
-+++ b/tests/qemu-iotests/244
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# External data files do not work with compat=0.10
-+_unsupported_imgopts 'compat=0.10'
- echo
- echo "=== Create and open image with external data file ==="
- echo
- echo "With data file name in the image:"
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- _check_test_img
- $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Standalone image with external data file (efficient) ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- echo -n "qcow2 file size before I/O: "
- du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Standalone image with external data file (valid raw) ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
- echo -n "qcow2 file size before I/O: "
- du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== bdrv_co_block_status test for file and offset=0 ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/250
-+++ b/tests/qemu-iotests/250
-@@ -XXX,XX +XXX,XX @@ disk_usage()
- }
- size=2100M
--IMGOPTS="cluster_size=1M,preallocation=metadata"
--_make_test_img $size
-+_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
- $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
-          -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/265
-+++ b/tests/qemu-iotests/265
-@@ -XXX,XX +XXX,XX @@ _supported_os Linux
- echo '--- Writing to the image ---'
- # Reduce cluster size so we get more and quicker I/O
--IMGOPTS='cluster_size=4096' _make_test_img 1M
-+_make_test_img -o 'cluster_size=4096' 1M
- (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
-      echo "aio_write -P 42 $((kb + 1))k 2k"; \
-  done) \
---
-.24.1

-[PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-13-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/071 | 4 ++--
- tests/qemu-iotests/174 | 2 +-
- tests/qemu-iotests/178 | 4 ++--
- tests/qemu-iotests/197 | 4 ++--
- tests/qemu-iotests/215 | 4 ++--
-files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/071
-+++ b/tests/qemu-iotests/071
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Testing blkverify through filename ==="
- echo
--TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
-+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
-     _filter_imgfmt
- _make_test_img $IMG_SIZE
- $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Testing blkverify through file blockref ==="
- echo
--TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
-+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
-     _filter_imgfmt
- _make_test_img $IMG_SIZE
- $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
-diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/174
-+++ b/tests/qemu-iotests/174
-@@ -XXX,XX +XXX,XX @@ _unsupported_fmt raw
- size=256K
--IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
-+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
- echo
- echo "== reading wrong format should fail =="
-diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/178
-+++ b/tests/qemu-iotests/178
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
- make_test_img_with_fmt() {
-     # Shadow global variables within this function
--    local IMGFMT="$1" IMGOPTS=""
--    _make_test_img "$2"
-+    local IMGFMT="$1"
-+    _make_test_img --no-opts "$2"
- }
- qemu_io_with_fmt() {
-diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/197
-+++ b/tests/qemu-iotests/197
-@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
- fi
- _make_test_img 4G
- $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
--IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
--    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
-+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
-+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
- $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
- # Ensure that a read of two clusters, but where one is already allocated,
-diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/215
-+++ b/tests/qemu-iotests/215
-@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
- fi
- _make_test_img 4G
- $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
--IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
--    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
-+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
-+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
- $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
- # Ensure that a read of two clusters, but where one is already allocated,
---
-.24.1

-[PULL 20/34] iotests: Drop IMGOPTS use in 267
+Deleted patch
-Overwriting IMGOPTS means ignoring all user-supplied options, which is
-not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
-variable.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-14-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/267 | 12 ++++++++----
-file changed, 8 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/267
-+++ b/tests/qemu-iotests/267
-@@ -XXX,XX +XXX,XX @@ size=128M
- run_test()
- {
--    _make_test_img $size
-+    if [ -n "$BACKING_FILE" ]; then
-+        _make_test_img -b "$BACKING_FILE" $size
-+    else
-+        _make_test_img $size
-+    fi
-     printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
- }
-@@ -XXX,XX +XXX,XX @@ echo
- TEST_IMG="$TEST_IMG.base" _make_test_img $size
--IMGOPTS="backing_file=$TEST_IMG.base" \
-+BACKING_FILE="$TEST_IMG.base" \
- run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
-          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
-          -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
--IMGOPTS="backing_file=$TEST_IMG.base" \
-+BACKING_FILE="$TEST_IMG.base" \
- run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
-          -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
-          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== -blockdev with NBD server on the backing file ==="
- echo
--IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
-+_make_test_img -b "$TEST_IMG.base" $size
- cat <<EOF |
- nbd_server_start unix:$SOCK_DIR/nbd
- nbd_server_add -w backing-fmt
---
-.24.1

-[PULL 21/34] iotests: Avoid qemu-img create
+Deleted patch
-Use _make_test_img whenever possible.  This way, we will not ignore
-user-specified image options.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-15-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/094 | 2 +-
- tests/qemu-iotests/111 | 3 +--
- tests/qemu-iotests/123 | 2 +-
- tests/qemu-iotests/153 | 2 +-
- tests/qemu-iotests/200 | 4 ++--
-files changed, 6 insertions(+), 7 deletions(-)
-diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/094
-+++ b/tests/qemu-iotests/094
-@@ -XXX,XX +XXX,XX @@ _supported_proto nbd
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
- _make_test_img 64M
--$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
-+TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
- _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
-              -nodefaults
-diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/111
-+++ b/tests/qemu-iotests/111
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qed qcow qcow2 vmdk
- _supported_proto file
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
--$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
--    | _filter_testdir | _filter_imgfmt
-+_make_test_img -b "$TEST_IMG.inexistent"
- # success, all done
- echo '*** done'
-diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/123
-+++ b/tests/qemu-iotests/123
-@@ -XXX,XX +XXX,XX @@ _supported_os Linux
- SRC_IMG="$TEST_DIR/source.$IMGFMT"
- _make_test_img 1M
--$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
-+TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
- $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/153
-+++ b/tests/qemu-iotests/153
-@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
-     echo
-     echo "== Creating test image =="
--    $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
-+    _make_test_img -b "${TEST_IMG}.base"
-     echo
-     echo "== Launching QEMU, opts: '$opts1' =="
-diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/200
-+++ b/tests/qemu-iotests/200
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- BACKING_IMG="${TEST_DIR}/backing.img"
- TEST_IMG="${TEST_DIR}/test.img"
--${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
--${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
-+TEST_IMG="$BACKING_IMG" _make_test_img 512M
-+_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
- ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
---
-.24.1

-[PULL 22/34] iotests: Use _rm_test_img for deleting test images
+Deleted patch
-Just rm will not delete external data files.  Use _rm_test_img every
-time we delete a test image.
-(In the process, clean up the indentation of every _cleanup() this patch
-touches.)
-((Also, use quotes consistently.  I am happy to see unquoted instances
-like "rm -rf $TEST_DIR/..." go.))
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-16-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/019 |  6 +++---
- tests/qemu-iotests/020 |  6 +++---
- tests/qemu-iotests/024 | 10 +++++-----
- tests/qemu-iotests/028 |  2 +-
- tests/qemu-iotests/029 |  2 +-
- tests/qemu-iotests/043 |  4 +++-
- tests/qemu-iotests/048 |  2 +-
- tests/qemu-iotests/050 |  4 ++--
- tests/qemu-iotests/053 |  4 ++--
- tests/qemu-iotests/058 |  2 +-
- tests/qemu-iotests/059 |  2 +-
- tests/qemu-iotests/061 |  2 +-
- tests/qemu-iotests/063 |  6 ++++--
- tests/qemu-iotests/069 |  2 +-
- tests/qemu-iotests/074 |  2 +-
- tests/qemu-iotests/080 |  2 +-
- tests/qemu-iotests/081 |  6 +++---
- tests/qemu-iotests/085 |  9 ++++++---
- tests/qemu-iotests/088 |  2 +-
- tests/qemu-iotests/092 |  2 +-
- tests/qemu-iotests/094 |  2 +-
- tests/qemu-iotests/095 |  5 +++--
- tests/qemu-iotests/099 |  7 ++++---
- tests/qemu-iotests/109 |  4 ++--
- tests/qemu-iotests/110 |  4 ++--
- tests/qemu-iotests/122 |  6 ++++--
- tests/qemu-iotests/123 |  2 +-
- tests/qemu-iotests/141 |  4 +++-
- tests/qemu-iotests/142 |  2 +-
- tests/qemu-iotests/144 |  4 +++-
- tests/qemu-iotests/153 | 10 +++-------
- tests/qemu-iotests/156 |  8 ++++++--
- tests/qemu-iotests/159 |  2 +-
- tests/qemu-iotests/160 |  3 ++-
- tests/qemu-iotests/161 |  4 ++--
- tests/qemu-iotests/170 |  2 +-
- tests/qemu-iotests/172 |  6 +++---
- tests/qemu-iotests/173 |  3 ++-
- tests/qemu-iotests/178 |  2 +-
- tests/qemu-iotests/182 |  2 +-
- tests/qemu-iotests/183 |  2 +-
- tests/qemu-iotests/185 |  4 ++--
- tests/qemu-iotests/187 |  6 +++---
- tests/qemu-iotests/190 |  2 +-
- tests/qemu-iotests/191 |  6 +++---
- tests/qemu-iotests/195 |  2 +-
- tests/qemu-iotests/197 |  2 +-
- tests/qemu-iotests/200 |  3 ++-
- tests/qemu-iotests/215 |  2 +-
- tests/qemu-iotests/225 |  2 +-
- tests/qemu-iotests/229 |  3 ++-
- tests/qemu-iotests/232 |  4 +++-
- tests/qemu-iotests/243 |  2 +-
- tests/qemu-iotests/244 |  4 ++--
- tests/qemu-iotests/247 |  4 +++-
- tests/qemu-iotests/249 |  4 ++--
- tests/qemu-iotests/252 |  2 +-
-files changed, 118 insertions(+), 95 deletions(-)
-diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/019
-+++ b/tests/qemu-iotests/019
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--    rm -f "$TEST_IMG.base"
--    rm -f "$TEST_IMG.orig"
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.base"
-+    _rm_test_img "$TEST_IMG.orig"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/020
-+++ b/tests/qemu-iotests/020
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--    rm -f "$TEST_IMG.base"
--    rm -f "$TEST_IMG.orig"
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.base"
-+    _rm_test_img "$TEST_IMG.orig"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/024
-+++ b/tests/qemu-iotests/024
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
--    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
-+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
-+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
-     rmdir "$TEST_DIR/subdir" 2> /dev/null
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/028
-+++ b/tests/qemu-iotests/028
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm -f "${TEST_IMG}.copy"
-+    _rm_test_img "${TEST_IMG}.copy"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/029
-+++ b/tests/qemu-iotests/029
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f $TEST_IMG.snap
-+    _rm_test_img "$TEST_IMG.snap"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/043
-+++ b/tests/qemu-iotests/043
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG".[123].base
-+    for img in "$TEST_IMG".[123].base; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/048
-+++ b/tests/qemu-iotests/048
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     echo "Cleanup"
-     _cleanup_test_img
--    rm "${TEST_IMG_FILE2}"
-+    _rm_test_img "${TEST_IMG_FILE2}"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/050
-+++ b/tests/qemu-iotests/050
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.old"
--    rm -f "$TEST_IMG.new"
-+    _rm_test_img "$TEST_IMG.old"
-+    _rm_test_img "$TEST_IMG.new"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/053
-+++ b/tests/qemu-iotests/053
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f "$TEST_IMG.orig"
--    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.orig"
-+    _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/058
-+++ b/tests/qemu-iotests/058
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     nbd_server_stop
-     _cleanup_test_img
--    rm -f "$converted_image"
-+    _rm_test_img "$converted_image"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/059
-+++ b/tests/qemu-iotests/059
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.qcow2"
-+    IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.data
-+    _rm_test_img "$TEST_IMG.data"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/063
-+++ b/tests/qemu-iotests/063
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--    rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
-+    _cleanup_test_img
-+    for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/069
-+++ b/tests/qemu-iotests/069
-@@ -XXX,XX +XXX,XX @@ echo "=== Creating an image with a backing file and deleting that file ==="
- echo
- TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
- _make_test_img -b "$TEST_IMG.base" $IMG_SIZE
--rm -f "$TEST_IMG.base"
-+_rm_test_img "$TEST_IMG.base"
- # Just open the image and close it right again (this should print an error message)
- $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
-diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/074
-+++ b/tests/qemu-iotests/074
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     echo "Cleanup"
-     _cleanup_test_img
--    rm "${TEST_IMG2}"
-+    _rm_test_img "${TEST_IMG2}"
-     rm -f "$TEST_DIR/blkdebug.conf"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/080
-+++ b/tests/qemu-iotests/080
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f $TEST_IMG.snap
-+    _rm_test_img "$TEST_IMG.snap"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/081
-+++ b/tests/qemu-iotests/081
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -rf $TEST_DIR/1.raw
--    rm -rf $TEST_DIR/2.raw
--    rm -rf $TEST_DIR/3.raw
-+    _rm_test_img "$TEST_DIR/1.raw"
-+    _rm_test_img "$TEST_DIR/2.raw"
-+    _rm_test_img "$TEST_DIR/3.raw"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/085
-+++ b/tests/qemu-iotests/085
-@@ -XXX,XX +XXX,XX @@ _cleanup()
-     _cleanup_qemu
-     for i in $(seq 1 ${SNAPSHOTS})
-     do
--        rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
--        rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
-+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
-+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
-+    done
-+    for img in "${TEST_IMG}".{1,2,base}
-+    do
-+        _rm_test_img "$img"
-     done
--    rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/088
-+++ b/tests/qemu-iotests/088
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f $TEST_IMG.snap
-+    _rm_test_img "$TEST_IMG.snap"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/092
-+++ b/tests/qemu-iotests/092
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f $TEST_IMG.snap
-+    _rm_test_img "$TEST_IMG.snap"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/094
-+++ b/tests/qemu-iotests/094
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     _cleanup_qemu
-     _cleanup_test_img
--    rm -f "$TEST_DIR/source.$IMGFMT"
-+    _rm_test_img "$TEST_DIR/source.$IMGFMT"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/095
-+++ b/tests/qemu-iotests/095
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm  -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
--    _cleanup_test_img
-+    _rm_test_img "${TEST_IMG}.base"
-+    _rm_test_img "${TEST_IMG}.snp1"
-+    _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/099
-+++ b/tests/qemu-iotests/099
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.compare"
-+    rm -f "$TEST_DIR/blkdebug.conf"
-+
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-@@ -XXX,XX +XXX,XX @@ echo
- test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
--rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
--
- # success, all done
- echo "*** done"
- rm -f $seq.full
-diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/109
-+++ b/tests/qemu-iotests/109
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm -f $TEST_IMG.src
--    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.src"
-+    _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/110
-+++ b/tests/qemu-iotests/110
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--        rm -f "$TEST_IMG.copy"
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.copy"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/122
-+++ b/tests/qemu-iotests/122
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    rm -f "$TEST_IMG".[123]
--    _cleanup_test_img
-+    for img in "$TEST_IMG".[123]; do
-+        _rm_test_img "$img"
-+    done
-+    _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/123
-+++ b/tests/qemu-iotests/123
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$SRC_IMG"
-+    _rm_test_img "$SRC_IMG"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/141
-+++ b/tests/qemu-iotests/141
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     _cleanup_qemu
-     _cleanup_test_img
--    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
-+    for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/142
-+++ b/tests/qemu-iotests/142
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.snap
-+    _rm_test_img "$TEST_IMG.snap"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/144
-+++ b/tests/qemu-iotests/144
-@@ -XXX,XX +XXX,XX @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
- _cleanup()
- {
-     _cleanup_qemu
--    rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
-+    for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/153
-+++ b/tests/qemu-iotests/153
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "${TEST_IMG}.base"
--    rm -f "${TEST_IMG}.overlay"
--    rm -f "${TEST_IMG}.convert"
--    rm -f "${TEST_IMG}.a"
--    rm -f "${TEST_IMG}.b"
--    rm -f "${TEST_IMG}.c"
--    rm -f "${TEST_IMG}.lnk"
-+    for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/156
-+++ b/tests/qemu-iotests/156
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
-+    for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
-     '"status": "null"'
- # Remove the source images
--rm -f "$TEST_IMG{,.backing,.overlay}"
-+for img in "$TEST_IMG{,.backing,.overlay}"; do
-+    _rm_test_img "$img"
-+done
- echo
-diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/159
-+++ b/tests/qemu-iotests/159
-@@ -XXX,XX +XXX,XX @@ status=1
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.out"
-+    _rm_test_img "$TEST_IMG.out"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/160
-+++ b/tests/qemu-iotests/160
-@@ -XXX,XX +XXX,XX @@ status=1
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
-+    _rm_test_img "$TEST_IMG.out"
-+    _rm_test_img "$TEST_IMG.out.dd"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/161
-+++ b/tests/qemu-iotests/161
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.base"
--    rm -f "$TEST_IMG.int"
-+    _rm_test_img "$TEST_IMG.base"
-+    _rm_test_img "$TEST_IMG.int"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/170
-+++ b/tests/qemu-iotests/170
-@@ -XXX,XX +XXX,XX @@ status=1
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.out"
-+    _rm_test_img  "$TEST_IMG.out"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/172
-+++ b/tests/qemu-iotests/172
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--    rm -f "$TEST_IMG.2"
--    rm -f "$TEST_IMG.3"
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.2"
-+    _rm_test_img "$TEST_IMG.3"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/173
-+++ b/tests/qemu-iotests/173
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm  -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
-+    _rm_test_img "${TEST_DIR}/image.base"
-+    _rm_test_img "${TEST_DIR}/image.snp1"
-     _cleanup_test_img
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/178
-+++ b/tests/qemu-iotests/178
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.converted"
-+    _rm_test_img "$TEST_IMG.converted"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/182
-+++ b/tests/qemu-iotests/182
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.overlay"
-+    _rm_test_img "$TEST_IMG.overlay"
-     rm -f "$SOCK_DIR/nbd.socket"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/183
-+++ b/tests/qemu-iotests/183
-@@ -XXX,XX +XXX,XX @@ MIG_SOCKET="${SOCK_DIR}/migrate"
- _cleanup()
- {
-     rm -f "${MIG_SOCKET}"
--    rm -f "${TEST_IMG}.dest"
-+    _rm_test_img "${TEST_IMG}.dest"
-     _cleanup_test_img
-     _cleanup_qemu
- }
-diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/185
-+++ b/tests/qemu-iotests/185
-@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
- _cleanup()
- {
--    rm -f "${TEST_IMG}.mid"
--    rm -f "${TEST_IMG}.copy"
-+    _rm_test_img "${TEST_IMG}.mid"
-+    _rm_test_img "${TEST_IMG}.copy"
-     _cleanup_test_img
-     _cleanup_qemu
- }
-diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/187
-+++ b/tests/qemu-iotests/187
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
--    _cleanup_test_img
--    rm -f "$TEST_IMG.2"
--    rm -f "$TEST_IMG.3"
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.2"
-+    _rm_test_img "$TEST_IMG.3"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/190
-+++ b/tests/qemu-iotests/190
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.converted"
-+    _rm_test_img "$TEST_IMG.converted"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/191
-+++ b/tests/qemu-iotests/191
-@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
- _cleanup()
- {
--    rm -f "${TEST_IMG}.mid"
--    rm -f "${TEST_IMG}.ovl2"
--    rm -f "${TEST_IMG}.ovl3"
-+    _rm_test_img "${TEST_IMG}.mid"
-+    _rm_test_img "${TEST_IMG}.ovl2"
-+    _rm_test_img "${TEST_IMG}.ovl3"
-     _cleanup_test_img
-     _cleanup_qemu
- }
-diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/195
-+++ b/tests/qemu-iotests/195
-@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.mid"
-+    _rm_test_img "$TEST_IMG.mid"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/197
-+++ b/tests/qemu-iotests/197
-@@ -XXX,XX +XXX,XX @@ esac
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_WRAP"
-+    _rm_test_img "$TEST_WRAP"
-     rm -f "$BLKDBG_CONF"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/200
-+++ b/tests/qemu-iotests/200
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_qemu
--    rm -f "${TEST_IMG}" "${BACKING_IMG}"
-+    _rm_test_img "${TEST_IMG}"
-+    _rm_test_img "${BACKING_IMG}"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/215
-+++ b/tests/qemu-iotests/215
-@@ -XXX,XX +XXX,XX @@ esac
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_WRAP"
-+    _rm_test_img "$TEST_WRAP"
-     rm -f "$BLKDBG_CONF"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/225
-+++ b/tests/qemu-iotests/225
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.not_base"
-+    _rm_test_img "$TEST_IMG.not_base"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/229
-+++ b/tests/qemu-iotests/229
-@@ -XXX,XX +XXX,XX @@ _cleanup()
- {
-     _cleanup_qemu
-     _cleanup_test_img
--    rm -f "$TEST_IMG" "$DEST_IMG"
-+    _rm_test_img "$TEST_IMG"
-+    _rm_test_img "$DEST_IMG"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/232
-+++ b/tests/qemu-iotests/232
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.[01234]
-+    for img in "$TEST_IMG".[01234]; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/243
-+++ b/tests/qemu-iotests/243
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.data
-+    _rm_test_img "$TEST_IMG.data"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/244
-+++ b/tests/qemu-iotests/244
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.data
--    rm -f $TEST_IMG.src
-+    _rm_test_img "$TEST_IMG.data"
-+    _rm_test_img "$TEST_IMG.src"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/247
-+++ b/tests/qemu-iotests/247
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f $TEST_IMG.[01234]
-+    for img in "$TEST_IMG".[01234]; do
-+        _rm_test_img "$img"
-+    done
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/249
-+++ b/tests/qemu-iotests/249
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.base"
--    rm -f "$TEST_IMG.int"
-+    _rm_test_img "$TEST_IMG.base"
-+    _rm_test_img "$TEST_IMG.int"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/252
-+++ b/tests/qemu-iotests/252
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _cleanup()
- {
-     _cleanup_test_img
--    rm -f "$TEST_IMG.base_new"
-+    _rm_test_img "$TEST_IMG.base_new"
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
---
-.24.1

-[PULL 23/34] iotests: Avoid cp/mv of test images
+Deleted patch
-This will not work with external data files, so try to get tests working
-without it as far as possible.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-17-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/063     | 12 ++++--------
- tests/qemu-iotests/063.out |  3 ++-
- tests/qemu-iotests/085     |  9 +++------
- tests/qemu-iotests/085.out |  8 ++++----
-files changed, 13 insertions(+), 19 deletions(-)
-diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/063
-+++ b/tests/qemu-iotests/063
-@@ -XXX,XX +XXX,XX @@ _unsupported_imgopts "subformat=monolithicFlat" \
- _make_test_img 4M
- echo "== Testing conversion with -n fails with no target file =="
--# check .orig file does not exist
--rm -f "$TEST_IMG.orig"
- if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
-     exit 1
- fi
- echo "== Testing conversion with -n succeeds with a target file =="
--rm -f "$TEST_IMG.orig"
--cp "$TEST_IMG" "$TEST_IMG.orig"
-+_rm_test_img "$TEST_IMG.orig"
-+TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
- if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
-     exit 1
- fi
-@@ -XXX,XX +XXX,XX @@ fi
- _check_test_img
- echo "== Testing conversion to a smaller file fails =="
--rm -f "$TEST_IMG.orig"
--mv "$TEST_IMG" "$TEST_IMG.orig"
--_make_test_img 2M
--if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
-+TEST_IMG="$TEST_IMG.target" _make_test_img 2M
-+if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
-     exit 1
- fi
-diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/063.out
-+++ b/tests/qemu-iotests/063.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 063
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
- == Testing conversion with -n fails with no target file ==
- == Testing conversion with -n succeeds with a target file ==
-+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
- == Testing conversion to raw is the same after conversion with -n ==
- == Testing conversion back to original format ==
- No errors were found on the image.
- == Testing conversion to a smaller file fails ==
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
-+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
- == Regression testing for copy offloading bug ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
- Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
-diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/085
-+++ b/tests/qemu-iotests/085
-@@ -XXX,XX +XXX,XX @@ add_snapshot_image()
- {
-     base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
-     snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
--    _make_test_img -u -b "${base_image}" "$size"
--    mv "${TEST_IMG}" "${snapshot_file}"
-+    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
-     do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
- }
-@@ -XXX,XX +XXX,XX @@ blockdev_snapshot()
- size=128M
--_make_test_img $size
--mv "${TEST_IMG}" "${TEST_IMG}.1"
--_make_test_img $size
--mv "${TEST_IMG}" "${TEST_IMG}.2"
-+TEST_IMG="$TEST_IMG.1" _make_test_img $size
-+TEST_IMG="$TEST_IMG.2" _make_test_img $size
- echo
- echo === Running QEMU ===
-diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/085.out
-+++ b/tests/qemu-iotests/085.out
-@@ -XXX,XX +XXX,XX @@
- QA output created by 085
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
-+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
- === Running QEMU ===
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
- === Create a couple of snapshots using blockdev-snapshot ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
-+Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
- { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } }
- {"return": {}}
- { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }
- {"return": {}}
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
-+Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
- { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } }
- {"return": {}}
- { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }
---
-.24.1

-[PULL 24/34] iotests: Make 091 work with data_file
+Deleted patch
-The image end offset as reported by qemu-img check is different when
-using an external data file; we do not care about its value here, so we
-can just filter it.  Incidentally, common.rc already has _check_test_img
-for us which does exactly that.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-18-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/091     | 2 +-
- tests/qemu-iotests/091.out | 2 --
-files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/091
-+++ b/tests/qemu-iotests/091
-@@ -XXX,XX +XXX,XX @@ echo "Check image pattern"
- ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
- echo "Running 'qemu-img check -r all \$TEST_IMG'"
--"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
-+_check_test_img -r all
- echo "*** done"
- rm -f $seq.full
-diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/091.out
-+++ b/tests/qemu-iotests/091.out
-@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- Running 'qemu-img check -r all $TEST_IMG'
- No errors were found on the image.
--80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
--Image end offset: 5570560
- *** done
---
-.24.1

-[PULL 25/34] iotests: Make 110 work with data_file
+Deleted patch
-The only difference is that the json:{} filename of the image looks
-different.  We actually do not care about that filename in this test, we
-are only interested in (1) that there is a json:{} filename, and (2)
-whether the backing filename can be constructed.
-So just filter out the json:{} data, thus making this test pass both
-with and without data_file.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-19-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/110     | 7 +++++--
- tests/qemu-iotests/110.out | 4 ++--
-files changed, 7 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/110
-+++ b/tests/qemu-iotests/110
-@@ -XXX,XX +XXX,XX @@ echo
- # Across blkdebug without a config file, you cannot reconstruct filenames, so
- # qemu is incapable of knowing the directory of the top image from the filename
- # alone. However, using bdrv_dirname(), it should still work.
-+# (Filter out the json:{} filename so this test works with external data files)
- TEST_IMG="json:{
-     'driver': '$IMGFMT',
-     'file': {
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
-             }
-         ]
-     }
--}" _img_info | _filter_img_info | grep -v 'backing file format'
-+}" _img_info | _filter_img_info | grep -v 'backing file format' \
-+    | _filter_json_filename
- echo
- echo '=== Backing name is always relative to the backed image ==='
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
-             }
-         ]
-     }
--}" _img_info | _filter_img_info | grep -v 'backing file format'
-+}" _img_info | _filter_img_info | grep -v 'backing file format' \
-+    | _filter_json_filename
- # success, all done
-diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/110.out
-+++ b/tests/qemu-iotests/110.out
-@@ -XXX,XX +XXX,XX @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
- === Non-reconstructable filename ===
--image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
- === Nodes without a common directory ===
--image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (cannot determine actual path)
---
-.24.1

-[PULL 26/34] iotests: Make 137 work with data_file
+Deleted patch
-When using an external data file, there are no refcounts for data
-clusters.  We thus have to adjust the corruption test in this patch to
-not be based around a data cluster allocation, but the L2 table
-allocation (L2 tables are still refcounted with external data files).
-Furthermore, we should not print qcow2.py's list of incompatible
-features because it differs depending on whether there is an external
-data file or not.
-With those two changes, the test will work both with and without
-external data files (once that options works with the iotests at all).
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-20-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/137     | 15 +++++++++++----
- tests/qemu-iotests/137.out |  6 ++----
-files changed, 13 insertions(+), 8 deletions(-)
-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 \
-     "$TEST_IMG" 2>&1 | _filter_qemu_io
- # The dirty bit must not be set
--$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
-+# (Filter the external data file bit)
-+if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
-+    | grep -q '\<0\>'
-+then
-+    echo 'ERROR: Dirty bit set'
-+else
-+    echo 'OK: Dirty bit not set'
-+fi
- # Similarly we can test whether corruption detection has been enabled:
--# Create L1/L2, overwrite first entry in refcount block, allocate something.
-+# Create L1, overwrite refcounts, force allocation of L2 by writing
-+# data.
- # Disabling the checks should fail, so the corruption must be detected.
- _make_test_img 64M
--$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
--poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
-+poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
- $QEMU_IO \
-     -c "reopen -o overlap-check=none,lazy-refcounts=42" \
-     -c "write 64k 64k" \
-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 @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     []
-+OK: Dirty bit not set
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--wrote 65536/65536 bytes at offset 0
--64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
--qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
-+qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
- write failed: Input/output error
- *** done
---
-.24.1

-[PULL 27/34] iotests: Make 198 work with data_file
+Deleted patch
-We do not care about the json:{} filenames here, so we can just filter
-them out and thus make the test work both with and without external data
-files.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-21-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/198     | 6 ++++--
- tests/qemu-iotests/198.out | 4 ++--
-files changed, 6 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/198
-+++ b/tests/qemu-iotests/198
-@@ -XXX,XX +XXX,XX @@ echo
- echo "== checking image base =="
- $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
-     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
--          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
-+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
-+    | _filter_json_filename
- echo
- echo "== checking image layer =="
- $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
-     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
--          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
-+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
-+    | _filter_json_filename
- # success, all done
-diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/198.out
-+++ b/tests/qemu-iotests/198.out
-@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == checking image base ==
--image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 16 MiB (16777216 bytes)
- Format specific information:
-@@ -XXX,XX +XXX,XX @@ Format specific information:
-         master key iters: 1024
- == checking image layer ==
--image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 16 MiB (16777216 bytes)
- backing file: TEST_DIR/t.IMGFMT.base
---
-.24.1

-[PULL 28/34] iotests: Disable data_file where it cannot be used
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191107163708.833192-22-mreitz@redhat.com
-[mreitz: Also disable 273]
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/007 | 5 +++--
- tests/qemu-iotests/014 | 2 ++
- tests/qemu-iotests/015 | 5 +++--
- tests/qemu-iotests/026 | 5 ++++-
- tests/qemu-iotests/029 | 5 +++--
- tests/qemu-iotests/031 | 6 +++---
- tests/qemu-iotests/036 | 5 +++--
- tests/qemu-iotests/039 | 3 +++
- tests/qemu-iotests/046 | 2 ++
- tests/qemu-iotests/048 | 2 ++
- tests/qemu-iotests/051 | 5 +++--
- tests/qemu-iotests/058 | 5 +++--
- tests/qemu-iotests/060 | 6 ++++--
- tests/qemu-iotests/061 | 6 ++++--
- tests/qemu-iotests/062 | 2 +-
- tests/qemu-iotests/066 | 4 +++-
- tests/qemu-iotests/067 | 6 ++++--
- tests/qemu-iotests/068 | 5 +++--
- tests/qemu-iotests/071 | 3 +++
- tests/qemu-iotests/073 | 4 ++++
- tests/qemu-iotests/074 | 2 ++
- tests/qemu-iotests/080 | 5 +++--
- tests/qemu-iotests/090 | 2 ++
- tests/qemu-iotests/098 | 6 ++++--
- tests/qemu-iotests/099 | 3 ++-
- tests/qemu-iotests/103 | 5 +++--
- tests/qemu-iotests/108 | 6 ++++--
- tests/qemu-iotests/112 | 5 +++--
- tests/qemu-iotests/114 | 2 ++
- tests/qemu-iotests/121 | 3 +++
- tests/qemu-iotests/138 | 3 +++
- tests/qemu-iotests/156 | 2 ++
- tests/qemu-iotests/176 | 7 +++++--
- tests/qemu-iotests/191 | 2 ++
- tests/qemu-iotests/201 | 6 +++---
- tests/qemu-iotests/214 | 3 ++-
- tests/qemu-iotests/217 | 3 ++-
- tests/qemu-iotests/220 | 5 +++--
- tests/qemu-iotests/243 | 6 ++++--
- tests/qemu-iotests/244 | 5 +++--
- tests/qemu-iotests/250 | 2 ++
- tests/qemu-iotests/261 | 3 ++-
- tests/qemu-iotests/267 | 5 +++--
- tests/qemu-iotests/273 | 3 +++
-files changed, 127 insertions(+), 53 deletions(-)
-diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/007
-+++ b/tests/qemu-iotests/007
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- # refcount_bits must be at least 4 so we can create ten internal snapshots
--# (1 bit supports none, 2 bits support two, 4 bits support 14)
--_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]'
-+# (1 bit supports none, 2 bits support two, 4 bits support 14);
-+# snapshot are generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file
- echo
- echo "creating image"
-diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/014
-+++ b/tests/qemu-iotests/014
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# Compression and snapshots do not work with external data files
-+_unsupported_imgopts data_file
- TEST_OFFSETS="0 4294967296"
- TEST_OPS="writev read write readv"
-diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/015
-+++ b/tests/qemu-iotests/015
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # actually any format that supports snapshots
- _supported_fmt qcow2
- _supported_proto generic
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- echo
- echo "creating image"
-diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/026
-+++ b/tests/qemu-iotests/026
-@@ -XXX,XX +XXX,XX @@ _supported_cache_modes writethrough none
- # 32 and 64 bits do not work either, however, due to different leaked cluster
- # count on error.
- # Thus, the only remaining option is refcount_bits=16.
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+#
-+# As for data_file, none of the refcount tests can work for it.
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \
-+    data_file
- echo "Errors while writing 128 kB"
- echo
-diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/029
-+++ b/tests/qemu-iotests/029
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- _unsupported_proto vxhs
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- offset_size=24
- offset_l1_size=36
-diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/031
-+++ b/tests/qemu-iotests/031
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
--# We want to test compat=0.10, which does not support refcount widths
--# other than 16
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# We want to test compat=0.10, which does not support external data
-+# files or refcount widths other than 16
-+_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- CLUSTER_SIZE=65536
-diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/036
-+++ b/tests/qemu-iotests/036
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
--# Only qcow2v3 and later supports feature bits
--_unsupported_imgopts 'compat=0.10'
-+# Only qcow2v3 and later supports feature bits;
-+# qcow2.py does not support external data files
-+_unsupported_imgopts 'compat=0.10' data_file
- echo
- echo === Image with unknown incompatible feature bit ===
-diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/039
-+++ b/tests/qemu-iotests/039
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- _supported_os Linux
- _default_cache_mode writethrough
- _supported_cache_modes writethrough
-+# Some of these test cases expect no external data file so that all
-+# clusters are part of the qcow2 image and refcounted
-+_unsupported_imgopts data_file
- size=128M
-diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/046
-+++ b/tests/qemu-iotests/046
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
-+# data_file does not support compressed clusters
-+_unsupported_imgopts data_file
- CLUSTER_SIZE=64k
- size=128M
-diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/048
-+++ b/tests/qemu-iotests/048
-@@ -XXX,XX +XXX,XX @@ _compare()
- _supported_fmt raw qcow2 qed luks
- _supported_proto file
- _supported_os Linux
-+# Using 'cp' is incompatible with external data files
-+_unsupported_imgopts data_file
- # Remove once all tests are fixed to use TEST_IMG_FILE
- # correctly and common.rc sets it unconditionally
-diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/051
-+++ b/tests/qemu-iotests/051
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- # A compat=0.10 image is created in this test which does not support anything
--# other than refcount_bits=16
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# other than refcount_bits=16;
-+# it also will not support an external data file
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
- _require_drivers nbd
- do_run_qemu()
-diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/058
-+++ b/tests/qemu-iotests/058
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
- _require_command QEMU_NBD
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _filter_io_error()
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# These tests only work for compat=1.1 images with refcount_bits=16
--_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# These tests only work for compat=1.1 images without an external
-+# data file with refcount_bits=16
-+_unsupported_imgopts 'compat=0.10' data_file \
-+    'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- # The repair process will create a large file - so check for availability first
- _require_large_file 64G
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
- # Conversion between different compat versions can only really work
--# with refcount_bits=16
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# with refcount_bits=16;
-+# we have explicit tests for data_file here, but the whole test does
-+# not work with it
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
- echo
- echo "=== Testing version downgrade with zero expansion ==="
-diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/062
-+++ b/tests/qemu-iotests/062
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- # We need zero clusters and snapshots
--_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
- IMG_SIZE=64M
-diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/066
-+++ b/tests/qemu-iotests/066
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- # We need zero clusters and snapshots
--_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
-+# (TODO: Consider splitting the snapshot part into a separate test
-+#        file, so this one runs with refcount_bits=1 and data_file)
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
- # Intentionally create an unaligned image
- IMG_SIZE=$((64 * 1024 * 1024 + 512))
-diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/067
-+++ b/tests/qemu-iotests/067
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- _supported_fmt qcow2
- _supported_proto file
--# Because anything other than 16 would change the output of query-block
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# Because anything other than 16 would change the output of query-block,
-+# and external data files would change the output of
-+# query-named-block-nodes
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
- do_run_qemu()
- {
-diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/068
-+++ b/tests/qemu-iotests/068
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
- IMG_SIZE=128K
-diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/071
-+++ b/tests/qemu-iotests/071
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _require_drivers blkdebug blkverify
-+# blkdebug can only inject errors on bs->file, not on the data_file,
-+# so thie test does not work with external data files
-+_unsupported_imgopts data_file
- do_run_qemu()
- {
-diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/073
-+++ b/tests/qemu-iotests/073
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- _unsupported_proto vxhs
-+# External data files do not support compressed clusters
-+# (TODO: Consider writing a version for external data files that does
-+#        not test compressed clusters)
-+_unsupported_imgopts data_file
- CLUSTER_SIZE=64k
- size=128M
-diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/074
-+++ b/tests/qemu-iotests/074
-@@ -XXX,XX +XXX,XX @@ _compare()
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# blkdebug can only inject errors on bs->file
-+_unsupported_imgopts data_file
- # Setup test basic parameters
- TEST_IMG2=$TEST_IMG.2
-diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/080
-+++ b/tests/qemu-iotests/080
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# - Internal snapshots are (currently) impossible with refcount_bits=1
-+# - Internal snapshots are (currently) impossible with refcount_bits=1,
-+#   and generally impossible with external data files
- # - This is generally a test for compat=1.1 images
--_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'
- header_size=104
-diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/090
-+++ b/tests/qemu-iotests/090
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file nfs
-+# External data files do not support compressed clusters
-+_unsupported_imgopts data_file
- IMG_SIZE=128K
-diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/098
-+++ b/tests/qemu-iotests/098
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
--# The code path we want to test here only works for compat=1.1 images
--_unsupported_imgopts 'compat=0.10'
-+# The code path we want to test here only works for compat=1.1 images;
-+# blkdebug can only inject errors on bs->file, so external data files
-+# do not work with this test
-+_unsupported_imgopts 'compat=0.10' data_file
- for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
-diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/099
-+++ b/tests/qemu-iotests/099
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
- _supported_proto file
- _supported_os Linux
- _require_drivers blkdebug blkverify
-+# data_file would change the json:{} filenames
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
--    "subformat=twoGbMaxExtentSparse"
-+    "subformat=twoGbMaxExtentSparse" data_file
- do_run_qemu()
- {
-diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/103
-+++ b/tests/qemu-iotests/103
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file nfs
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- IMG_SIZE=64K
-diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/108
-+++ b/tests/qemu-iotests/108
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# This test directly modifies a refblock so it relies on refcount_bits being 16
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# This test directly modifies a refblock so it relies on refcount_bits being 16;
-+# and the low-level modification it performs are not tuned for external data
-+# files
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
- echo
- echo '=== Repairing an image without any refcount table ==='
-diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/112
-+++ b/tests/qemu-iotests/112
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- # This test will set refcount_bits on its own which would conflict with the
--# manual setting; compat will be overridden as well
--_unsupported_imgopts refcount_bits 'compat=0.10'
-+# manual setting; compat will be overridden as well;
-+# and external data files do not work well with our refcount testing
-+_unsupported_imgopts refcount_bits 'compat=0.10' data_file
- print_refcount_bits()
- {
-diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/114
-+++ b/tests/qemu-iotests/114
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto generic
- _unsupported_proto vxhs
-+# qcow2.py does not work too well with external data files
-+_unsupported_imgopts data_file
- TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/121
-+++ b/tests/qemu-iotests/121
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# Refcount structures are used much differently with external data
-+# files
-+_unsupported_imgopts data_file
- echo
- echo '=== New refcount structures may not conflict with existing structures ==='
-diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/138
-+++ b/tests/qemu-iotests/138
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# With an external data file, data clusters are not refcounted
-+# (and so qemu-img check does not check their refcount)
-+_unsupported_imgopts data_file
- echo
- echo '=== Check on an image with a multiple of 2^32 clusters ==='
-diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/156
-+++ b/tests/qemu-iotests/156
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2 qed
- _supported_proto generic
- _unsupported_proto vxhs
-+# Copying files around with cp does not work with external data files
-+_unsupported_imgopts data_file
- # Create source disk
- TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
-diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/176
-+++ b/tests/qemu-iotests/176
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# Persistent dirty bitmaps require compat=1.1
--_unsupported_imgopts 'compat=0.10'
-+# Persistent dirty bitmaps require compat=1.1;
-+# Internal snapshots forbid using an external data file
-+# (they work with refcount_bits=1 here, though, because there actually
-+# is no data when creating the snapshot)
-+_unsupported_imgopts 'compat=0.10' data_file
- run_qemu()
- {
-diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/191
-+++ b/tests/qemu-iotests/191
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
-+# An external data file would change the query-named-block-nodes output
-+_unsupported_imgopts data_file
- size=64M
-diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/201
-+++ b/tests/qemu-iotests/201
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
- _supported_proto generic
- _supported_os Linux
--# Internal snapshots are (currently) impossible with refcount_bits=1
--# This was taken from test 080
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- size=64M
- _make_test_img $size
-diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/214
-+++ b/tests/qemu-iotests/214
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- # Repairing the corrupted image requires qemu-img check to store a
- # refcount up to 3, which requires at least two refcount bits.
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# External data files do not support compressed clusters.
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- echo
-diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/217
-+++ b/tests/qemu-iotests/217
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- # This test needs clusters with at least a refcount of 2 so that
- # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# (As are external data files.)
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- echo
- echo '=== Simulating an I/O error during snapshot deletion ==='
-diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/220
-+++ b/tests/qemu-iotests/220
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# To use a different refcount width but 16 bits we need compat=1.1
--_unsupported_imgopts 'compat=0.10'
-+# To use a different refcount width but 16 bits we need compat=1.1,
-+# and external data files do not support compressed clusters.
-+_unsupported_imgopts 'compat=0.10' data_file
- echo "== Creating huge file =="
-diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/243
-+++ b/tests/qemu-iotests/243
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# External data files do not work with compat=0.10
--_unsupported_imgopts 'compat=0.10'
-+# External data files do not work with compat=0.10, and because there
-+# is an explicit case for external data files here, we cannot allow
-+# the user to specify whether to use one
-+_unsupported_imgopts 'compat=0.10' data_file
- for mode in off metadata falloc full; do
-diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/244
-+++ b/tests/qemu-iotests/244
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
--# External data files do not work with compat=0.10
--_unsupported_imgopts 'compat=0.10'
-+# External data files do not work with compat=0.10, and because we use
-+# our own external data file, we cannot let the user specify one
-+_unsupported_imgopts 'compat=0.10' data_file
- echo
- echo "=== Create and open image with external data file ==="
-diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/250
-+++ b/tests/qemu-iotests/250
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# This test does not make much sense with external data files
-+_unsupported_imgopts data_file
- # This test checks that qcow2_process_discards does not truncate a discard
- # request > 2G.
-diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/261
-+++ b/tests/qemu-iotests/261
-@@ -XXX,XX +XXX,XX @@ _supported_os Linux
- # (1) We create a v2 image that supports nothing but refcount_bits=16
- # (2) We do some refcount management on our own which expects
- #     refcount_bits=16
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+# As for data files, they do not support snapshots at all.
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
- # Parameters:
- #   $1: image filename
-diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/267
-+++ b/tests/qemu-iotests/267
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- _supported_os Linux
- _require_drivers copy-on-read
--# Internal snapshots are (currently) impossible with refcount_bits=1
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
-+# and generally impossible with external data files
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
- do_run_qemu()
- {
-diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/273
-+++ b/tests/qemu-iotests/273
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# External data files would add nodes to the block graph, so it would
-+# not match the reference output
-+_unsupported_imgopts data_file
- do_run_qemu()
- {
---
-.24.1

-[PULL 29/34] iotests: Allow check -o data_file
+Deleted patch
-The problem with allowing the data_file option is that you want to use a
-different data file per image used in the test.  Therefore, we need to
-allow patterns like -o data_file='$TEST_IMG.data_file'.
-Then, we need to filter it out from qemu-img map, qemu-img create, and
-remove the data file in _rm_test_img.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-23-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.filter | 23 +++++++++++++++++++++--
- tests/qemu-iotests/common.rc     | 22 +++++++++++++++++++++-
-files changed, 42 insertions(+), 3 deletions(-)
-diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.filter
-+++ b/tests/qemu-iotests/common.filter
-@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()
- # replace driver-specific options in the "Formatting..." line
- _filter_img_create()
- {
--    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
-+    data_file_filter=()
-+    if data_file=$(_get_data_file "$TEST_IMG"); then
-+        data_file_filter=(-e "s# data_file=$data_file##")
-+    fi
-+
-+    $SED "${data_file_filter[@]}" \
-+        -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
-         -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
-         -e "s#$TEST_DIR#TEST_DIR#g" \
-         -e "s#$SOCK_DIR#SOCK_DIR#g" \
-@@ -XXX,XX +XXX,XX @@ _filter_img_info()
- # human and json output
- _filter_qemu_img_map()
- {
-+    # Assuming the data_file value in $IMGOPTS contains a '$TEST_IMG',
-+    # create a filter that replaces the data file name by $TEST_IMG.
-+    # Example:
-+    #   In $IMGOPTS: 'data_file=$TEST_IMG.data_file'
-+    #   Then data_file_pattern == '\(.*\).data_file'
-+    #   And  data_file_filter  == -e 's#\(.*\).data_file#\1#
-+    data_file_filter=()
-+    if data_file_pattern=$(_get_data_file '\\(.*\\)'); then
-+        data_file_filter=(-e "s#$data_file_pattern#\\1#")
-+    fi
-+
-     $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \
-         -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
--        -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
-+        -e 's/Mapped to *//' \
-+        "${data_file_filter[@]}" \
-+        | _filter_testdir | _filter_imgfmt
- }
- _filter_nbd()
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _stop_nbd_server()
-     fi
- }
-+# Gets the data_file value from IMGOPTS and replaces the '$TEST_IMG'
-+# pattern by '$1'
-+# Caution: The replacement is done with sed, so $1 must be escaped
-+#          properly.  (The delimiter is '#'.)
-+_get_data_file()
-+{
-+    if ! echo "$IMGOPTS" | grep -q 'data_file='; then
-+        return 1
-+    fi
-+
-+    echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
-+                    | sed -e "s#\\\$TEST_IMG#$1#"
-+}
-+
- _make_test_img()
- {
-     # extra qemu-img options can be added by tests
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     fi
-     if [ -n "$IMGOPTS" ]; then
--        optstr=$(_optstr_add "$optstr" "$IMGOPTS")
-+        imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
-+        optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
-     fi
-     if [ -n "$IMGKEYSECRET" ]; then
-         object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
-@@ -XXX,XX +XXX,XX @@ _rm_test_img()
-         # Remove all the extents for vmdk
-         "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
-             | xargs -I {} rm -f "{}"
-+    elif [ "$IMGFMT" = "qcow2" ]; then
-+        # Remove external data file
-+        if data_file=$(_get_data_file "$img"); then
-+            rm -f "$data_file"
-+        fi
-     fi
-     rm -f "$img"
- }
---
-.24.1

-[PULL 31/34] qcow2: Allow writing compressed data of multiple clusters
+[PULL 5/5] tests/qtest: Introduce tests for UFS
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+From: Jeuk Kim <jeuk20.kim@samsung.com>
-QEMU currently supports writing compressed data of the size equal to
+This patch includes the following tests
-one cluster. This patch allows writing QCOW2 compressed data that
+  Test mmio read
-exceed one cluster. Now, we split buffered data into separate clusters
+  Test ufs device initialization and ufs-lu recognition
-and write them compressed using the block/aio_task API.
+  Test I/O (Performs a write followed by a read to verify)
-Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Acked-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-id: 9e9207f54505e9ba30931849f949ff6f474ac333.1693980783.git.jeuk20.kim@gmail.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 1575288906-551879-3-git-send-email-andrey.shinkevich@virtuozzo.com
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block/qcow2.c | 102 +++++++++++++++++++++++++++++++++++++-------------
+ MAINTAINERS             |   1 +
-file changed, 75 insertions(+), 27 deletions(-)
+ tests/qtest/ufs-test.c  | 587 ++++++++++++++++++++++++++++++++++++++++
  tests/qtest/meson.build |   1 +
 files changed, 589 insertions(+)
  create mode 100644 tests/qtest/ufs-test.c
-diff --git a/block/qcow2.c b/block/qcow2.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
+--- a/MAINTAINERS
-+++ b/block/qcow2.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ fail:
+@@ -XXX,XX +XXX,XX @@ M: Jeuk Kim <jeuk20.kim@samsung.com>
-     return ret;
+ S: Supported
- }
+ F: hw/ufs/*
+ F: include/block/ufs.h
--/* XXX: put compressed sectors first, then all the cluster aligned
++F: tests/qtest/ufs-test.c
--   tables to avoid losing bytes in alignment */
- static coroutine_fn int
+ megasas
--qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
+ M: Hannes Reinecke <hare@suse.com>
-+qcow2_co_pwritev_compressed_task(BlockDriverState *bs,
+diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
-                                  uint64_t offset, uint64_t bytes,
+new file mode 100644
-                                  QEMUIOVector *qiov, size_t qiov_offset)
+index XXXXXXX..XXXXXXX
- {
+--- /dev/null
-@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
++++ b/tests/qtest/ufs-test.c
-     uint8_t *buf, *out_buf;
+@@ -XXX,XX +XXX,XX @@
      uint64_t cluster_offset;
 -    if (has_data_file(bs)) {
 -        return -ENOTSUP;
 -    }
 -
 -    if (bytes == 0) {
 -        /* align end of file to a sector boundary to ease reading with
 -           sector based I/Os */
 -        int64_t len = bdrv_getlength(bs->file->bs);
 -        if (len < 0) {
 -            return len;
 -        }
 -        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
 -    }
 -
 -    if (offset_into_cluster(s, offset)) {
 -        return -EINVAL;
 -    }
 +    assert(bytes == s->cluster_size || (bytes < s->cluster_size &&
 +           (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS)));
      buf = qemu_blockalign(bs, s->cluster_size);
 -    if (bytes != s->cluster_size) {
 -        if (bytes > s->cluster_size ||
 -            offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
 -        {
 -            qemu_vfree(buf);
 -            return -EINVAL;
 -        }
 +    if (bytes < s->cluster_size) {
          /* Zero-pad last write if image size is not cluster aligned */
          memset(buf + bytes, 0, s->cluster_size - bytes);
      }
@@ -XXX,XX +XXX,XX @@ fail:
      return ret;
  }
 +static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task)
 +{
 +    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
 +
 +    assert(!t->cluster_type && !t->l2meta);
 +
 +    return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov,
 +                                            t->qiov_offset);
 +}
 +
 +/*
-+ * XXX: put compressed sectors first, then all the cluster aligned
++ * QTest testcase for UFS
-+ * tables to avoid losing bytes in alignment
++ *
 + * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + *
 + * SPDX-License-Identifier: GPL-2.0-or-later
 + */
-+static coroutine_fn int
++
-+qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
++#include "qemu/osdep.h"
-+                                 uint64_t offset, uint64_t bytes,
++#include "qemu/module.h"
-+                                 QEMUIOVector *qiov, size_t qiov_offset)
++#include "qemu/units.h"
-+{
++#include "libqtest.h"
-+    BDRVQcow2State *s = bs->opaque;
++#include "libqos/qgraph.h"
-+    AioTaskPool *aio = NULL;
++#include "libqos/pci.h"
-+    int ret = 0;
++#include "scsi/constants.h"
-+
++#include "include/block/ufs.h"
-+    if (has_data_file(bs)) {
++
-+        return -ENOTSUP;
++/* Test images sizes in Bytes */
 +#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
 +/* Timeout for various operations, in seconds. */
 +#define TIMEOUT_SECONDS 10
 +/* Maximum PRD entry count */
 +#define MAX_PRD_ENTRY_COUNT 10
 +#define PRD_ENTRY_DATA_SIZE 4096
 +/* Constants to build upiu */
 +#define UTP_COMMAND_DESCRIPTOR_SIZE 4096
 +#define UTP_RESPONSE_UPIU_OFFSET 1024
 +#define UTP_PRDT_UPIU_OFFSET 2048
 +
 +typedef struct QUfs QUfs;
 +
 +struct QUfs {
 +    QOSGraphObject obj;
 +    QPCIDevice dev;
 +    QPCIBar bar;
 +
 +    uint64_t utrlba;
 +    uint64_t utmrlba;
 +    uint64_t cmd_desc_addr;
 +    uint64_t data_buffer_addr;
 +
 +    bool enabled;
 +};
 +
 +static inline uint32_t ufs_rreg(QUfs *ufs, size_t offset)
 +{
 +    return qpci_io_readl(&ufs->dev, ufs->bar, offset);
 +}
 +
 +static inline void ufs_wreg(QUfs *ufs, size_t offset, uint32_t value)
 +{
 +    qpci_io_writel(&ufs->dev, ufs->bar, offset, value);
 +}
 +
 +static void ufs_wait_for_irq(QUfs *ufs)
 +{
 +    uint64_t end_time;
 +    uint32_t is;
 +    /* Wait for device to reset as the linux driver does. */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        is = ufs_rreg(ufs, A_IS);
 +    } while (is == 0 && g_get_monotonic_time() < end_time);
 +}
 +
 +static UtpTransferReqDesc ufs_build_req_utrd(uint64_t cmd_desc_addr,
 +                                             uint8_t slot,
 +                                             uint32_t data_direction,
 +                                             uint16_t prd_table_length)
 +{
 +    UtpTransferReqDesc req = { 0 };
 +    uint64_t command_desc_base_addr =
 +        cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +
 +    req.header.dword_0 =
 +        cpu_to_le32(1 << 28 | data_direction | UFS_UTP_REQ_DESC_INT_CMD);
 +    req.header.dword_2 = cpu_to_le32(UFS_OCS_INVALID_COMMAND_STATUS);
 +
 +    req.command_desc_base_addr_hi = cpu_to_le32(command_desc_base_addr >> 32);
 +    req.command_desc_base_addr_lo =
 +        cpu_to_le32(command_desc_base_addr & 0xffffffff);
 +    req.response_upiu_offset =
 +        cpu_to_le16(UTP_RESPONSE_UPIU_OFFSET / sizeof(uint32_t));
 +    req.response_upiu_length = cpu_to_le16(sizeof(UtpUpiuRsp));
 +    req.prd_table_offset = cpu_to_le16(UTP_PRDT_UPIU_OFFSET / sizeof(uint32_t));
 +    req.prd_table_length = cpu_to_le16(prd_table_length);
 +    return req;
 +}
 +
 +static void ufs_send_nop_out(QUfs *ufs, uint8_t slot,
 +                             UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
 +{
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd = ufs_build_req_utrd(ufs->cmd_desc_addr, slot,
 +                                                 UFS_UTP_NO_DATA_TRANSFER, 0);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_NOP_OUT;
 +    req_upiu.header.task_tag = slot;
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +}
 +
 +static void ufs_send_query(QUfs *ufs, uint8_t slot, uint8_t query_function,
 +                           uint8_t query_opcode, uint8_t idn, uint8_t index,
 +                           UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
 +{
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd = ufs_build_req_utrd(ufs->cmd_desc_addr, slot,
 +                                                 UFS_UTP_NO_DATA_TRANSFER, 0);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_QUERY_REQ;
 +    req_upiu.header.query_func = query_function;
 +    req_upiu.header.task_tag = slot;
 +    /*
 +     * QEMU UFS does not currently support Write descriptor and Write attribute,
 +     * so the value of data_segment_length is always 0.
 +     */
 +    req_upiu.header.data_segment_length = 0;
 +    req_upiu.qr.opcode = query_opcode;
 +    req_upiu.qr.idn = idn;
 +    req_upiu.qr.index = index;
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +}
 +
 +static void ufs_send_scsi_command(QUfs *ufs, uint8_t slot, uint8_t lun,
 +                                  const uint8_t *cdb, const uint8_t *data_in,
 +                                  size_t data_in_len, uint8_t *data_out,
 +                                  size_t data_out_len,
 +                                  UtpTransferReqDesc *utrd_out,
 +                                  UtpUpiuRsp *rsp_out)
 +
 +{
 +    /* Build up PRDT */
 +    UfshcdSgEntry entries[MAX_PRD_ENTRY_COUNT] = {
 +        0,
 +    };
 +    uint8_t flags;
 +    uint16_t prd_table_length, i;
 +    uint32_t data_direction, data_len;
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t prdt_addr = req_upiu_addr + UTP_PRDT_UPIU_OFFSET;
 +
 +    g_assert_true(data_in_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    g_assert_true(data_out_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    if (data_in_len > 0) {
 +        g_assert_nonnull(data_in);
 +        data_direction = UFS_UTP_HOST_TO_DEVICE;
 +        data_len = data_in_len;
 +        flags = UFS_UPIU_CMD_FLAGS_WRITE;
 +    } else if (data_out_len > 0) {
 +        g_assert_nonnull(data_out);
 +        data_direction = UFS_UTP_DEVICE_TO_HOST;
 +        data_len = data_out_len;
 +        flags = UFS_UPIU_CMD_FLAGS_READ;
 +    } else {
 +        data_direction = UFS_UTP_NO_DATA_TRANSFER;
 +        data_len = 0;
 +        flags = UFS_UPIU_CMD_FLAGS_NONE;
 +    }
-+
++    prd_table_length = DIV_ROUND_UP(data_len, PRD_ENTRY_DATA_SIZE);
-+    if (bytes == 0) {
++
-+        /*
++    qtest_memset(ufs->dev.bus->qts, ufs->data_buffer_addr, 0,
-+         * align end of file to a sector boundary to ease reading with
++                 MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
-+         * sector based I/Os
++    if (data_in_len) {
-+         */
++        qtest_memwrite(ufs->dev.bus->qts, ufs->data_buffer_addr, data_in,
-+        int64_t len = bdrv_getlength(bs->file->bs);
++                       data_in_len);
-+        if (len < 0) {
++    }
-+            return len;
++
 +    for (i = 0; i < prd_table_length; i++) {
 +        entries[i].addr =
 +            cpu_to_le64(ufs->data_buffer_addr + i * sizeof(UfshcdSgEntry));
 +        if (i + 1 != prd_table_length) {
 +            entries[i].size = cpu_to_le32(PRD_ENTRY_DATA_SIZE - 1);
 +        } else {
 +            entries[i].size = cpu_to_le32(
 +                data_len - (PRD_ENTRY_DATA_SIZE * (prd_table_length - 1)) - 1);
 +        }
-+        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
 +    }
-+
++    qtest_memwrite(ufs->dev.bus->qts, prdt_addr, entries,
-+    if (offset_into_cluster(s, offset)) {
++                   prd_table_length * sizeof(UfshcdSgEntry));
-+        return -EINVAL;
++
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd = ufs_build_req_utrd(
 +        ufs->cmd_desc_addr, slot, data_direction, prd_table_length);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_COMMAND;
 +    req_upiu.header.flags = flags;
 +    req_upiu.header.lun = lun;
 +    req_upiu.header.task_tag = slot;
 +    req_upiu.sc.exp_data_transfer_len = cpu_to_be32(data_len);
 +    memcpy(req_upiu.sc.cdb, cdb, UFS_CDB_SIZE);
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +    if (data_out_len) {
 +        qtest_memread(ufs->dev.bus->qts, ufs->data_buffer_addr, data_out,
 +                      data_out_len);
 +    }
-+
++}
-+    while (bytes && aio_task_pool_status(aio) == 0) {
++
-+        uint64_t chunk_size = MIN(bytes, s->cluster_size);
++/**
-+
++ * Initialize Ufs host controller and logical unit.
-+        if (!aio && chunk_size != bytes) {
++ * After running this function, you can make a transfer request to the UFS.
-+            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
++ */
-+        }
++static void ufs_init(QUfs *ufs, QGuestAllocator *alloc)
-+
++{
-+        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry,
++    uint64_t end_time;
-+                             0, 0, offset, chunk_size, qiov, qiov_offset, NULL);
++    uint32_t nutrs, nutmrs;
-+        if (ret < 0) {
++    uint32_t hcs, is, ucmdarg2, cap;
-+            break;
++    uint32_t hce = 0, ie = 0;
-+        }
++    UtpTransferReqDesc utrd;
-+        qiov_offset += chunk_size;
++    UtpUpiuRsp rsp_upiu;
-+        offset += chunk_size;
++
-+        bytes -= chunk_size;
++    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
 +    qpci_device_enable(&ufs->dev);
 +
 +    /* Start host controller initialization */
 +    hce = FIELD_DP32(hce, HCE, HCE, 1);
 +    ufs_wreg(ufs, A_HCE, hce);
 +
 +    /* Wait for device to reset */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        hce = FIELD_EX32(ufs_rreg(ufs, A_HCE), HCE, HCE);
 +    } while (hce == 0 && g_get_monotonic_time() < end_time);
 +    g_assert_cmpuint(hce, ==, 1);
 +
 +    /* Enable interrupt */
 +    ie = FIELD_DP32(ie, IE, UCCE, 1);
 +    ie = FIELD_DP32(ie, IE, UHESE, 1);
 +    ie = FIELD_DP32(ie, IE, UHXSE, 1);
 +    ie = FIELD_DP32(ie, IE, UPMSE, 1);
 +    ufs_wreg(ufs, A_IE, ie);
 +
 +    /* Send DME_LINK_STARTUP uic command */
 +    hcs = ufs_rreg(ufs, A_HCS);
 +    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
 +
 +    ufs_wreg(ufs, A_UCMDARG1, 0);
 +    ufs_wreg(ufs, A_UCMDARG2, 0);
 +    ufs_wreg(ufs, A_UCMDARG3, 0);
 +    ufs_wreg(ufs, A_UICCMD, UFS_UIC_CMD_DME_LINK_STARTUP);
 +
 +    is = ufs_rreg(ufs, A_IS);
 +    g_assert_true(FIELD_EX32(is, IS, UCCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UCCS, 1));
 +
 +    ucmdarg2 = ufs_rreg(ufs, A_UCMDARG2);
 +    g_assert_cmpuint(ucmdarg2, ==, 0);
 +    is = ufs_rreg(ufs, A_IS);
 +    g_assert_cmpuint(is, ==, 0);
 +    hcs = ufs_rreg(ufs, A_HCS);
 +    g_assert_true(FIELD_EX32(hcs, HCS, DP));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UTRLRDY));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UTMRLRDY));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
 +
 +    /* Enable all interrupt functions */
 +    ie = FIELD_DP32(ie, IE, UTRCE, 1);
 +    ie = FIELD_DP32(ie, IE, UEE, 1);
 +    ie = FIELD_DP32(ie, IE, UPMSE, 1);
 +    ie = FIELD_DP32(ie, IE, UHXSE, 1);
 +    ie = FIELD_DP32(ie, IE, UHESE, 1);
 +    ie = FIELD_DP32(ie, IE, UTMRCE, 1);
 +    ie = FIELD_DP32(ie, IE, UCCE, 1);
 +    ie = FIELD_DP32(ie, IE, DFEE, 1);
 +    ie = FIELD_DP32(ie, IE, HCFEE, 1);
 +    ie = FIELD_DP32(ie, IE, SBFEE, 1);
 +    ie = FIELD_DP32(ie, IE, CEFEE, 1);
 +    ufs_wreg(ufs, A_IE, ie);
 +    ufs_wreg(ufs, A_UTRIACR, 0);
 +
 +    /* Enable tranfer request and task management request */
 +    cap = ufs_rreg(ufs, A_CAP);
 +    nutrs = FIELD_EX32(cap, CAP, NUTRS) + 1;
 +    nutmrs = FIELD_EX32(cap, CAP, NUTMRS) + 1;
 +    ufs->cmd_desc_addr =
 +        guest_alloc(alloc, nutrs * UTP_COMMAND_DESCRIPTOR_SIZE);
 +    ufs->data_buffer_addr =
 +        guest_alloc(alloc, MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    ufs->utrlba = guest_alloc(alloc, nutrs * sizeof(UtpTransferReqDesc));
 +    ufs->utmrlba = guest_alloc(alloc, nutmrs * sizeof(UtpTaskReqDesc));
 +
 +    ufs_wreg(ufs, A_UTRLBA, ufs->utrlba & 0xffffffff);
 +    ufs_wreg(ufs, A_UTRLBAU, ufs->utrlba >> 32);
 +    ufs_wreg(ufs, A_UTMRLBA, ufs->utmrlba & 0xffffffff);
 +    ufs_wreg(ufs, A_UTMRLBAU, ufs->utmrlba >> 32);
 +    ufs_wreg(ufs, A_UTRLRSR, 1);
 +    ufs_wreg(ufs, A_UTMRLRSR, 1);
 +
 +    /* Send nop out to test transfer request */
 +    ufs_send_nop_out(ufs, 0, &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +
 +    /* Set fDeviceInit flag via query request */
 +    ufs_send_query(ufs, 0, UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST,
 +                   UFS_UPIU_QUERY_OPCODE_SET_FLAG,
 +                   UFS_QUERY_FLAG_IDN_FDEVICEINIT, 0, &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +
 +    /* Wait for device to reset */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        ufs_send_query(ufs, 0, UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
 +                       UFS_UPIU_QUERY_OPCODE_READ_FLAG,
 +                       UFS_QUERY_FLAG_IDN_FDEVICEINIT, 0, &utrd, &rsp_upiu);
 +    } while (be32_to_cpu(rsp_upiu.qr.value) != 0 &&
 +             g_get_monotonic_time() < end_time);
 +    g_assert_cmpuint(be32_to_cpu(rsp_upiu.qr.value), ==, 0);
 +
 +    ufs->enabled = true;
 +}
 +
 +static void ufs_exit(QUfs *ufs, QGuestAllocator *alloc)
 +{
 +    if (ufs->enabled) {
 +        guest_free(alloc, ufs->utrlba);
 +        guest_free(alloc, ufs->utmrlba);
 +        guest_free(alloc, ufs->cmd_desc_addr);
 +        guest_free(alloc, ufs->data_buffer_addr);
 +    }
 +
-+    if (aio) {
++    qpci_iounmap(&ufs->dev, ufs->bar);
-+        aio_task_pool_wait_all(aio);
++}
-+        if (ret == 0) {
++
-+            ret = aio_task_pool_status(aio);
++static void *ufs_get_driver(void *obj, const char *interface)
-+        }
++{
-+        g_free(aio);
++    QUfs *ufs = obj;
 +
 +    if (!g_strcmp0(interface, "pci-device")) {
 +        return &ufs->dev;
 +    }
 +
-+    return ret;
++    fprintf(stderr, "%s not present in ufs\n", interface);
-+}
++    g_assert_not_reached();
-+
++}
- static int coroutine_fn
++
- qcow2_co_preadv_compressed(BlockDriverState *bs,
++static void *ufs_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
-                            uint64_t file_cluster_offset,
++{
 +    QUfs *ufs = g_new0(QUfs, 1);
 +    QPCIBus *bus = pci_bus;
 +
 +    qpci_device_init(&ufs->dev, bus, addr);
 +    ufs->obj.get_driver = ufs_get_driver;
 +
 +    return &ufs->obj;
 +}
 +
 +static void ufstest_reg_read(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +    uint32_t cap;
 +
 +    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
 +    qpci_device_enable(&ufs->dev);
 +
 +    cap = ufs_rreg(ufs, A_CAP);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTRS), ==, 31);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTMRS), ==, 7);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, 64AS), ==, 1);
 +
 +    qpci_iounmap(&ufs->dev, ufs->bar);
 +}
 +
 +static void ufstest_init(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +
 +    uint8_t buf[4096] = { 0 };
 +    const uint8_t report_luns_cdb[UFS_CDB_SIZE] = {
 +        /* allocation length 4096 */
 +        REPORT_LUNS, 0x00, 0x00, 0x00, 0x00, 0x00,
 +        0x00,        0x00, 0x10, 0x00, 0x00, 0x00
 +    };
 +    const uint8_t test_unit_ready_cdb[UFS_CDB_SIZE] = {
 +        TEST_UNIT_READY,
 +    };
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    ufs_init(ufs, alloc);
 +
 +    /* Check REPORT_LUNS */
 +    ufs_send_scsi_command(ufs, 0, 0, report_luns_cdb, NULL, 0, buf, sizeof(buf),
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
 +    /* LUN LIST LENGTH should be 8, in big endian */
 +    g_assert_cmpuint(buf[3], ==, 8);
 +    /* There is one logical unit whose lun is 0 */
 +    g_assert_cmpuint(buf[9], ==, 0);
 +
 +    /* Check TEST_UNIT_READY */
 +    ufs_send_scsi_command(ufs, 0, 0, test_unit_ready_cdb, NULL, 0, NULL, 0,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
 +
 +    ufs_exit(ufs, alloc);
 +}
 +
 +static void ufstest_read_write(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +    uint8_t read_buf[4096] = { 0 };
 +    uint8_t write_buf[4096] = { 0 };
 +    const uint8_t read_capacity_cdb[UFS_CDB_SIZE] = {
 +        /* allocation length 4096 */
 +        SERVICE_ACTION_IN_16,
 +        SAI_READ_CAPACITY_16,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x10,
 +        0x00,
 +        0x00,
 +        0x00
 +    };
 +    const uint8_t read_cdb[UFS_CDB_SIZE] = {
 +        /* READ(10) to LBA 0, transfer length 1 */
 +        READ_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
 +    };
 +    const uint8_t write_cdb[UFS_CDB_SIZE] = {
 +        /* WRITE(10) to LBA 0, transfer length 1 */
 +        WRITE_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
 +    };
 +    uint32_t block_size;
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    ufs_init(ufs, alloc);
 +
 +    /* Read capacity */
 +    ufs_send_scsi_command(ufs, 0, 1, read_capacity_cdb, NULL, 0, read_buf,
 +                          sizeof(read_buf), &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
 +                     UFS_COMMAND_RESULT_SUCESS);
 +    block_size = ldl_be_p(&read_buf[8]);
 +    g_assert_cmpuint(block_size, ==, 4096);
 +
 +    /* Write data */
 +    memset(write_buf, rand() % 255 + 1, block_size);
 +    ufs_send_scsi_command(ufs, 0, 1, write_cdb, write_buf, block_size, NULL, 0,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
 +                     UFS_COMMAND_RESULT_SUCESS);
 +
 +    /* Read data and verify */
 +    ufs_send_scsi_command(ufs, 0, 1, read_cdb, NULL, 0, read_buf, block_size,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
 +                     UFS_COMMAND_RESULT_SUCESS);
 +    g_assert_cmpint(memcmp(read_buf, write_buf, block_size), ==, 0);
 +
 +    ufs_exit(ufs, alloc);
 +}
 +
 +static void drive_destroy(void *path)
 +{
 +    unlink(path);
 +    g_free(path);
 +    qos_invalidate_command_line();
 +}
 +
 +static char *drive_create(void)
 +{
 +    int fd, ret;
 +    char *t_path;
 +
 +    /* Create a temporary raw image */
 +    fd = g_file_open_tmp("qtest-ufs.XXXXXX", &t_path, NULL);
 +    g_assert_cmpint(fd, >=, 0);
 +    ret = ftruncate(fd, TEST_IMAGE_SIZE);
 +    g_assert_cmpint(ret, ==, 0);
 +    close(fd);
 +
 +    g_test_queue_destroy(drive_destroy, t_path);
 +    return t_path;
 +}
 +
 +static void *ufs_blk_test_setup(GString *cmd_line, void *arg)
 +{
 +    char *tmp_path = drive_create();
 +
 +    g_string_append_printf(cmd_line,
 +                           " -blockdev file,filename=%s,node-name=drv1 "
 +                           "-device ufs-lu,bus=ufs0,drive=drv1,lun=1 ",
 +                           tmp_path);
 +
 +    return arg;
 +}
 +
 +static void ufs_register_nodes(void)
 +{
 +    const char *arch;
 +    QOSGraphEdgeOptions edge_opts = {
 +        .before_cmd_line = "-blockdev null-co,node-name=drv0,read-zeroes=on",
 +        .after_cmd_line = "-device ufs-lu,bus=ufs0,drive=drv0,lun=0",
 +        .extra_device_opts = "addr=04.0,id=ufs0,nutrs=32,nutmrs=8"
 +    };
 +
 +    QOSGraphTestOptions io_test_opts = {
 +        .before = ufs_blk_test_setup,
 +    };
 +
 +    add_qpci_address(&edge_opts, &(QPCIAddress){ .devfn = QPCI_DEVFN(4, 0) });
 +
 +    qos_node_create_driver("ufs", ufs_create);
 +    qos_node_consumes("ufs", "pci-bus", &edge_opts);
 +    qos_node_produces("ufs", "pci-device");
 +
 +    qos_add_test("reg-read", "ufs", ufstest_reg_read, NULL);
 +
 +    /*
 +     * Check architecture
 +     * TODO: Enable ufs io tests for ppc64
 +     */
 +    arch = qtest_get_arch();
 +    if (!strcmp(arch, "ppc64")) {
 +        g_test_message("Skipping ufs io tests for ppc64");
 +        return;
 +    }
 +    qos_add_test("init", "ufs", ufstest_init, NULL);
 +    qos_add_test("read-write", "ufs", ufstest_read_write, &io_test_opts);
 +}
 +
 +libqos_init(ufs_register_nodes);
 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qtest/meson.build
 +++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qos_test_ss.add(
    'virtio-iommu-test.c',
    'vmxnet3-test.c',
    'igb-test.c',
 +  'ufs-test.c',
  )
  if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL')
 --
-.24.1
+.41.0

-[PULL 32/34] tests/qemu-iotests: add case to write compressed data of multiple clusters
+Deleted patch
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
-Add the case to the iotest #214 that checks possibility of writing
-compressed data of more than one cluster size. The test case involves
-the compress filter driver showing a sample usage of that.
-Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 1575288906-551879-4-git-send-email-andrey.shinkevich@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/214     | 43 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/214.out | 14 +++++++++++++
-files changed, 57 insertions(+)
-diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/214
-+++ b/tests/qemu-iotests/214
-@@ -XXX,XX +XXX,XX @@ _check_test_img -r all
- $QEMU_IO -c "read  -P 0x11  0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
- $QEMU_IO -c "read  -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
-+echo
-+echo "=== Write compressed data of multiple clusters ==="
-+echo
-+cluster_size=0x10000
-+_make_test_img 2M -o cluster_size=$cluster_size
-+
-+echo "Write uncompressed data:"
-+let data_size="8 * $cluster_size"
-+$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \
-+         2>&1 | _filter_qemu_io | _filter_testdir
-+sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" |
-+        sed -n '/"actual-size":/ s/[^0-9]//gp')
-+
-+_make_test_img 2M -o cluster_size=$cluster_size
-+echo "Write compressed data:"
-+let data_size="3 * $cluster_size + $cluster_size / 2"
-+# Set compress on. That will align the written data
-+# by the cluster size and will write them compressed.
-+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
-+$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \
-+         "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \
-+         2>&1 | _filter_qemu_io | _filter_testdir
-+
-+let offset="4 * $cluster_size + $cluster_size / 4"
-+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
-+$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\
-+    'driver': 'compress',
-+    'file': {'driver': '$IMGFMT',
-+             'file': {'driver': 'file',
-+                      'filename': '$TEST_IMG'}}}" | \
-+                          _filter_qemu_io | _filter_testdir
-+
-+sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" |
-+        sed -n '/"actual-size":/ s/[^0-9]//gp')
-+
-+if [ $sizeA -le $sizeB ]
-+then
-+    echo "Compression ERROR"
-+fi
-+
-+$QEMU_IMG check --output=json "$TEST_IMG" |
-+          sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p'
-+
- # success, all done
- echo '*** done'
- rm -f $seq.full
-diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/214.out
-+++ b/tests/qemu-iotests/214.out
-@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- read 4194304/4194304 bytes at offset 4194304
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+
-+=== Write compressed data of multiple clusters ===
-+
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
-+Write uncompressed data:
-+wrote 524288/524288 bytes at offset 0
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
-+Write compressed data:
-+wrote 229376/229376 bytes at offset 0
-+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 229376/229376 bytes at offset 278528
-+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+"compressed-clusters": 8
- *** done
---
-.24.1

-[PULL 33/34] tests/qemu-iotests: Update tests to recent desugarized -accel option
+Deleted patch
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Commit 6f6e1698a6 desugarized "-machine accel=" to a list
-of "-accel" options. Since now "-machine accel" and "-accel"
-became incompatible, update the iotests to the new format.
-Error reported here:
-https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400
-Reported-by: GitLab CI
-Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options)
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-id: 20200106130951.29873-1-philmd@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/235   | 2 +-
- tests/qemu-iotests/check | 6 +++---
-files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/235
-+++ b/tests/qemu-iotests/235
-@@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
-                 str(size))
- vm = QEMUMachine(iotests.qemu_prog)
--vm.add_args('-machine', 'accel=kvm:tcg')
-+vm.add_args('-accel', 'kvm', '-accel', 'tcg')
- if iotests.qemu_default_machine == 's390-ccw-virtio':
-         vm.add_args('-no-shutdown')
- vm.add_args('-drive', 'id=src,file=' + disk)
-diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/check
-+++ b/tests/qemu-iotests/check
-@@ -XXX,XX +XXX,XX @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
- case "$QEMU_PROG" in
-     *qemu-system-arm|*qemu-system-aarch64)
--        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"
-+        export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
-         ;;
-     *qemu-system-tricore)
--        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
-+        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
-         ;;
-     *)
--        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
-+        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
-         ;;
- esac
---
-.24.1

-[PULL 34/34] backup-top: Begin drain earlier
+Deleted patch
-When dropping backup-top, we need to drain the node before freeing the
-BlockCopyState.  Otherwise, requests may still be in flight and then the
-assertion in shres_destroy() will fail.
-(This becomes visible in intermittent failure of 056.)
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191219182638.104621-1-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup-top.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/backup-top.c b/block/backup-top.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/backup-top.c
-+++ b/block/backup-top.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_backup_top_drop(BlockDriverState *bs)
-     BDRVBackupTopState *s = bs->opaque;
-     AioContext *aio_context = bdrv_get_aio_context(bs);
--    block_copy_state_free(s->bcs);
--
-     aio_context_acquire(aio_context);
-     bdrv_drained_begin(bs);
-+    block_copy_state_free(s->bcs);
-+
-     s->active = false;
-     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
-     bdrv_replace_node(bs, backing_bs(bs), &error_abort);
---
-.24.1

The following changes since commit f17783e706ab9c7b3a2b69cf48e4f0ba40664f54:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191220' into staging (2020-01-03 18:50:33 +0000)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2020-01-06

for you to fetch changes up to 503ca1262bab2c11c533a4816d1ff4297d4f58a6:

backup-top: Begin drain earlier (2020-01-06 14:26:23 +0100)

----------------------------------------------------------------
Block patches:
- Minor fixes and tests from the freeze period (too minor to be included
  in 4.2)
- Allow many bash iotests to test qcow2's external data file feature
- Add compress filter driver
- Fix Python iotests after 6f6e1698a6
- Fix for the backup job

----------------------------------------------------------------
Andrey Shinkevich (3):
  block: introduce compress filter driver
  qcow2: Allow writing compressed data of multiple clusters
  tests/qemu-iotests: add case to write compressed data of multiple
    clusters

Max Reitz (28):
  block: Add bdrv_qapi_perm_to_blk_perm()
  block: Use bdrv_qapi_perm_to_blk_perm()
  blkdebug: Allow taking/unsharing permissions
  iotests: Add @error to wait_until_completed
  iotests: Add test for failing mirror complete
  iotests: s/qocw2/qcow2/
  iotests/qcow2.py: Add dump-header-exts
  iotests/qcow2.py: Split feature fields into bits
  iotests: Add _filter_json_filename
  iotests: Filter refcount_order in 036
  iotests: Replace IMGOPTS by _unsupported_imgopts
  iotests: Drop compat=1.1 in 050
  iotests: Let _make_test_img parse its parameters
  iotests: Add -o and --no-opts to _make_test_img
  iotests: Inject space into -ocompat=0.10 in 051
  iotests: Replace IMGOPTS= by -o
  iotests: Replace IMGOPTS='' by --no-opts
  iotests: Drop IMGOPTS use in 267
  iotests: Avoid qemu-img create
  iotests: Use _rm_test_img for deleting test images
  iotests: Avoid cp/mv of test images
  iotests: Make 091 work with data_file
  iotests: Make 110 work with data_file
  iotests: Make 137 work with data_file
  iotests: Make 198 work with data_file
  iotests: Disable data_file where it cannot be used
  iotests: Allow check -o data_file
  backup-top: Begin drain earlier

PanNengyuan (1):
  throttle-groups: fix memory leak in throttle_group_set_limit:

Philippe Mathieu-Daudé (1):
  tests/qemu-iotests: Update tests to recent desugarized -accel option

Vladimir Sementsov-Ogievskiy (1):
  qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap

-- 
2.24.1

We need some way to correlate QAPI BlockPermission values with
BLK_PERM_* flags.  We could:

(1) have the same order in the QAPI definition as the the BLK_PERM_*
    flags are in LSb-first order.  However, then there is no guarantee
    that they actually match (e.g. when someone modifies the QAPI schema
    without thinking of the BLK_PERM_* definitions).
    We could add static assertions, but these would break what’s good
    about this solution, namely its simplicity.

(2) define the BLK_PERM_* flags based on the BlockPermission values.
    But this way whenever someone were to modify the QAPI order
    (perfectly sensible in theory), the BLK_PERM_* values would change.
    Because these values are used for file locking, this might break
    file locking between different qemu versions.

Therefore, go the slightly more cumbersome way: Add a function to
translate from the QAPI constants to the BLK_PERM_* flags.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-2-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c               | 18 ++++++++++++++++++
 include/block/block.h |  1 +
 2 files changed, 19 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
     *nshared = shared;
 }
 
+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
+{
+    static const uint64_t permissions[] = {
+        [BLOCK_PERMISSION_CONSISTENT_READ]  = BLK_PERM_CONSISTENT_READ,
+        [BLOCK_PERMISSION_WRITE]            = BLK_PERM_WRITE,
+        [BLOCK_PERMISSION_WRITE_UNCHANGED]  = BLK_PERM_WRITE_UNCHANGED,
+        [BLOCK_PERMISSION_RESIZE]           = BLK_PERM_RESIZE,
+        [BLOCK_PERMISSION_GRAPH_MOD]        = BLK_PERM_GRAPH_MOD,
+    };
+
+    QEMU_BUILD_BUG_ON(ARRAY_SIZE(permissions) != BLOCK_PERMISSION__MAX);
+    QEMU_BUILD_BUG_ON(1UL << ARRAY_SIZE(permissions) != BLK_PERM_ALL + 1);
+
+    assert(qapi_perm < BLOCK_PERMISSION__MAX);
+
+    return permissions[qapi_perm];
+}
+
 static void bdrv_replace_child_noperm(BdrvChild *child,
                                       BlockDriverState *new_bs)
 {
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 @@ enum {
 };
 
 char *bdrv_perm_names(uint64_t perm);
+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm);
 
 /* disk I/O throttling */
 void bdrv_init(void);
-- 
2.24.1

We can save some LoC in xdbg_graph_add_edge() by using
bdrv_qapi_perm_to_blk_perm().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-3-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 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 xdbg_graph_add_node(XDbgBlockGraphConstructor *gr, void *node,
 static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *parent,
                                 const BdrvChild *child)
 {
-    typedef struct {
-        unsigned int flag;
-        BlockPermission num;
-    } PermissionMap;
-
-    static const PermissionMap permissions[] = {
-        { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ },
-        { BLK_PERM_WRITE,           BLOCK_PERMISSION_WRITE },
-        { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED },
-        { BLK_PERM_RESIZE,          BLOCK_PERMISSION_RESIZE },
-        { BLK_PERM_GRAPH_MOD,       BLOCK_PERMISSION_GRAPH_MOD },
-        { 0, 0 }
-    };
-    const PermissionMap *p;
+    BlockPermission qapi_perm;
     XDbgBlockGraphEdge *edge;
 
-    QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) != BLK_PERM_ALL + 1);
-
     edge = g_new0(XDbgBlockGraphEdge, 1);
 
     edge->parent = xdbg_graph_node_num(gr, parent);
     edge->child = xdbg_graph_node_num(gr, child->bs);
     edge->name = g_strdup(child->name);
 
-    for (p = permissions; p->flag; p++) {
-        if (p->flag & child->perm) {
-            QAPI_LIST_ADD(edge->perm, p->num);
+    for (qapi_perm = 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) {
+        uint64_t flag = bdrv_qapi_perm_to_blk_perm(qapi_perm);
+
+        if (flag & child->perm) {
+            QAPI_LIST_ADD(edge->perm, qapi_perm);
         }
-        if (p->flag & child->shared_perm) {
-            QAPI_LIST_ADD(edge->shared_perm, p->num);
+        if (flag & child->shared_perm) {
+            QAPI_LIST_ADD(edge->shared_perm, qapi_perm);
         }
     }
 
-- 
2.24.1

Sometimes it is useful to be able to add a node to the block graph that
takes or unshare a certain set of permissions for debugging purposes.
This patch adds this capability to blkdebug.

(Note that you cannot make blkdebug release or share permissions that it
needs to take or cannot share, because this might result in assertion
failures in the block layer.  But if the blkdebug node has no parents,
it will not take any permissions and share everything by default, so you
can then freely choose what permissions to take and share.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-4-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/blkdebug.c     | 93 +++++++++++++++++++++++++++++++++++++++++++-
 qapi/block-core.json | 14 ++++++-
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/block/blkdebug.c b/block/blkdebug.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
+#include "qapi/qobject-input-visitor.h"
 #include "sysemu/qtest.h"
 
 typedef struct BDRVBlkdebugState {
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVBlkdebugState {
     uint64_t opt_discard;
     uint64_t max_discard;
 
+    uint64_t take_child_perms;
+    uint64_t unshare_child_perms;
+
     /* For blkdebug_refresh_filename() */
     char *config_file;
 
@@ -XXX,XX +XXX,XX @@ static void blkdebug_parse_filename(const char *filename, QDict *options,
     qdict_put_str(options, "x-image", filename);
 }
 
+static int blkdebug_parse_perm_list(uint64_t *dest, QDict *options,
+                                    const char *prefix, Error **errp)
+{
+    int ret = 0;
+    QDict *subqdict = NULL;
+    QObject *crumpled_subqdict = NULL;
+    Visitor *v = NULL;
+    BlockPermissionList *perm_list = NULL, *element;
+    Error *local_err = NULL;
+
+    *dest = 0;
+
+    qdict_extract_subqdict(options, &subqdict, prefix);
+    if (!qdict_size(subqdict)) {
+        goto out;
+    }
+
+    crumpled_subqdict = qdict_crumple(subqdict, errp);
+    if (!crumpled_subqdict) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    v = qobject_input_visitor_new(crumpled_subqdict);
+    visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    for (element = perm_list; element; element = element->next) {
+        *dest |= bdrv_qapi_perm_to_blk_perm(element->value);
+    }
+
+out:
+    qapi_free_BlockPermissionList(perm_list);
+    visit_free(v);
+    qobject_unref(subqdict);
+    qobject_unref(crumpled_subqdict);
+    return ret;
+}
+
+static int blkdebug_parse_perms(BDRVBlkdebugState *s, QDict *options,
+                                Error **errp)
+{
+    int ret;
+
+    ret = blkdebug_parse_perm_list(&s->take_child_perms, options,
+                                   "take-child-perms.", errp);
+    if (ret < 0) {
+        return ret;
+    }
+
+    ret = blkdebug_parse_perm_list(&s->unshare_child_perms, options,
+                                   "unshare-child-perms.", errp);
+    if (ret < 0) {
+        return ret;
+    }
+
+    return 0;
+}
+
 static QemuOptsList runtime_opts = {
     .name = "blkdebug",
     .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
@@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
     /* Set initial state */
     s->state = 1;
 
+    /* Parse permissions modifiers before opening the image file */
+    ret = blkdebug_parse_perms(s, options, errp);
+    if (ret < 0) {
+        goto out;
+    }
+
     /* Open the image file */
     bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",
                                bs, &child_file, false, &local_err);
@@ -XXX,XX +XXX,XX @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,
     return 0;
 }
 
+static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c,
+                                const BdrvChildRole *role,
+                                BlockReopenQueue *reopen_queue,
+                                uint64_t perm, uint64_t shared,
+                                uint64_t *nperm, uint64_t *nshared)
+{
+    BDRVBlkdebugState *s = bs->opaque;
+
+    bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
+                              nperm, nshared);
+
+    *nperm |= s->take_child_perms;
+    *nshared &= ~s->unshare_child_perms;
+}
+
 static const char *const blkdebug_strong_runtime_opts[] = {
     "config",
     "inject-error.",
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkdebug = {
     .bdrv_file_open         = blkdebug_open,
     .bdrv_close             = blkdebug_close,
     .bdrv_reopen_prepare    = blkdebug_reopen_prepare,
-    .bdrv_child_perm        = bdrv_filter_default_perms,
+    .bdrv_child_perm        = blkdebug_child_perm,
 
     .bdrv_getlength         = blkdebug_getlength,
     .bdrv_refresh_filename  = blkdebug_refresh_filename,
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 @@
 #
 # @set-state:       array of state-change descriptions
 #
+# @take-child-perms: Permissions to take on @image in addition to what
+#                    is necessary anyway (which depends on how the
+#                    blkdebug node is used).  Defaults to none.
+#                    (since 5.0)
+#
+# @unshare-child-perms: Permissions not to share on @image in addition
+#                       to what cannot be shared anyway (which depends
+#                       on how the blkdebug node is used).  Defaults
+#                       to none.  (since 5.0)
+#
 # Since: 2.9
 ##
 { 'struct': 'BlockdevOptionsBlkdebug',
@@ -XXX,XX +XXX,XX @@
             '*opt-write-zero': 'int32', '*max-write-zero': 'int32',
             '*opt-discard': 'int32', '*max-discard': 'int32',
             '*inject-error': ['BlkdebugInjectErrorOptions'],
-            '*set-state': ['BlkdebugSetStateOptions'] } }
+            '*set-state': ['BlkdebugSetStateOptions'],
+            '*take-child-perms': ['BlockPermission'],
+            '*unshare-child-perms': ['BlockPermission'] } }
 
 ##
 # @BlockdevOptionsBlklogwrites:
-- 
2.24.1

Callers can use this new parameter to expect failure during the
completion process.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191108123455.39445-5-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         self.assert_no_active_block_jobs()
         return result
 
-    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0):
+    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0,
+                             error=None):
         '''Wait for a block job to finish, returning the event'''
         while True:
             for event in self.vm.get_qmp_events(wait=wait):
                 if event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assert_qmp(event, 'data/device', drive)
-                    self.assert_qmp_absent(event, 'data/error')
-                    if check_offset:
-                        self.assert_qmp(event, 'data/offset', event['data']['len'])
+                    if error is None:
+                        self.assert_qmp_absent(event, 'data/error')
+                        if check_offset:
+                            self.assert_qmp(event, 'data/offset',
+                                            event['data']['len'])
+                    else:
+                        self.assert_qmp(event, 'data/error', error)
                     self.assert_no_active_block_jobs()
                     return event
                 elif event['event'] == 'JOB_STATUS_CHANGE':
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         self.assert_qmp(event, 'data/type', 'mirror')
         self.assert_qmp(event, 'data/offset', event['data']['len'])
 
-    def complete_and_wait(self, drive='drive0', wait_ready=True):
+    def complete_and_wait(self, drive='drive0', wait_ready=True,
+                          completion_error=None):
         '''Complete a block job and wait for it to finish'''
         if wait_ready:
             self.wait_ready(drive=drive)
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         result = self.vm.qmp('block-job-complete', device=drive)
         self.assert_qmp(result, 'return', {})
 
-        event = self.wait_until_completed(drive=drive)
+        event = self.wait_until_completed(drive=drive, error=completion_error)
         self.assert_qmp(event, 'data/type', 'mirror')
 
     def pause_wait(self, job_id='job0'):
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20191108123455.39445-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/041     | 44 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/041.out |  4 ++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase):
                              target='dest-ro')
         self.assert_qmp(result, 'error/class', 'GenericError')
 
+    def test_failing_permission_in_complete(self):
+        self.assert_no_active_block_jobs()
+
+        # Unshare consistent-read on the target
+        # (The mirror job does not care)
+        result = self.vm.qmp('blockdev-add',
+                             driver='blkdebug',
+                             node_name='dest-perm',
+                             image='dest',
+                             unshare_child_perms=['consistent-read'])
+        self.assert_qmp(result, 'return', {})
+
+        result = self.vm.qmp('blockdev-mirror', job_id='job', device='src',
+                             sync='full', target='dest',
+                             filter_node_name='mirror-filter')
+        self.assert_qmp(result, 'return', {})
+
+        # Require consistent-read on the source
+        # (We can only add this node once the job has started, or it
+        # will complain that it does not want to run on non-root nodes)
+        result = self.vm.qmp('blockdev-add',
+                             driver='blkdebug',
+                             node_name='src-perm',
+                             image='src',
+                             take_child_perms=['consistent-read'])
+        self.assert_qmp(result, 'return', {})
+
+        # While completing, mirror will attempt to replace src by
+        # dest, which must fail because src-perm requires
+        # consistent-read but dest-perm does not share it; thus
+        # aborting the job when it is supposed to complete
+        self.complete_and_wait('job',
+                               completion_error='Operation not permitted')
+
+        # Assert that all of our nodes are still there (except for the
+        # mirror filter, which should be gone despite the failure)
+        nodes = self.vm.qmp('query-named-block-nodes')['return']
+        nodes = [node['node-name'] for node in nodes]
+
+        for expect in ('src', 'src-perm', 'dest', 'dest-perm'):
+            self.assertTrue(expect in nodes, '%s disappeared' % expect)
+        self.assertFalse('mirror-filter' in nodes,
+                         'Mirror filter node did not disappear')
+
 if __name__ == '__main__':
     iotests.main(supported_fmts=['qcow2', 'qed'],
                  supported_protocols=['file'])
diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/041.out
+++ b/tests/qemu-iotests/041.out
@@ -XXX,XX +XXX,XX @@
-..........................................................................................
+...........................................................................................
 ----------------------------------------------------------------------
-Ran 90 tests
+Ran 91 tests
 
 OK
-- 
2.24.1

From: PanNengyuan <pannengyuan@huawei.com>

This avoid a memory leak when qom-set is called to set throttle_group
limits, here is an easy way to reproduce:

1. run qemu-iotests as follow and check the result with asan:
       ./check -qcow2 184

Following is the asan output backtrack:
Direct leak of 912 byte(s) in 3 object(s) allocated from:
    #0 0xffff8d7ab3c3 in __interceptor_calloc   (/lib64/libasan.so.4+0xd33c3)
    #1 0xffff8d4c31cb in g_malloc0   (/lib64/libglib-2.0.so.0+0x571cb)
    #2 0x190c857 in qobject_input_start_struct  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qobject-input-visitor.c:295
    #3 0x19070df in visit_start_struct   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qapi-visit-core.c:49
    #4 0x1948b87 in visit_type_ThrottleLimits   qapi/qapi-visit-block-core.c:3759
    #5 0x17e4aa3 in throttle_group_set_limits   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/block/throttle-groups.c:900
    #6 0x1650eff in object_property_set     /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/object.c:1272
    #7 0x1658517 in object_property_set_qobject   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qobject.c:26
    #8 0x15880bb in qmp_qom_set  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qmp-cmds.c:74
    #9 0x157e3e3 in qmp_marshal_qom_set  qapi/qapi-commands-qom.c:154

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: PanNengyuan <pannengyuan@huawei.com>
Message-id: 1574835614-42028-1-git-send-email-pannengyuan@huawei.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/throttle-groups.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
 {
     ThrottleGroup *tg = THROTTLE_GROUP(obj);
     ThrottleConfig cfg;
-    ThrottleLimits arg = { 0 };
-    ThrottleLimits *argp = &arg;
+    ThrottleLimits *argp;
     Error *local_err = NULL;
 
     visit_type_ThrottleLimits(v, name, &argp, &local_err);
@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
 unlock:
     qemu_mutex_unlock(&tg->lock);
 ret:
+    qapi_free_ThrottleLimits(argp);
     error_propagate(errp, local_err);
     return;
 }
-- 
2.24.1

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

qcow2_can_store_new_dirty_bitmap works wrong, as it considers only
bitmaps already stored in the qcow2 image and ignores persistent
BdrvDirtyBitmap objects.

So, let's instead count persistent BdrvDirtyBitmaps. We load all qcow2
bitmaps on open, so there should not be any bitmap in the image for
which we don't have BdrvDirtyBitmaps version. If it is - it's a kind of
corruption, and no reason to check for corruptions here (open() and
close() are better places for it).

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191014115126.15360-2-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-bitmap.c | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
                                                       Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
-    bool found;
-    Qcow2BitmapList *bm_list;
+    BdrvDirtyBitmap *bitmap;
+    uint64_t bitmap_directory_size = 0;
+    uint32_t nb_bitmaps = 0;
+
+    if (bdrv_find_dirty_bitmap(bs, name)) {
+        error_setg(errp, "Bitmap already exists: %s", name);
+        return false;
+    }
 
     if (s->qcow_version < 3) {
         /* Without autoclear_features, we would always have to assume
@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
         goto fail;
     }
 
-    if (s->nb_bitmaps == 0) {
-        return true;
+    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
+        if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
+            nb_bitmaps++;
+            bitmap_directory_size +=
+                calc_dir_entry_size(strlen(bdrv_dirty_bitmap_name(bitmap)), 0);
+        }
     }
+    nb_bitmaps++;
+    bitmap_directory_size += calc_dir_entry_size(strlen(name), 0);
 
-    if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) {
+    if (nb_bitmaps > QCOW2_MAX_BITMAPS) {
         error_setg(errp,
                    "Maximum number of persistent bitmaps is already reached");
         goto fail;
     }
 
-    if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) >
-        QCOW2_MAX_BITMAP_DIRECTORY_SIZE)
-    {
+    if (bitmap_directory_size > QCOW2_MAX_BITMAP_DIRECTORY_SIZE) {
         error_setg(errp, "Not enough space in the bitmap directory");
         goto fail;
     }
 
-    qemu_co_mutex_lock(&s->lock);
-    bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
-                               s->bitmap_directory_size, errp);
-    qemu_co_mutex_unlock(&s->lock);
-    if (bm_list == NULL) {
-        goto fail;
-    }
-
-    found = find_bitmap_by_name(bm_list, name);
-    bitmap_list_free(bm_list);
-    if (found) {
-        error_setg(errp, "Bitmap with the same name is already stored");
-        goto fail;
-    }
-
     return true;
 
 fail:
-- 
2.24.1

Probably due to blind copy-pasting, we have several instances of "qocw2"
in our iotests.  Fix them.

Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191107163708.833192-2-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/060 | 2 +-
 tests/qemu-iotests/061 | 2 +-
 tests/qemu-iotests/062 | 2 +-
 tests/qemu-iotests/066 | 2 +-
 tests/qemu-iotests/068 | 2 +-
 tests/qemu-iotests/108 | 2 +-
 tests/qemu-iotests/138 | 2 +-
 tests/qemu-iotests/261 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/261
+++ b/tests/qemu-iotests/261
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-- 
2.24.1

This is useful for tests that want to whitelist fields from dump-header
(with grep) but still print all header extensions.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-3-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/qcow2.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -XXX,XX +XXX,XX @@ def cmd_dump_header(fd):
     h.dump()
     h.dump_extensions()
 
+def cmd_dump_header_exts(fd):
+    h = QcowHeader(fd)
+    h.dump_extensions()
+
 def cmd_set_header(fd, name, value):
     try:
         value = int(value, 0)
@@ -XXX,XX +XXX,XX @@ def cmd_set_feature_bit(fd, group, bit):
 
 cmds = [
     [ 'dump-header',          cmd_dump_header,          0, 'Dump image header and header extensions' ],
+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],
     [ 'set-header',           cmd_set_header,           2, 'Set a field in the header'],
     [ 'add-header-ext',       cmd_add_header_ext,       2, 'Add a header extension' ],
     [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ],
-- 
2.24.1

Print the feature fields as a set of bits so that filtering is easier.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-4-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/031.out  | 36 +++++++++----------
 tests/qemu-iotests/036.out  | 18 +++++-----
 tests/qemu-iotests/039.out  | 22 ++++++------
 tests/qemu-iotests/060.out  | 20 +++++------
 tests/qemu-iotests/061.out  | 72 ++++++++++++++++++-------------------
 tests/qemu-iotests/137.out  |  2 +-
 tests/qemu-iotests/qcow2.py | 18 +++++++---
 7 files changed, 99 insertions(+), 89 deletions(-)

diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/031.out
+++ b/tests/qemu-iotests/031.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x8000000000000000
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     [63]
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x8000000000000000
+incompatible_features     []
+compatible_features       []
+autoclear_features        [63]
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/039.out
+++ b/tests/qemu-iotests/039.out
@@ -XXX,XX +XXX,XX @@ QA output created by 039
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 
 == Creating a dirty image file ==
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
 
@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
 == Read-only access must still work ==
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x1
+incompatible_features     [0]
 
 == Repairing the image file must succeed ==
 ERROR cluster 5 refcount=0 reference=1
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 
 == Data should still be accessible after repair ==
 read 512/512 bytes at offset 0
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 Rebuilding refcount structure
 Repairing cluster 1 refcount=1 reference=0
 Repairing cluster 2 refcount=1 reference=0
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 
 == Creating an image file with lazy_refcounts=off ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 
 == Committing to a backing file with lazy_refcounts=on ==
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Image committed.
-incompatible_features     0x0
-incompatible_features     0x0
+incompatible_features     []
+incompatible_features     []
 No errors were found on the image.
 No errors were found on the image.
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 *** done
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -XXX,XX +XXX,XX @@ ERROR cluster 3 refcount=1 reference=3
 
 1 errors were found on the image.
 Data may be corrupted, or further writes to the image may corrupt it.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
@@ -XXX,XX +XXX,XX @@ ERROR cluster 2 refcount=1 reference=2
 
 2 errors were found on the image.
 Data may be corrupted, or further writes to the image may corrupt it.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 ERROR refcount block 0 refcount=2
 ERROR cluster 2 refcount=1 reference=2
 Rebuilding refcount structure
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 
 === Testing cluster data reference into inactive L2 table ===
 
@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
 
 1 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 ERROR cluster 4 refcount=1 reference=2
 Leaked cluster 9 refcount=1 reference=0
 Repairing cluster 4 refcount=1 reference=2
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 No errors were found on the image.
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x1
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     [0]
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x40000000000
-autoclear_features        0x40000000000
+incompatible_features     []
+compatible_features       [42]
+autoclear_features        [42]
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x1
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     [0]
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
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 @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -XXX,XX +XXX,XX @@ class QcowHeader:
         [ uint64_t, '%#x',  'snapshot_offset' ],
 
         # Version 3 header fields
-        [ uint64_t, '%#x',  'incompatible_features' ],
-        [ uint64_t, '%#x',  'compatible_features' ],
-        [ uint64_t, '%#x',  'autoclear_features' ],
+        [ uint64_t, 'mask', 'incompatible_features' ],
+        [ uint64_t, 'mask', 'compatible_features' ],
+        [ uint64_t, 'mask', 'autoclear_features' ],
         [ uint32_t, '%d',   'refcount_order' ],
         [ uint32_t, '%d',   'header_length' ],
     ];
@@ -XXX,XX +XXX,XX @@ class QcowHeader:
 
     def dump(self):
         for f in QcowHeader.fields:
-            print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
+            value = self.__dict__[f[2]]
+            if f[1] == 'mask':
+                bits = []
+                for bit in range(64):
+                    if value & (1 << bit):
+                        bits.append(bit)
+                value_str = str(bits)
+            else:
+                value_str = f[1] % value
+
+            print("%-25s" % f[2], value_str)
         print("")
 
     def dump_extensions(self):
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-5-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.filter | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_qmp_empty_return()
     grep -v '{"return": {}}'
 }
 
+_filter_json_filename()
+{
+    $PYTHON -c 'import sys
+result, *fnames = sys.stdin.read().split("json:{")
+depth = 0
+for fname in fnames:
+    depth += 1 # For the opening brace in the split separator
+    for chr_i, chr in enumerate(fname):
+        if chr == "{":
+            depth += 1
+        elif chr == "}":
+            depth -= 1
+            if depth == 0:
+                break
+
+    # json:{} filenames may be nested; filter out everything from
+    # inside the outermost one
+    if depth == 0:
+        chr_i += 1 # First character past the filename
+        result += "json:{ /* filtered */ }" + fname[chr_i:]
+
+sys.stdout.write(result)'
+}
+
 # make sure this script returns success
 true
-- 
2.24.1

This test can run just fine with other values for refcount_bits, so we
should filter the value from qcow2.py's dump-header.  In fact, we can
filter everything but the feature bits and header extensions, because
that is what the test is about.

(036 currently ignores user-specified image options, but that will be
fixed in the next patch.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/036     |  9 ++++---
 tests/qemu-iotests/036.out | 48 --------------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
 
 # Without feature table
 $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 _img_info
 
 # With feature table containing bit 63
@@ -XXX,XX +XXX,XX @@ echo === Create image with unknown autoclear feature bit ===
 echo
 _make_test_img 64M
 $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo === Repair image ===
 echo
 _check_test_img -r all
 
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -XXX,XX +XXX,XX @@ QA output created by 036
 === Image with unknown incompatible feature bit ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     [63]
 compatible_features       []
 autoclear_features        []
-refcount_order            4
-header_length             104
-
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature
 
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes
 === Create image with unknown autoclear feature bit ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     []
 compatible_features       []
 autoclear_features        [63]
-refcount_order            4
-header_length             104
-
 Header extension:
 magic                     0x6803f857
 length                    192
@@ -XXX,XX +XXX,XX @@ data                      <binary>
 === Repair image ===
 
 No errors were found on the image.
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     []
 compatible_features       []
 autoclear_features        []
-refcount_order            4
-header_length             104
-
 Header extension:
 magic                     0x6803f857
 length                    192
-- 
2.24.1

Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
globally.  That is not how it should be done; instead, they should
simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
default anyway).

This makes the tests heed user-specified $IMGOPTS.  Some do not work
with all image options, though, so we need to disable them accordingly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com>
Message-id: 20191107163708.833192-7-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/036 | 3 +--
 tests/qemu-iotests/060 | 4 ++--
 tests/qemu-iotests/062 | 3 ++-
 tests/qemu-iotests/066 | 3 ++-
 tests/qemu-iotests/068 | 3 ++-
 tests/qemu-iotests/098 | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-
 # Only qcow2v3 and later supports feature bits
-IMGOPTS="compat=1.1"
+_unsupported_imgopts 'compat=0.10'
 
 echo
 echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# These tests only work for compat=1.1 images with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 # The repair process will create a large file - so check for availability first
 _require_large_file 64G
@@ -XXX,XX +XXX,XX @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
 l2_offset=262144 # 0x40000 (XXX: just an assumption)
 l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
 
-IMGOPTS="compat=1.1"
-
 OPEN_RW="open -o overlap-check=all $TEST_IMG"
 # Overlap checks are done before write operations only, therefore opening an
 # image read-only makes the overlap-check option irrelevant
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# We need zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
-IMGOPTS="compat=1.1"
 IMG_SIZE=64M
 
 echo
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# We need zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
 # Intentionally create an unaligned image
-IMGOPTS="compat=1.1"
 IMG_SIZE=$((64 * 1024 * 1024 + 512))
 
 echo
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# Internal snapshots are (currently) impossible with refcount_bits=1
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
-IMGOPTS="compat=1.1"
 IMG_SIZE=128K
 
 case "$QEMU_DEFAULT_MACHINE" in
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-
-IMGOPTS="compat=1.1"
+# The code path we want to test here only works for compat=1.1 images
+_unsupported_imgopts 'compat=0.10'
 
 for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
 
-- 
2.24.1

This will allow us to add more options than just -b.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-9-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     # extra qemu-img options can be added by tests
     # at least one argument (the image size) needs to be added
     local extra_img_options=""
-    local image_size=$*
     local optstr=""
     local img_name=""
     local use_backing=0
     local backing_file=""
     local object_options=""
+    local misc_params=()
 
     if [ -n "$TEST_IMG_FILE" ]; then
         img_name=$TEST_IMG_FILE
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
     fi
 
-    if [ "$1" = "-b" ]; then
-        use_backing=1
-        backing_file=$2
-        image_size=$3
-    fi
+    for param; do
+        if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
+            backing_file=$param
+            continue
+        fi
+
+        case "$param" in
+            -b)
+                use_backing=1
+                ;;
+
+            *)
+                misc_params=("${misc_params[@]}" "$param")
+                ;;
+        esac
+    done
+
     if [ $ "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" $ -a -n "$CLUSTER_SIZE" ]; then
         optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
     fi
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     # XXX(hch): have global image options?
     (
      if [ $use_backing = 1 ]; then
-        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
      else
-        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
      fi
     ) | _filter_img_create
 
-- 
2.24.1

Blindly overriding IMGOPTS is suboptimal as this discards user-specified
options.  Whatever options the test needs should simply be appended.

Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
that is cumbersome.  It’s simpler to just give _make_test_img an -o
parameter with which tests can add options.

Some tests actually must override the user-specified options, though,
for example when creating an image in a different format than the test
$IMGFMT.  For such cases, --no-opts allows clearing the current option
list.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-10-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     local use_backing=0
     local backing_file=""
     local object_options=""
+    local opts_param=false
     local misc_params=()
 
     if [ -n "$TEST_IMG_FILE" ]; then
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
             backing_file=$param
             continue
+        elif $opts_param; then
+            optstr=$(_optstr_add "$optstr" "$param")
+            opts_param=false
+            continue
         fi
 
         case "$param" in
@@ -XXX,XX +XXX,XX @@ _make_test_img()
                 use_backing=1
                 ;;
 
+            -o)
+                opts_param=true
+                ;;
+
+            --no-opts)
+                optstr=""
+                ;;
+
             *)
                 misc_params=("${misc_params[@]}" "$param")
                 ;;
-- 
2.24.1

Tests should not overwrite all user-supplied image options, but only add
to it (which will effectively overwrite conflicting values).  Accomplish
this by passing options to _make_test_img via -o instead of $IMGOPTS.

For some tests, there is no functional change because they already only
appended options to IMGOPTS.  For these, this patch is just a
simplification.

For others, this is a change, so they now heed user-specified $IMGOPTS.
Some of those tests do not work with all image options, though, so we
need to disable them accordingly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-12-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/031 |  9 ++++---
 tests/qemu-iotests/039 | 24 ++++++------------
 tests/qemu-iotests/059 | 18 ++++++-------
 tests/qemu-iotests/060 |  6 ++---
 tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
 tests/qemu-iotests/079 |  3 +--
 tests/qemu-iotests/106 |  2 +-
 tests/qemu-iotests/108 |  2 +-
 tests/qemu-iotests/112 | 32 ++++++++++++------------
 tests/qemu-iotests/115 |  3 +--
 tests/qemu-iotests/121 |  6 ++---
 tests/qemu-iotests/125 |  2 +-
 tests/qemu-iotests/137 |  2 +-
 tests/qemu-iotests/138 |  3 +--
 tests/qemu-iotests/175 |  2 +-
 tests/qemu-iotests/190 |  2 +-
 tests/qemu-iotests/191 |  3 +--
 tests/qemu-iotests/220 |  4 ++-
 tests/qemu-iotests/243 |  6 +++--
 tests/qemu-iotests/244 | 10 +++++---
 tests/qemu-iotests/250 |  3 +--
 tests/qemu-iotests/265 |  2 +-
 22 files changed, 100 insertions(+), 101 deletions(-)

diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
+# We want to test compat=0.10, which does not support refcount widths
+# other than 16
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 CLUSTER_SIZE=65536
 
 # qcow2.py output depends on the exact options used, so override the command
 # line here as an exception
-for IMGOPTS in "compat=0.10" "compat=1.1"; do
+for compat in "compat=0.10" "compat=1.1"; do
 
     echo
-    echo ===== Testing with -o $IMGOPTS =====
+    echo ===== Testing with -o $compat =====
     echo
     echo === Create image with unknown header extension ===
     echo
-    _make_test_img 64M
+    _make_test_img -o $compat 64M
     $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension"
     $PYTHON qcow2.py "$TEST_IMG" dump-header
     _check_test_img
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ size=128M
 echo
 echo "== Checking that image is clean on shutdown =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
 
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "== Creating a dirty image file =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "== Opening a dirty image read/write should repair it =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
 echo
 echo "== Creating an image file with lazy_refcounts=off =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "== Committing to a backing file with lazy_refcounts=on =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-TEST_IMG="$TEST_IMG".base _make_test_img $size
+TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
-IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
 
 $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG commit "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG".base _check_test_img
 echo
 echo "== Changing lazy_refcounts setting at runtime =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "reopen -o lazy-refcounts=on" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
 $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
 _check_test_img
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "reopen -o lazy-refcounts=off" \
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
 
 echo
 echo "=== Testing monolithicFlat creation and opening ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat" 2G
 _img_info
 _cleanup_test_img
 
 echo
 echo "=== Testing monolithicFlat with zeroed_grain ==="
-IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
 _cleanup_test_img
 
 echo
 echo "=== Testing big twoGbMaxExtentFlat ==="
-IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
+_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
 $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
 _cleanup_test_img
 
@@ -XXX,XX +XXX,XX @@ _img_info
 
 echo
 echo "=== Testing truncated sparse ==="
-IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
+_make_test_img -o "subformat=monolithicSparse" 100G
 truncate -s 10M $TEST_IMG
 _img_info
 
 echo
 echo "=== Converting to streamOptimized from image with small cluster size==="
-TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
+TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
 $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
 $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
 $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
@@ -XXX,XX +XXX,XX @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
 
 echo '--- blkdebug ---'
 # Should work, because bdrv_dirname() works fine with blkdebug
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
 $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
          -c info \
     2>&1 \
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 
 echo '--- quorum ---'
 # Should not work, because bdrv_dirname() does not work with quorum
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
 cp "$TEST_IMG" "$TEST_IMG.orig"
 
 filename="json:{
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 
 echo
 echo "=== Testing 4TB monolithicFlat creation and IO ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
+_make_test_img -o "subformat=monolithicFlat" 4T
 _img_info
 $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 echo
 echo "=== Testing qemu-img map on extents ==="
 for fmt in monolithicSparse twoGbMaxExtentSparse; do
-    IMGOPTS="subformat=$fmt" _make_test_img 31G
+    _make_test_img -o "subformat=$fmt" 31G
     $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
     $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
     $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
 # compat=0.10 is required in order to make the following discard actually
 # unallocate the sector rather than make it a zero sector - we want COW, after
 # all.
-IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
+_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
 # Write two clusters, the second one enforces creation of an L2 table after
 # the first data cluster.
 $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Discarding a non-covered in-bounds refblock ==="
 echo
 
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
 
 # Pretend there's a refblock somewhere where there is no refblock to
 # cover it (but the covering refblock has a valid index in the
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Discarding a refblock covered by an unaligned refblock ==="
 echo
 
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
 
 # Same as above
 poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Conversion between different compat versions can only really work
+# with refcount_bits=16
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing dirty version downgrade ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42
 $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42
 $PYTHON qcow2.py "$TEST_IMG" dump-header
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version upgrade and resize ==="
 echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_make_test_img -o "compat=0.10" 64M
 $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing dirty lazy_refcounts=off ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing backing file ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
 $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing invalid configurations ==="
 echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_make_test_img -o "compat=0.10" 64M
 $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
 $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
 $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
 echo
 echo "=== Testing correct handling of unset value ==="
 echo
-IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
+_make_test_img -o "compat=1.1,cluster_size=1k" 64M
 echo "Should work:"
 $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
 echo "Should not work:" # Just to know which of these tests actually fails
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
 echo
 echo "=== Testing zero expansion on inactive clusters ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing zero expansion on shared L2 table ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing zero expansion on backed image ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _check_test_img
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
 echo
 echo "=== Testing zero expansion on backed inactive clusters ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
 echo
 echo "=== Testing zero expansion on backed image with shared L2 table ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing preallocated zero expansion on full image ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
+TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _check_test_img
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing progress report without snapshot ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
 $QEMU_IO -c "write -z 0  64k" \
          -c "write -z 1G 64k" \
          -c "write -z 2G 64k" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing progress report with snapshot ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
 $QEMU_IO -c "write -z 0  64k" \
          -c "write -z 1G 64k" \
          -c "write -z 2G 64k" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with external data file ==="
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _img_info --format-specific
 _check_test_img
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Try changing the external data file ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
 
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
 $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
 _img_info --format-specific
 TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
@@ -XXX,XX +XXX,XX @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
 echo
 echo "=== Clearing and setting data-file-raw ==="
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
 $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
 _img_info --format-specific
 _check_test_img
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -XXX,XX +XXX,XX @@ echo
 cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
 
 for s in $cluster_sizes; do
-    IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
-        _make_test_img 4G
+    _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
 done
 
 # success, all done
diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/106
+++ b/tests/qemu-iotests/106
@@ -XXX,XX +XXX,XX @@ for create_mode in off falloc full; do
         echo
         echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
 
-        IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
+        _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
         $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
 
         expected_size=0
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Repairing unreferenced data cluster in new refblock area ==='
 echo
 
-IMGOPTS='cluster_size=512' _make_test_img 64M
+_make_test_img -o 'cluster_size=512' 64M
 # Allocate the first 128 kB in the image (first refblock)
 $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
 # should be 131072 == 0x20000
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits limits ==='
 echo
 
 # Must be positive (non-zero)
-IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
+_make_test_img -o "refcount_bits=0" 64M
 # Must be positive (non-negative)
-IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
+_make_test_img -o "refcount_bits=-1" 64M
 # May not exceed 64
-IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
+_make_test_img -o "refcount_bits=128" 64M
 # Must be a power of two
-IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
+_make_test_img -o "refcount_bits=42" 64M
 
 # 1 is the minimum
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # 64 is the maximum
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 # 16 is the default
@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits and compat=0.10 ==='
 echo
 
 # Should work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=16" 64M
 print_refcount_bits
 
 # Should not work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=1" 64M
+_make_test_img -o "compat=0.10,refcount_bits=64" 64M
 
 
 echo
 echo '=== Snapshot limit on refcount_bits=1 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Snapshot limit on refcount_bits=2 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
+_make_test_img -o "refcount_bits=2" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Compressed clusters with refcount_bits=1 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # Both should fit into a single host cluster; instead of failing to increase the
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== MSb set in 64 bit refcount ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Snapshot on maximum 64 bit refcount value ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Testing too many references for check ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # This cluster should be created at 0x50000
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Multiple walks necessary during amend ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
+_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
 
 # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
 # single L2 table, the reftable and a single refblock. This creates 58 data
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -XXX,XX +XXX,XX @@ echo
 # least 256 MB. We can achieve that by using preallocation=metadata for an image
 # which has a guest disk size of 256 MB.
 
-IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
-    _make_test_img 256M
+_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
 
 # We know for sure that the L1 and refcount tables do not overlap with any other
 # structure because the metadata overlap checks would have caught that case.
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -XXX,XX +XXX,XX @@ echo
 # Preallocation speeds up the write operation, but preallocating everything will
 # destroy the purpose of the write; so preallocate one KB less than what would
 # cause a reftable growth...
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
 # ...and make the image the desired size afterwards.
 $QEMU_IMG resize "$TEST_IMG" 65M
 
@@ -XXX,XX +XXX,XX @@ echo
 echo '--- Test 2 ---'
 echo
 
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
 # This results in an L1 table growth which in turn results in some clusters at
 # the start of the image becoming free
 $QEMU_IMG resize "$TEST_IMG" 65M
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Allocating a new refcount block must not leave holes in the image ==='
 echo
 
-IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
+_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
 
 # This results in an image with 256 used clusters: the qcow2 header,
 # the refcount table, one refcount block, the L1 table, four L2 tables
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
         for growth_mode in off metadata falloc full; do
             echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
 
-            IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
+            _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
             $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
 
             host_size_0=$(get_image_size_on_host)
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-clean-interval=-1" \
     "$TEST_IMG" | _filter_qemu_io
 
-IMGOPTS="cluster_size=256k" _make_test_img 32P
+_make_test_img -o "cluster_size=256k" 32P
 $QEMU_IO \
     -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
     "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
 echo
 
-IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
-    _make_test_img 512
+_make_test_img -o "cluster_size=512" 512
 
 # Allocate L2 table
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -XXX,XX +XXX,XX @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
 for mode in off full falloc; do
     echo
     echo "== creating image with preallocation $mode =="
-    IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
+    _make_test_img -o preallocation=$mode $size | _filter_imgfmt
     stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
 done
 
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 echo "== Huge file =="
 echo
 
-IMGOPTS='cluster_size=2M' _make_test_img 2T
+_make_test_img -o 'cluster_size=2M' 2T
 
 $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
 $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ echo === Preparing and starting VM ===
 echo
 
 TEST_IMG="${TEST_IMG}.base" _make_test_img $size
-IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
-    TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
 _make_test_img -b "${TEST_IMG}.mid"
 TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
 
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# To use a different refcount width but 16 bits we need compat=1.1
+_unsupported_imgopts 'compat=0.10'
 
 echo "== Creating huge file =="
 
@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
 # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
 _require_large_file 513T
 
-IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
+_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
 
 echo "== Populating refcounts =="
 # We want an image with 256M refcounts * 2M clusters = 512T referenced.
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
 
 for mode in off metadata falloc full; do
 
@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
     echo "=== preallocation=$mode ==="
     echo
 
-    IMGOPTS="preallocation=$mode" _make_test_img 64M
+    _make_test_img -o "preallocation=$mode" 64M
 
     printf "File size: "
     du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
     echo "=== External data file: preallocation=$mode ==="
     echo
 
-    IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
+    _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
 
     echo -n "qcow2 file size: "
     du -b $TEST_IMG | cut -f1
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
 
 echo
 echo "=== Create and open image with external data file ==="
 echo
 
 echo "With data file name in the image:"
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 _check_test_img
 
 $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Standalone image with external data file (efficient) ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 
 echo -n "qcow2 file size before I/O: "
 du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Standalone image with external data file (valid raw) ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
 
 echo -n "qcow2 file size before I/O: "
 du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== bdrv_co_block_status test for file and offset=0 ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 
 $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -XXX,XX +XXX,XX @@ disk_usage()
 }
 
 size=2100M
-IMGOPTS="cluster_size=1M,preallocation=metadata"
 
-_make_test_img $size
+_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
 $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
          -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
 
diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/265
+++ b/tests/qemu-iotests/265
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 echo '--- Writing to the image ---'
 
 # Reduce cluster size so we get more and quicker I/O
-IMGOPTS='cluster_size=4096' _make_test_img 1M
+_make_test_img -o 'cluster_size=4096' 1M
 (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
      echo "aio_write -P 42 $((kb + 1))k 2k"; \
  done) \
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-13-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/071 | 4 ++--
 tests/qemu-iotests/174 | 2 +-
 tests/qemu-iotests/178 | 4 ++--
 tests/qemu-iotests/197 | 4 ++--
 tests/qemu-iotests/215 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Testing blkverify through filename ==="
 echo
 
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
     _filter_imgfmt
 _make_test_img $IMG_SIZE
 $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Testing blkverify through file blockref ==="
 echo
 
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
     _filter_imgfmt
 _make_test_img $IMG_SIZE
 $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/174
+++ b/tests/qemu-iotests/174
@@ -XXX,XX +XXX,XX @@ _unsupported_fmt raw
 
 
 size=256K
-IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
 
 echo
 echo "== reading wrong format should fail =="
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
 
 make_test_img_with_fmt() {
     # Shadow global variables within this function
-    local IMGFMT="$1" IMGOPTS=""
-    _make_test_img "$2"
+    local IMGFMT="$1"
+    _make_test_img --no-opts "$2"
 }
 
 qemu_io_with_fmt() {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
 fi
 _make_test_img 4G
 $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
-    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
 $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
 
 # Ensure that a read of two clusters, but where one is already allocated,
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
 fi
 _make_test_img 4G
 $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
-    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
 $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
 
 # Ensure that a read of two clusters, but where one is already allocated,
-- 
2.24.1

Overwriting IMGOPTS means ignoring all user-supplied options, which is
not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
variable.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-14-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/267 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ size=128M
 
 run_test()
 {
-    _make_test_img $size
+    if [ -n "$BACKING_FILE" ]; then
+        _make_test_img -b "$BACKING_FILE" $size
+    else
+        _make_test_img $size
+    fi
     printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
 }
 
@@ -XXX,XX +XXX,XX @@ echo
 
 TEST_IMG="$TEST_IMG.base" _make_test_img $size
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
          -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== -blockdev with NBD server on the backing file ==="
 echo
 
-IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
+_make_test_img -b "$TEST_IMG.base" $size
 cat <<EOF |
 nbd_server_start unix:$SOCK_DIR/nbd
 nbd_server_add -w backing-fmt
-- 
2.24.1

Use _make_test_img whenever possible.  This way, we will not ignore
user-specified image options.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-15-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/094 | 2 +-
 tests/qemu-iotests/111 | 3 +--
 tests/qemu-iotests/123 | 2 +-
 tests/qemu-iotests/153 | 2 +-
 tests/qemu-iotests/200 | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ _supported_proto nbd
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 _make_test_img 64M
-$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
+TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
 
 _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
              -nodefaults
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -XXX,XX +XXX,XX @@ _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
-$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
-    | _filter_testdir | _filter_imgfmt
+_make_test_img -b "$TEST_IMG.inexistent"
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 SRC_IMG="$TEST_DIR/source.$IMGFMT"
 
 _make_test_img 1M
-$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
+TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
 
 $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
 
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
 
     echo
     echo "== Creating test image =="
-    $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
+    _make_test_img -b "${TEST_IMG}.base"
 
     echo
     echo "== Launching QEMU, opts: '$opts1' =="
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 BACKING_IMG="${TEST_DIR}/backing.img"
 TEST_IMG="${TEST_DIR}/test.img"
 
-${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
-${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
+TEST_IMG="$BACKING_IMG" _make_test_img 512M
+_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
 
 ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
 
-- 
2.24.1

Just rm will not delete external data files.  Use _rm_test_img every
time we delete a test image.

(In the process, clean up the indentation of every _cleanup() this patch
touches.)

((Also, use quotes consistently.  I am happy to see unquoted instances
like "rm -rf $TEST_DIR/..." go.))

diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.orig"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.orig"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.orig"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.orig"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
-    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
 
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
     rmdir "$TEST_DIR/subdir" 2> /dev/null
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}.copy"
+    _rm_test_img "${TEST_IMG}.copy"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG".[123].base
+    for img in "$TEST_IMG".[123].base; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     echo "Cleanup"
     _cleanup_test_img
-    rm "${TEST_IMG_FILE2}"
+    _rm_test_img "${TEST_IMG_FILE2}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.old"
-    rm -f "$TEST_IMG.new"
+    _rm_test_img "$TEST_IMG.old"
+    _rm_test_img "$TEST_IMG.new"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	rm -f "$TEST_IMG.orig"
-	_cleanup_test_img
+    _rm_test_img "$TEST_IMG.orig"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     nbd_server_stop
     _cleanup_test_img
-    rm -f "$converted_image"
+    _rm_test_img "$converted_image"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.qcow2"
+    IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
+    _rm_test_img "$TEST_IMG.data"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-	rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
+    _cleanup_test_img
+    for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -XXX,XX +XXX,XX @@ echo "=== Creating an image with a backing file and deleting that file ==="
 echo
 TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
 _make_test_img -b "$TEST_IMG.base" $IMG_SIZE
-rm -f "$TEST_IMG.base"
+_rm_test_img "$TEST_IMG.base"
 # Just open the image and close it right again (this should print an error message)
 $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
 
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     echo "Cleanup"
     _cleanup_test_img
-    rm "${TEST_IMG2}"
+    _rm_test_img "${TEST_IMG2}"
     rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -rf $TEST_DIR/1.raw
-    rm -rf $TEST_DIR/2.raw
-    rm -rf $TEST_DIR/3.raw
+    _rm_test_img "$TEST_DIR/1.raw"
+    _rm_test_img "$TEST_DIR/2.raw"
+    _rm_test_img "$TEST_DIR/3.raw"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -XXX,XX +XXX,XX @@ _cleanup()
     _cleanup_qemu
     for i in $(seq 1 ${SNAPSHOTS})
     do
-        rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
-        rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
+    done
+    for img in "${TEST_IMG}".{1,2,base}
+    do
+        _rm_test_img "$img"
     done
-    rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
 
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/088
+++ b/tests/qemu-iotests/088
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/092
+++ b/tests/qemu-iotests/092
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_DIR/source.$IMGFMT"
+    _rm_test_img "$TEST_DIR/source.$IMGFMT"
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm  -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
-	_cleanup_test_img
+    _rm_test_img "${TEST_IMG}.base"
+    _rm_test_img "${TEST_IMG}.snp1"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.compare"
+    rm -f "$TEST_DIR/blkdebug.conf"
+
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -XXX,XX +XXX,XX @@ echo
 test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
 
 
-rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
-
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f $TEST_IMG.src
-	_cleanup_test_img
+    _rm_test_img "$TEST_IMG.src"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-        rm -f "$TEST_IMG.copy"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.copy"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f "$TEST_IMG".[123]
-	_cleanup_test_img
+    for img in "$TEST_IMG".[123]; do
+        _rm_test_img "$img"
+    done
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$SRC_IMG"
+    _rm_test_img "$SRC_IMG"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
+    for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -XXX,XX +XXX,XX @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
+    for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
+        _rm_test_img "$img"
+    done
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "${TEST_IMG}.base"
-    rm -f "${TEST_IMG}.overlay"
-    rm -f "${TEST_IMG}.convert"
-    rm -f "${TEST_IMG}.a"
-    rm -f "${TEST_IMG}.b"
-    rm -f "${TEST_IMG}.c"
-    rm -f "${TEST_IMG}.lnk"
+    for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
+    for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
     '"status": "null"'
 
 # Remove the source images
-rm -f "$TEST_IMG{,.backing,.overlay}"
+for img in "$TEST_IMG{,.backing,.overlay}"; do
+    _rm_test_img "$img"
+done
 
 echo
 
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out"
+    _rm_test_img "$TEST_IMG.out"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/160
+++ b/tests/qemu-iotests/160
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
+    _rm_test_img "$TEST_IMG.out"
+    _rm_test_img "$TEST_IMG.out.dd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.int"
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.int"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out"
+    _rm_test_img  "$TEST_IMG.out"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.2"
-    rm -f "$TEST_IMG.3"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.2"
+    _rm_test_img "$TEST_IMG.3"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm  -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
+    _rm_test_img "${TEST_DIR}/image.base"
+    _rm_test_img "${TEST_DIR}/image.snp1"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.converted"
+    _rm_test_img "$TEST_IMG.converted"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.overlay"
+    _rm_test_img "$TEST_IMG.overlay"
     rm -f "$SOCK_DIR/nbd.socket"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -XXX,XX +XXX,XX @@ MIG_SOCKET="${SOCK_DIR}/migrate"
 _cleanup()
 {
     rm -f "${MIG_SOCKET}"
-    rm -f "${TEST_IMG}.dest"
+    _rm_test_img "${TEST_IMG}.dest"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 
 _cleanup()
 {
-    rm -f "${TEST_IMG}.mid"
-    rm -f "${TEST_IMG}.copy"
+    _rm_test_img "${TEST_IMG}.mid"
+    _rm_test_img "${TEST_IMG}.copy"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.2"
-    rm -f "$TEST_IMG.3"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.2"
+    _rm_test_img "$TEST_IMG.3"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.converted"
+    _rm_test_img "$TEST_IMG.converted"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 
 _cleanup()
 {
-    rm -f "${TEST_IMG}.mid"
-    rm -f "${TEST_IMG}.ovl2"
-    rm -f "${TEST_IMG}.ovl3"
+    _rm_test_img "${TEST_IMG}.mid"
+    _rm_test_img "${TEST_IMG}.ovl2"
+    _rm_test_img "${TEST_IMG}.ovl3"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.mid"
+    _rm_test_img "$TEST_IMG.mid"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ esac
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_WRAP"
+    _rm_test_img "$TEST_WRAP"
     rm -f "$BLKDBG_CONF"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}" "${BACKING_IMG}"
+    _rm_test_img "${TEST_IMG}"
+    _rm_test_img "${BACKING_IMG}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ esac
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_WRAP"
+    _rm_test_img "$TEST_WRAP"
     rm -f "$BLKDBG_CONF"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/225
+++ b/tests/qemu-iotests/225
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.not_base"
+    _rm_test_img "$TEST_IMG.not_base"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_IMG" "$DEST_IMG"
+    _rm_test_img "$TEST_IMG"
+    _rm_test_img "$DEST_IMG"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.[01234]
+    for img in "$TEST_IMG".[01234]; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
+    _rm_test_img "$TEST_IMG.data"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
-    rm -f $TEST_IMG.src
+    _rm_test_img "$TEST_IMG.data"
+    _rm_test_img "$TEST_IMG.src"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.[01234]
+    for img in "$TEST_IMG".[01234]; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.int"
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.int"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/252
+++ b/tests/qemu-iotests/252
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base_new"
+    _rm_test_img "$TEST_IMG.base_new"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.24.1

This will not work with external data files, so try to get tests working
without it as far as possible.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-17-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/063     | 12 ++++--------
 tests/qemu-iotests/063.out |  3 ++-
 tests/qemu-iotests/085     |  9 +++------
 tests/qemu-iotests/085.out |  8 ++++----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ _unsupported_imgopts "subformat=monolithicFlat" \
 _make_test_img 4M
 
 echo "== Testing conversion with -n fails with no target file =="
-# check .orig file does not exist
-rm -f "$TEST_IMG.orig"
 if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
     exit 1
 fi
 
 echo "== Testing conversion with -n succeeds with a target file =="
-rm -f "$TEST_IMG.orig"
-cp "$TEST_IMG" "$TEST_IMG.orig"
+_rm_test_img "$TEST_IMG.orig"
+TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
 if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
     exit 1
 fi
@@ -XXX,XX +XXX,XX @@ fi
 _check_test_img
 
 echo "== Testing conversion to a smaller file fails =="
-rm -f "$TEST_IMG.orig"
-mv "$TEST_IMG" "$TEST_IMG.orig"
-_make_test_img 2M
-if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
+TEST_IMG="$TEST_IMG.target" _make_test_img 2M
+if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
     exit 1
 fi
 
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/063.out
+++ b/tests/qemu-iotests/063.out
@@ -XXX,XX +XXX,XX @@ QA output created by 063
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
 == Testing conversion with -n fails with no target file ==
 == Testing conversion with -n succeeds with a target file ==
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
 == Testing conversion to raw is the same after conversion with -n ==
 == Testing conversion back to original format ==
 No errors were found on the image.
 == Testing conversion to a smaller file fails ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
 == Regression testing for copy offloading bug ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
 Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -XXX,XX +XXX,XX @@ add_snapshot_image()
 {
     base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
     snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
-    _make_test_img -u -b "${base_image}" "$size"
-    mv "${TEST_IMG}" "${snapshot_file}"
+    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
     do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
 }
 
@@ -XXX,XX +XXX,XX @@ blockdev_snapshot()
 
 size=128M
 
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.1"
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.2"
+TEST_IMG="$TEST_IMG.1" _make_test_img $size
+TEST_IMG="$TEST_IMG.2" _make_test_img $size
 
 echo
 echo === Running QEMU ===
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/085.out
+++ b/tests/qemu-iotests/085.out
@@ -XXX,XX +XXX,XX @@
 QA output created by 085
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
 
 === Running QEMU ===
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
 
 === Create a couple of snapshots using blockdev-snapshot ===
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
 { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } }
 {"return": {}}
 { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }
 {"return": {}}
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
 { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } }
 {"return": {}}
 { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }
-- 
2.24.1

The image end offset as reported by qemu-img check is different when
using an external data file; we do not care about its value here, so we
can just filter it.  Incidentally, common.rc already has _check_test_img
for us which does exactly that.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-18-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/091     | 2 +-
 tests/qemu-iotests/091.out | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -XXX,XX +XXX,XX @@ echo "Check image pattern"
 ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
 
 echo "Running 'qemu-img check -r all \$TEST_IMG'"
-"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
+_check_test_img -r all
 
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/091.out
+++ b/tests/qemu-iotests/091.out
@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Running 'qemu-img check -r all $TEST_IMG'
 No errors were found on the image.
-80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
-Image end offset: 5570560
 *** done
-- 
2.24.1

The only difference is that the json:{} filename of the image looks
different.  We actually do not care about that filename in this test, we
are only interested in (1) that there is a json:{} filename, and (2)
whether the backing filename can be constructed.

So just filter out the json:{} data, thus making this test pass both
with and without data_file.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-19-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/110     | 7 +++++--
 tests/qemu-iotests/110.out | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -XXX,XX +XXX,XX @@ echo
 # Across blkdebug without a config file, you cannot reconstruct filenames, so
 # qemu is incapable of knowing the directory of the top image from the filename
 # alone. However, using bdrv_dirname(), it should still work.
+# (Filter out the json:{} filename so this test works with external data files)
 TEST_IMG="json:{
     'driver': '$IMGFMT',
     'file': {
@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
             }
         ]
     }
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+    | _filter_json_filename
 
 echo
 echo '=== Backing name is always relative to the backed image ==='
@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
             }
         ]
     }
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+    | _filter_json_filename
 
 
 # success, all done
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/110.out
+++ b/tests/qemu-iotests/110.out
@@ -XXX,XX +XXX,XX @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
 
 === Non-reconstructable filename ===
 
-image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
 
 === Nodes without a common directory ===
 
-image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (cannot determine actual path)
-- 
2.24.1

When using an external data file, there are no refcounts for data
clusters.  We thus have to adjust the corruption test in this patch to
not be based around a data cluster allocation, but the L2 table
allocation (L2 tables are still refcounted with external data files).

Furthermore, we should not print qcow2.py's list of incompatible
features because it differs depending on whether there is an external
data file or not.

With those two changes, the test will work both with and without
external data files (once that options works with the iotests at all).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-20-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/137     | 15 +++++++++++----
 tests/qemu-iotests/137.out |  6 ++----
 2 files changed, 13 insertions(+), 8 deletions(-)

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 \
     "$TEST_IMG" 2>&1 | _filter_qemu_io
 
 # The dirty bit must not be set
-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+# (Filter the external data file bit)
+if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
+    | grep -q '\<0\>'
+then
+    echo 'ERROR: Dirty bit set'
+else
+    echo 'OK: Dirty bit not set'
+fi
 
 # Similarly we can test whether corruption detection has been enabled:
-# Create L1/L2, overwrite first entry in refcount block, allocate something.
+# Create L1, overwrite refcounts, force allocation of L2 by writing
+# data.
 # Disabling the checks should fail, so the corruption must be detected.
 _make_test_img 64M
-$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
-poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
+poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
 $QEMU_IO \
     -c "reopen -o overlap-check=none,lazy-refcounts=42" \
     -c "write 64k 64k" \
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 @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     []
+OK: Dirty bit not set
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-wrote 65536/65536 bytes at offset 0
-64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
-qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
 write failed: Input/output error
 *** done
-- 
2.24.1

We do not care about the json:{} filenames here, so we can just filter
them out and thus make the test work both with and without external data
files.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-21-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/198     | 6 ++++--
 tests/qemu-iotests/198.out | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -XXX,XX +XXX,XX @@ echo
 echo "== checking image base =="
 $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
-          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+    | _filter_json_filename
 
 echo
 echo "== checking image layer =="
 $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
-          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+    | _filter_json_filename
 
 
 # success, all done
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/198.out
+++ b/tests/qemu-iotests/198.out
@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == checking image base ==
-image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 16 MiB (16777216 bytes)
 Format specific information:
@@ -XXX,XX +XXX,XX @@ Format specific information:
         master key iters: 1024
 
 == checking image layer ==
-image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 16 MiB (16777216 bytes)
 backing file: TEST_DIR/t.IMGFMT.base
-- 
2.24.1

diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # refcount_bits must be at least 4 so we can create ten internal snapshots
-# (1 bit supports none, 2 bits support two, 4 bits support 14)
-_unsupported_imgopts 'refcount_bits=$1\|2$[^0-9]'
+# (1 bit supports none, 2 bits support two, 4 bits support 14);
+# snapshot are generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=$1\|2$[^0-9]' data_file
 
 echo
 echo "creating image"
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Compression and snapshots do not work with external data files
+_unsupported_imgopts data_file
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # actually any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 echo
 echo "creating image"
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -XXX,XX +XXX,XX @@ _supported_cache_modes writethrough none
 # 32 and 64 bits do not work either, however, due to different leaked cluster
 # count on error.
 # Thus, the only remaining option is refcount_bits=16.
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+#
+# As for data_file, none of the refcount tests can work for it.
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' \
+    data_file
 
 echo "Errors while writing 128 kB"
 echo
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 offset_size=24
 offset_l1_size=36
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-# We want to test compat=0.10, which does not support refcount widths
-# other than 16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# We want to test compat=0.10, which does not support external data
+# files or refcount widths other than 16
+_unsupported_imgopts data_file 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 CLUSTER_SIZE=65536
 
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-# Only qcow2v3 and later supports feature bits
-_unsupported_imgopts 'compat=0.10'
+# Only qcow2v3 and later supports feature bits;
+# qcow2.py does not support external data files
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo
 echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _default_cache_mode writethrough
 _supported_cache_modes writethrough
+# Some of these test cases expect no external data file so that all
+# clusters are part of the qcow2 image and refcounted
+_unsupported_imgopts data_file
 
 size=128M
 
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+# data_file does not support compressed clusters
+_unsupported_imgopts data_file
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _compare()
 _supported_fmt raw qcow2 qed luks
 _supported_proto file
 _supported_os Linux
+# Using 'cp' is incompatible with external data files
+_unsupported_imgopts data_file
 
 # Remove once all tests are fixed to use TEST_IMG_FILE
 # correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 # A compat=0.10 image is created in this test which does not support anything
-# other than refcount_bits=16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# other than refcount_bits=16;
+# it also will not support an external data file
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 _require_drivers nbd
 
 do_run_qemu()
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
 _require_command QEMU_NBD
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
 
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# These tests only work for compat=1.1 images with refcount_bits=16
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# These tests only work for compat=1.1 images without an external
+# data file with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' data_file \
+    'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 # The repair process will create a large file - so check for availability first
 _require_large_file 64G
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
 # Conversion between different compat versions can only really work
-# with refcount_bits=16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# with refcount_bits=16;
+# we have explicit tests for data_file here, but the whole test does
+# not work with it
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # We need zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=64M
 
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # We need zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+# (TODO: Consider splitting the snapshot part into a separate test
+#        file, so this one runs with refcount_bits=1 and data_file)
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 # Intentionally create an unaligned image
 IMG_SIZE=$((64 * 1024 * 1024 + 512))
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _supported_fmt qcow2
 _supported_proto file
-# Because anything other than 16 would change the output of query-block
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# Because anything other than 16 would change the output of query-block,
+# and external data files would change the output of
+# query-named-block-nodes
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _require_drivers blkdebug blkverify
+# blkdebug can only inject errors on bs->file, not on the data_file,
+# so thie test does not work with external data files
+_unsupported_imgopts data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
+# External data files do not support compressed clusters
+# (TODO: Consider writing a version for external data files that does
+#        not test compressed clusters)
+_unsupported_imgopts data_file
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _compare()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# blkdebug can only inject errors on bs->file
+_unsupported_imgopts data_file
 
 # Setup test basic parameters
 TEST_IMG2=$TEST_IMG.2
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# - Internal snapshots are (currently) impossible with refcount_bits=1
+# - Internal snapshots are (currently) impossible with refcount_bits=1,
+#   and generally impossible with external data files
 # - This is generally a test for compat=1.1 images
-_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'
 
 header_size=104
 
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
+# External data files do not support compressed clusters
+_unsupported_imgopts data_file
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-# The code path we want to test here only works for compat=1.1 images
-_unsupported_imgopts 'compat=0.10'
+# The code path we want to test here only works for compat=1.1 images;
+# blkdebug can only inject errors on bs->file, so external data files
+# do not work with this test
+_unsupported_imgopts 'compat=0.10' data_file
 
 for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
 
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
 _supported_proto file
 _supported_os Linux
 _require_drivers blkdebug blkverify
+# data_file would change the json:{} filenames
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
-    "subformat=twoGbMaxExtentSparse"
+    "subformat=twoGbMaxExtentSparse" data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# This test directly modifies a refblock so it relies on refcount_bits being 16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# This test directly modifies a refblock so it relies on refcount_bits being 16;
+# and the low-level modification it performs are not tuned for external data
+# files
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 echo
 echo '=== Repairing an image without any refcount table ==='
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 # This test will set refcount_bits on its own which would conflict with the
-# manual setting; compat will be overridden as well
-_unsupported_imgopts refcount_bits 'compat=0.10'
+# manual setting; compat will be overridden as well;
+# and external data files do not work well with our refcount testing
+_unsupported_imgopts refcount_bits 'compat=0.10' data_file
 
 print_refcount_bits()
 {
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
+# qcow2.py does not work too well with external data files
+_unsupported_imgopts data_file
 
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Refcount structures are used much differently with external data
+# files
+_unsupported_imgopts data_file
 
 echo
 echo '=== New refcount structures may not conflict with existing structures ==='
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# With an external data file, data clusters are not refcounted
+# (and so qemu-img check does not check their refcount)
+_unsupported_imgopts data_file
 
 echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 qed
 _supported_proto generic
 _unsupported_proto vxhs
+# Copying files around with cp does not work with external data files
+_unsupported_imgopts data_file
 
 # Create source disk
 TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# Persistent dirty bitmaps require compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# Persistent dirty bitmaps require compat=1.1;
+# Internal snapshots forbid using an external data file
+# (they work with refcount_bits=1 here, though, because there actually
+# is no data when creating the snapshot)
+_unsupported_imgopts 'compat=0.10' data_file
 
 run_qemu()
 {
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+# An external data file would change the query-named-block-nodes output
+_unsupported_imgopts data_file
 
 size=64M
 
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
 
-# Internal snapshots are (currently) impossible with refcount_bits=1
-# This was taken from test 080
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 
 # Repairing the corrupted image requires qemu-img check to store a
 # refcount up to 3, which requires at least two refcount bits.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# External data files do not support compressed clusters.
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 
 echo
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 
 # This test needs clusters with at least a refcount of 2 so that
 # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# (As are external data files.)
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 echo
 echo '=== Simulating an I/O error during snapshot deletion ==='
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# To use a different refcount width but 16 bits we need compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# To use a different refcount width but 16 bits we need compat=1.1,
+# and external data files do not support compressed clusters.
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo "== Creating huge file =="
 
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because there
+# is an explicit case for external data files here, we cannot allow
+# the user to specify whether to use one
+_unsupported_imgopts 'compat=0.10' data_file
 
 for mode in off metadata falloc full; do
 
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because we use
+# our own external data file, we cannot let the user specify one
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo
 echo "=== Create and open image with external data file ==="
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# This test does not make much sense with external data files
+_unsupported_imgopts data_file
 
 # This test checks that qcow2_process_discards does not truncate a discard
 # request > 2G.
diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/261
+++ b/tests/qemu-iotests/261
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 # (1) We create a v2 image that supports nothing but refcount_bits=16
 # (2) We do some refcount management on our own which expects
 #     refcount_bits=16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# As for data files, they do not support snapshots at all.
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 # Parameters:
 #   $1: image filename
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _require_drivers copy-on-read
 
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files would add nodes to the block graph, so it would
+# not match the reference output
+_unsupported_imgopts data_file
 
 do_run_qemu()
 {
-- 
2.24.1

The problem with allowing the data_file option is that you want to use a
different data file per image used in the test.  Therefore, we need to
allow patterns like -o data_file='$TEST_IMG.data_file'.

Then, we need to filter it out from qemu-img map, qemu-img create, and
remove the data file in _rm_test_img.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-23-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.filter | 23 +++++++++++++++++++++--
 tests/qemu-iotests/common.rc     | 22 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()
 # replace driver-specific options in the "Formatting..." line
 _filter_img_create()
 {
-    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
+    data_file_filter=()
+    if data_file=$(_get_data_file "$TEST_IMG"); then
+        data_file_filter=(-e "s# data_file=$data_file##")
+    fi
+
+    $SED "${data_file_filter[@]}" \
+        -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
         -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
         -e "s#$TEST_DIR#TEST_DIR#g" \
         -e "s#$SOCK_DIR#SOCK_DIR#g" \
@@ -XXX,XX +XXX,XX @@ _filter_img_info()
 # human and json output
 _filter_qemu_img_map()
 {
+    # Assuming the data_file value in $IMGOPTS contains a '$TEST_IMG',
+    # create a filter that replaces the data file name by $TEST_IMG.
+    # Example:
+    #   In $IMGOPTS: 'data_file=$TEST_IMG.data_file'
+    #   Then data_file_pattern == '$.*$.data_file'
+    #   And  data_file_filter  == -e 's#$.*$.data_file#\1#
+    data_file_filter=()
+    if data_file_pattern=$(_get_data_file '\$.*\$'); then
+        data_file_filter=(-e "s#$data_file_pattern#\\1#")
+    fi
+
     $SED -e 's/$[0-9a-fx]* *[0-9a-fx]* *$[0-9a-fx]* */\1/g' \
         -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
-        -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
+        -e 's/Mapped to *//' \
+        "${data_file_filter[@]}" \
+        | _filter_testdir | _filter_imgfmt
 }
 
 _filter_nbd()
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _stop_nbd_server()
     fi
 }
 
+# Gets the data_file value from IMGOPTS and replaces the '$TEST_IMG'
+# pattern by '$1'
+# Caution: The replacement is done with sed, so $1 must be escaped
+#          properly.  (The delimiter is '#'.)
+_get_data_file()
+{
+    if ! echo "$IMGOPTS" | grep -q 'data_file='; then
+        return 1
+    fi
+
+    echo "$IMGOPTS" | sed -e 's/.*data_file=$[^,]*$.*/\1/' \
+                    | sed -e "s#\\\$TEST_IMG#$1#"
+}
+
 _make_test_img()
 {
     # extra qemu-img options can be added by tests
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     fi
 
     if [ -n "$IMGOPTS" ]; then
-        optstr=$(_optstr_add "$optstr" "$IMGOPTS")
+        imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
+        optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
     fi
     if [ -n "$IMGKEYSECRET" ]; then
         object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
@@ -XXX,XX +XXX,XX @@ _rm_test_img()
         # Remove all the extents for vmdk
         "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
             | xargs -I {} rm -f "{}"
+    elif [ "$IMGFMT" = "qcow2" ]; then
+        # Remove external data file
+        if data_file=$(_get_data_file "$img"); then
+            rm -f "$data_file"
+        fi
     fi
     rm -f "$img"
 }
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Allow writing all the data compressed through the filter driver.
The written data will be aligned by the cluster size.
Based on the QEMU current implementation, that data can be written to
unallocated clusters only. May be used for a backup job.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 1575288906-551879-2-git-send-email-andrey.shinkevich@virtuozzo.com
[mreitz: Replace NULL bdrv_get_format_name() by "(no format)"]
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/Makefile.objs     |   1 +
 block/filter-compress.c | 168 ++++++++++++++++++++++++++++++++++++++++
 qapi/block-core.json    |  10 ++-
 3 files changed, 175 insertions(+), 4 deletions(-)
 create mode 100644 block/filter-compress.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-y += crypto.o
 
 block-obj-y += aio_task.o
 block-obj-y += backup-top.o
+block-obj-y += filter-compress.o
 
 common-obj-y += stream.o
 
diff --git a/block/filter-compress.c b/block/filter-compress.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/filter-compress.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Compress filter block driver
+ *
+ * Copyright (c) 2019 Virtuozzo International GmbH
+ *
+ * Author:
+ *   Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+ *   (based on block/copy-on-read.c by Max Reitz)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 or
+ * (at your option) any later version of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "block/block_int.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+
+
+static int compress_open(BlockDriverState *bs, QDict *options, int flags,
+                         Error **errp)
+{
+    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false,
+                               errp);
+    if (!bs->file) {
+        return -EINVAL;
+    }
+
+    if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) {
+        error_setg(errp,
+                   "Compression is not supported for underlying format: %s",
+                   bdrv_get_format_name(bs->file->bs) ?: "(no format)");
+
+        return -ENOTSUP;
+    }
+
+    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
+        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);
+
+    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
+        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
+            bs->file->bs->supported_zero_flags);
+
+    return 0;
+}
+
+
+static int64_t compress_getlength(BlockDriverState *bs)
+{
+    return bdrv_getlength(bs->file->bs);
+}
+
+
+static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs,
+                                                uint64_t offset, uint64_t bytes,
+                                                QEMUIOVector *qiov,
+                                                size_t qiov_offset,
+                                                int flags)
+{
+    return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset,
+                               flags);
+}
+
+
+static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs,
+                                                 uint64_t offset,
+                                                 uint64_t bytes,
+                                                 QEMUIOVector *qiov,
+                                                 size_t qiov_offset, int flags)
+{
+    return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset,
+                                flags | BDRV_REQ_WRITE_COMPRESSED);
+}
+
+
+static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs,
+                                                  int64_t offset, int bytes,
+                                                  BdrvRequestFlags flags)
+{
+    return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
+}
+
+
+static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs,
+                                             int64_t offset, int bytes)
+{
+    return bdrv_co_pdiscard(bs->file, offset, bytes);
+}
+
+
+static void compress_refresh_limits(BlockDriverState *bs, Error **errp)
+{
+    BlockDriverInfo bdi;
+    int ret;
+
+    if (!bs->file) {
+        return;
+    }
+
+    ret = bdrv_get_info(bs->file->bs, &bdi);
+    if (ret < 0 || bdi.cluster_size == 0) {
+        return;
+    }
+
+    bs->bl.request_alignment = bdi.cluster_size;
+}
+
+
+static void compress_eject(BlockDriverState *bs, bool eject_flag)
+{
+    bdrv_eject(bs->file->bs, eject_flag);
+}
+
+
+static void compress_lock_medium(BlockDriverState *bs, bool locked)
+{
+    bdrv_lock_medium(bs->file->bs, locked);
+}
+
+
+static bool compress_recurse_is_first_non_filter(BlockDriverState *bs,
+                                                 BlockDriverState *candidate)
+{
+    return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate);
+}
+
+
+static BlockDriver bdrv_compress = {
+    .format_name                        = "compress",
+
+    .bdrv_open                          = compress_open,
+    .bdrv_child_perm                    = bdrv_filter_default_perms,
+
+    .bdrv_getlength                     = compress_getlength,
+
+    .bdrv_co_preadv_part                = compress_co_preadv_part,
+    .bdrv_co_pwritev_part               = compress_co_pwritev_part,
+    .bdrv_co_pwrite_zeroes              = compress_co_pwrite_zeroes,
+    .bdrv_co_pdiscard                   = compress_co_pdiscard,
+    .bdrv_refresh_limits                = compress_refresh_limits,
+
+    .bdrv_eject                         = compress_eject,
+    .bdrv_lock_medium                   = compress_lock_medium,
+
+    .bdrv_co_block_status               = bdrv_co_block_status_from_file,
+
+    .bdrv_recurse_is_first_non_filter   = compress_recurse_is_first_non_filter,
+
+    .has_variable_length                = true,
+    .is_filter                          = true,
+};
+
+static void bdrv_compress_init(void)
+{
+    bdrv_register(&bdrv_compress);
+}
+
+block_init(bdrv_compress_init);
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 @@
 # @copy-on-read: Since 3.0
 # @blklogwrites: Since 3.0
 # @blkreplay: Since 4.2
+# @compress: Since 5.0
 #
 # Since: 2.9
 ##
 { 'enum': 'BlockdevDriver',
   'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
-            'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster',
-            'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
-            'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
-            'qcow2', 'qed', 'quorum', 'raw', 'rbd',
+            'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps',
+            'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi',
+            'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
+            'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
             'sheepdog',
             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
@@ -XXX,XX +XXX,XX @@
       'blkreplay':  'BlockdevOptionsBlkreplay',
       'bochs':      'BlockdevOptionsGenericFormat',
       'cloop':      'BlockdevOptionsGenericFormat',
+      'compress':   'BlockdevOptionsGenericFormat',
       'copy-on-read':'BlockdevOptionsGenericFormat',
       'dmg':        'BlockdevOptionsGenericFormat',
       'file':       'BlockdevOptionsFile',
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

QEMU currently supports writing compressed data of the size equal to
one cluster. This patch allows writing QCOW2 compressed data that
exceed one cluster. Now, we split buffered data into separate clusters
and write them compressed using the block/aio_task API.

Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1575288906-551879-3-git-send-email-andrey.shinkevich@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 102 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 27 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 @@ fail:
     return ret;
 }
 
-/* XXX: put compressed sectors first, then all the cluster aligned
-   tables to avoid losing bytes in alignment */
 static coroutine_fn int
-qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
+qcow2_co_pwritev_compressed_task(BlockDriverState *bs,
                                  uint64_t offset, uint64_t bytes,
                                  QEMUIOVector *qiov, size_t qiov_offset)
 {
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
     uint8_t *buf, *out_buf;
     uint64_t cluster_offset;
 
-    if (has_data_file(bs)) {
-        return -ENOTSUP;
-    }
-
-    if (bytes == 0) {
-        /* align end of file to a sector boundary to ease reading with
-           sector based I/Os */
-        int64_t len = bdrv_getlength(bs->file->bs);
-        if (len < 0) {
-            return len;
-        }
-        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
-    }
-
-    if (offset_into_cluster(s, offset)) {
-        return -EINVAL;
-    }
+    assert(bytes == s->cluster_size || (bytes < s->cluster_size &&
+           (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS)));
 
     buf = qemu_blockalign(bs, s->cluster_size);
-    if (bytes != s->cluster_size) {
-        if (bytes > s->cluster_size ||
-            offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
-        {
-            qemu_vfree(buf);
-            return -EINVAL;
-        }
+    if (bytes < s->cluster_size) {
         /* Zero-pad last write if image size is not cluster aligned */
         memset(buf + bytes, 0, s->cluster_size - bytes);
     }
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
+static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task)
+{
+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
+
+    assert(!t->cluster_type && !t->l2meta);
+
+    return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov,
+                                            t->qiov_offset);
+}
+
+/*
+ * XXX: put compressed sectors first, then all the cluster aligned
+ * tables to avoid losing bytes in alignment
+ */
+static coroutine_fn int
+qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
+                                 uint64_t offset, uint64_t bytes,
+                                 QEMUIOVector *qiov, size_t qiov_offset)
+{
+    BDRVQcow2State *s = bs->opaque;
+    AioTaskPool *aio = NULL;
+    int ret = 0;
+
+    if (has_data_file(bs)) {
+        return -ENOTSUP;
+    }
+
+    if (bytes == 0) {
+        /*
+         * align end of file to a sector boundary to ease reading with
+         * sector based I/Os
+         */
+        int64_t len = bdrv_getlength(bs->file->bs);
+        if (len < 0) {
+            return len;
+        }
+        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
+    }
+
+    if (offset_into_cluster(s, offset)) {
+        return -EINVAL;
+    }
+
+    while (bytes && aio_task_pool_status(aio) == 0) {
+        uint64_t chunk_size = MIN(bytes, s->cluster_size);
+
+        if (!aio && chunk_size != bytes) {
+            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
+        }
+
+        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry,
+                             0, 0, offset, chunk_size, qiov, qiov_offset, NULL);
+        if (ret < 0) {
+            break;
+        }
+        qiov_offset += chunk_size;
+        offset += chunk_size;
+        bytes -= chunk_size;
+    }
+
+    if (aio) {
+        aio_task_pool_wait_all(aio);
+        if (ret == 0) {
+            ret = aio_task_pool_status(aio);
+        }
+        g_free(aio);
+    }
+
+    return ret;
+}
+
 static int coroutine_fn
 qcow2_co_preadv_compressed(BlockDriverState *bs,
                            uint64_t file_cluster_offset,
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Add the case to the iotest #214 that checks possibility of writing
compressed data of more than one cluster size. The test case involves
the compress filter driver showing a sample usage of that.

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1575288906-551879-4-git-send-email-andrey.shinkevich@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/214     | 43 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/214.out | 14 +++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _check_test_img -r all
 $QEMU_IO -c "read  -P 0x11  0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
 $QEMU_IO -c "read  -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
 
+echo
+echo "=== Write compressed data of multiple clusters ==="
+echo
+cluster_size=0x10000
+_make_test_img 2M -o cluster_size=$cluster_size
+
+echo "Write uncompressed data:"
+let data_size="8 * $cluster_size"
+$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \
+         2>&1 | _filter_qemu_io | _filter_testdir
+sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" |
+        sed -n '/"actual-size":/ s/[^0-9]//gp')
+
+_make_test_img 2M -o cluster_size=$cluster_size
+echo "Write compressed data:"
+let data_size="3 * $cluster_size + $cluster_size / 2"
+# Set compress on. That will align the written data
+# by the cluster size and will write them compressed.
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
+$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \
+         "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \
+         2>&1 | _filter_qemu_io | _filter_testdir
+
+let offset="4 * $cluster_size + $cluster_size / 4"
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
+$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\
+    'driver': 'compress',
+    'file': {'driver': '$IMGFMT',
+             'file': {'driver': 'file',
+                      'filename': '$TEST_IMG'}}}" | \
+                          _filter_qemu_io | _filter_testdir
+
+sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" |
+        sed -n '/"actual-size":/ s/[^0-9]//gp')
+
+if [ $sizeA -le $sizeB ]
+then
+    echo "Compression ERROR"
+fi
+
+$QEMU_IMG check --output=json "$TEST_IMG" |
+          sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p'
+
 # success, all done
 echo '*** done'
 rm -f $seq.full
diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/214.out
+++ b/tests/qemu-iotests/214.out
@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 4194304/4194304 bytes at offset 4194304
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+=== Write compressed data of multiple clusters ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Write uncompressed data:
+wrote 524288/524288 bytes at offset 0
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Write compressed data:
+wrote 229376/229376 bytes at offset 0
+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 229376/229376 bytes at offset 278528
+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+"compressed-clusters": 8
 *** done
-- 
2.24.1

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Commit 6f6e1698a6 desugarized "-machine accel=" to a list
of "-accel" options. Since now "-machine accel" and "-accel"
became incompatible, update the iotests to the new format.

Error reported here:
https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400

Reported-by: GitLab CI
Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200106130951.29873-1-philmd@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/235   | 2 +-
 tests/qemu-iotests/check | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
                 str(size))
 
 vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'accel=kvm:tcg')
+vm.add_args('-accel', 'kvm', '-accel', 'tcg')
 if iotests.qemu_default_machine == 's390-ccw-virtio':
         vm.add_args('-no-shutdown')
 vm.add_args('-drive', 'id=src,file=' + disk)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
 case "$QEMU_PROG" in
     *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
         ;;
     *qemu-system-tricore)
-        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
         ;;
     *)
-        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
         ;;
 esac
 
-- 
2.24.1

When dropping backup-top, we need to drain the node before freeing the
BlockCopyState.  Otherwise, requests may still be in flight and then the
assertion in shres_destroy() will fail.

(This becomes visible in intermittent failure of 056.)

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191219182638.104621-1-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup-top.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/backup-top.c b/block/backup-top.c
index XXXXXXX..XXXXXXX 100644
--- a/block/backup-top.c
+++ b/block/backup-top.c
@@ -XXX,XX +XXX,XX @@ void bdrv_backup_top_drop(BlockDriverState *bs)
     BDRVBackupTopState *s = bs->opaque;
     AioContext *aio_context = bdrv_get_aio_context(bs);
 
-    block_copy_state_free(s->bcs);
-
     aio_context_acquire(aio_context);
 
     bdrv_drained_begin(bs);
 
+    block_copy_state_free(s->bcs);
+
     s->active = false;
     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
     bdrv_replace_node(bs, backing_bs(bs), &error_abort);
-- 
2.24.1

The following changes since commit 03a3a62fbd0aa5227e978eef3c67d3978aec9e5f:

Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2023-09-07 10:29:06 -0400)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 631c872614aca91eaf947c1748f0f27f99635d92:

tests/qtest: Introduce tests for UFS (2023-09-07 14:01:29 -0400)

----------------------------------------------------------------
Pull request

- Jeuk Kim's emulated UFS device
- Fabiano Rosas' IOThread GSource "name" debugging aid

----------------------------------------------------------------

Fabiano Rosas (1):
  iothread: Set the GSource "name" field

Jeuk Kim (4):
  hw/ufs: Initial commit for emulated Universal-Flash-Storage
  hw/ufs: Support for Query Transfer Requests
  hw/ufs: Support for UFS logical unit
  tests/qtest: Introduce tests for UFS

MAINTAINERS              |    7 +
 docs/specs/pci-ids.rst   |    2 +
 meson.build              |    1 +
 hw/ufs/trace.h           |    1 +
 hw/ufs/ufs.h             |  131 ++++
 include/block/ufs.h      | 1090 +++++++++++++++++++++++++++
 include/hw/pci/pci.h     |    1 +
 include/hw/pci/pci_ids.h |    1 +
 include/scsi/constants.h |    1 +
 hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++
 hw/ufs/ufs.c             | 1502 ++++++++++++++++++++++++++++++++++++++
 iothread.c               |   14 +-
 tests/qtest/ufs-test.c   |  587 +++++++++++++++
 hw/Kconfig               |    1 +
 hw/meson.build           |    1 +
 hw/ufs/Kconfig           |    4 +
 hw/ufs/meson.build       |    1 +
 hw/ufs/trace-events      |   58 ++
 tests/qtest/meson.build  |    1 +
 19 files changed, 4843 insertions(+), 6 deletions(-)
 create mode 100644 hw/ufs/trace.h
 create mode 100644 hw/ufs/ufs.h
 create mode 100644 include/block/ufs.h
 create mode 100644 hw/ufs/lu.c
 create mode 100644 hw/ufs/ufs.c
 create mode 100644 tests/qtest/ufs-test.c
 create mode 100644 hw/ufs/Kconfig
 create mode 100644 hw/ufs/meson.build
 create mode 100644 hw/ufs/trace-events

-- 
2.41.0

From: Fabiano Rosas <farosas@suse.de>

Having a name in the source helps with debugging core dumps when one
might not have access to TLS data to cross-reference AioContexts with
their addresses.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230905180359.14083-1-farosas@suse.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
     qemu_sem_destroy(&iothread->init_done_sem);
 }
 
-static void iothread_init_gcontext(IOThread *iothread)
+static void iothread_init_gcontext(IOThread *iothread, const char *thread_name)
 {
     GSource *source;
+    g_autofree char *name = g_strdup_printf("%s aio-context", thread_name);
 
     iothread->worker_context = g_main_context_new();
     source = aio_get_g_source(iothread_get_aio_context(iothread));
+    g_source_set_name(source, name);
     g_source_attach(source, iothread->worker_context);
     g_source_unref(source);
     iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
 {
     Error *local_error = NULL;
     IOThread *iothread = IOTHREAD(base);
-    char *thread_name;
+    g_autofree char *thread_name = NULL;
 
     iothread->stopping = false;
     iothread->running = true;
@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
         return;
     }
 
+    thread_name = g_strdup_printf("IO %s",
+                        object_get_canonical_path_component(OBJECT(base)));
+
     /*
      * Init one GMainContext for the iothread unconditionally, even if
      * it's not used
      */
-    iothread_init_gcontext(iothread);
+    iothread_init_gcontext(iothread, thread_name);
 
     iothread_set_aio_context_params(base, &local_error);
     if (local_error) {
@@ -XXX,XX +XXX,XX @@ static void iothread_init(EventLoopBase *base, Error **errp)
     /* This assumes we are called from a thread with useful CPU affinity for us
      * to inherit.
      */
-    thread_name = g_strdup_printf("IO %s",
-                        object_get_canonical_path_component(OBJECT(base)));
     qemu_thread_create(&iothread->thread, thread_name, iothread_run,
                        iothread, QEMU_THREAD_JOINABLE);
-    g_free(thread_name);
 
     /* Wait for initialization to complete */
     while (iothread->thread_id == -1) {
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@samsung.com>

Universal Flash Storage (UFS) is a high-performance mass storage device
with a serial interface. It is primarily used as a high-performance
data storage device for embedded applications.

This commit contains code for UFS device to be recognized
as a UFS PCI device.
Patches to handle UFS logical unit and Transfer Request will follow.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 10232660d462ee5cd10cf673f1a9a1205fc8276c.1693980783.git.jeuk20.kim@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS              |    6 +
 docs/specs/pci-ids.rst   |    2 +
 meson.build              |    1 +
 hw/ufs/trace.h           |    1 +
 hw/ufs/ufs.h             |   42 ++
 include/block/ufs.h      | 1090 ++++++++++++++++++++++++++++++++++++++
 include/hw/pci/pci.h     |    1 +
 include/hw/pci/pci_ids.h |    1 +
 hw/ufs/ufs.c             |  278 ++++++++++
 hw/Kconfig               |    1 +
 hw/meson.build           |    1 +
 hw/ufs/Kconfig           |    4 +
 hw/ufs/meson.build       |    1 +
 hw/ufs/trace-events      |   32 ++
 14 files changed, 1461 insertions(+)
 create mode 100644 hw/ufs/trace.h
 create mode 100644 hw/ufs/ufs.h
 create mode 100644 include/block/ufs.h
 create mode 100644 hw/ufs/ufs.c
 create mode 100644 hw/ufs/Kconfig
 create mode 100644 hw/ufs/meson.build
 create mode 100644 hw/ufs/trace-events

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: tests/qtest/nvme-test.c
 F: docs/system/devices/nvme.rst
 T: git git://git.infradead.org/qemu-nvme.git nvme-next
 
+ufs
+M: Jeuk Kim <jeuk20.kim@samsung.com>
+S: Supported
+F: hw/ufs/*
+F: include/block/ufs.h
+
 megasas
 M: Hannes Reinecke <hare@suse.com>
 L: qemu-block@nongnu.org
diff --git a/docs/specs/pci-ids.rst b/docs/specs/pci-ids.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/specs/pci-ids.rst
+++ b/docs/specs/pci-ids.rst
@@ -XXX,XX +XXX,XX @@ PCI devices (other than virtio):
   PCI PVPanic device (``-device pvpanic-pci``)
 1b36:0012
   PCI ACPI ERST device (``-device acpi-erst``)
+1b36:0013
+  PCI UFS device (``-device ufs``)
 
 All these devices are documented in :doc:`index`.
 
diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system
     'hw/ssi',
     'hw/timer',
     'hw/tpm',
+    'hw/ufs',
     'hw/usb',
     'hw/vfio',
     'hw/virtio',
diff --git a/hw/ufs/trace.h b/hw/ufs/trace.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ufs.h"
diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU UFS
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef HW_UFS_UFS_H
+#define HW_UFS_UFS_H
+
+#include "hw/pci/pci_device.h"
+#include "hw/scsi/scsi.h"
+#include "block/ufs.h"
+
+#define UFS_MAX_LUS 32
+#define UFS_BLOCK_SIZE 4096
+
+typedef struct UfsParams {
+    char *serial;
+    uint8_t nutrs; /* Number of UTP Transfer Request Slots */
+    uint8_t nutmrs; /* Number of UTP Task Management Request Slots */
+} UfsParams;
+
+typedef struct UfsHc {
+    PCIDevice parent_obj;
+    MemoryRegion iomem;
+    UfsReg reg;
+    UfsParams params;
+    uint32_t reg_size;
+
+    qemu_irq irq;
+    QEMUBH *doorbell_bh;
+    QEMUBH *complete_bh;
+} UfsHc;
+
+#define TYPE_UFS "ufs"
+#define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
+
+#endif /* HW_UFS_UFS_H */
diff --git a/include/block/ufs.h b/include/block/ufs.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/block/ufs.h
@@ -XXX,XX +XXX,XX @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef BLOCK_UFS_H
+#define BLOCK_UFS_H
+
+#include "hw/registerfields.h"
+
+typedef struct QEMU_PACKED UfsReg {
+    uint32_t cap;
+    uint32_t rsvd0;
+    uint32_t ver;
+    uint32_t rsvd1;
+    uint32_t hcpid;
+    uint32_t hcmid;
+    uint32_t ahit;
+    uint32_t rsvd2;
+    uint32_t is;
+    uint32_t ie;
+    uint32_t rsvd3[2];
+    uint32_t hcs;
+    uint32_t hce;
+    uint32_t uecpa;
+    uint32_t uecdl;
+    uint32_t uecn;
+    uint32_t uect;
+    uint32_t uecdme;
+    uint32_t utriacr;
+    uint32_t utrlba;
+    uint32_t utrlbau;
+    uint32_t utrldbr;
+    uint32_t utrlclr;
+    uint32_t utrlrsr;
+    uint32_t utrlcnr;
+    uint32_t rsvd4[2];
+    uint32_t utmrlba;
+    uint32_t utmrlbau;
+    uint32_t utmrldbr;
+    uint32_t utmrlclr;
+    uint32_t utmrlrsr;
+    uint32_t rsvd5[3];
+    uint32_t uiccmd;
+    uint32_t ucmdarg1;
+    uint32_t ucmdarg2;
+    uint32_t ucmdarg3;
+    uint32_t rsvd6[4];
+    uint32_t rsvd7[4];
+    uint32_t rsvd8[16];
+    uint32_t ccap;
+} UfsReg;
+
+REG32(CAP, offsetof(UfsReg, cap))
+    FIELD(CAP, NUTRS, 0, 5)
+    FIELD(CAP, RTT, 8, 8)
+    FIELD(CAP, NUTMRS, 16, 3)
+    FIELD(CAP, AUTOH8, 23, 1)
+    FIELD(CAP, 64AS, 24, 1)
+    FIELD(CAP, OODDS, 25, 1)
+    FIELD(CAP, UICDMETMS, 26, 1)
+    FIELD(CAP, CS, 28, 1)
+REG32(VER, offsetof(UfsReg, ver))
+REG32(HCPID, offsetof(UfsReg, hcpid))
+REG32(HCMID, offsetof(UfsReg, hcmid))
+REG32(AHIT, offsetof(UfsReg, ahit))
+REG32(IS, offsetof(UfsReg, is))
+    FIELD(IS, UTRCS, 0, 1)
+    FIELD(IS, UDEPRI, 1, 1)
+    FIELD(IS, UE, 2, 1)
+    FIELD(IS, UTMS, 3, 1)
+    FIELD(IS, UPMS, 4, 1)
+    FIELD(IS, UHXS, 5, 1)
+    FIELD(IS, UHES, 6, 1)
+    FIELD(IS, ULLS, 7, 1)
+    FIELD(IS, ULSS, 8, 1)
+    FIELD(IS, UTMRCS, 9, 1)
+    FIELD(IS, UCCS, 10, 1)
+    FIELD(IS, DFES, 11, 1)
+    FIELD(IS, UTPES, 12, 1)
+    FIELD(IS, HCFES, 16, 1)
+    FIELD(IS, SBFES, 17, 1)
+    FIELD(IS, CEFES, 18, 1)
+REG32(IE, offsetof(UfsReg, ie))
+    FIELD(IE, UTRCE, 0, 1)
+    FIELD(IE, UDEPRIE, 1, 1)
+    FIELD(IE, UEE, 2, 1)
+    FIELD(IE, UTMSE, 3, 1)
+    FIELD(IE, UPMSE, 4, 1)
+    FIELD(IE, UHXSE, 5, 1)
+    FIELD(IE, UHESE, 6, 1)
+    FIELD(IE, ULLSE, 7, 1)
+    FIELD(IE, ULSSE, 8, 1)
+    FIELD(IE, UTMRCE, 9, 1)
+    FIELD(IE, UCCE, 10, 1)
+    FIELD(IE, DFEE, 11, 1)
+    FIELD(IE, UTPEE, 12, 1)
+    FIELD(IE, HCFEE, 16, 1)
+    FIELD(IE, SBFEE, 17, 1)
+    FIELD(IE, CEFEE, 18, 1)
+REG32(HCS, offsetof(UfsReg, hcs))
+    FIELD(HCS, DP, 0, 1)
+    FIELD(HCS, UTRLRDY, 1, 1)
+    FIELD(HCS, UTMRLRDY, 2, 1)
+    FIELD(HCS, UCRDY, 3, 1)
+    FIELD(HCS, UPMCRS, 8, 3)
+REG32(HCE, offsetof(UfsReg, hce))
+    FIELD(HCE, HCE, 0, 1)
+    FIELD(HCE, CGE, 1, 1)
+REG32(UECPA, offsetof(UfsReg, uecpa))
+REG32(UECDL, offsetof(UfsReg, uecdl))
+REG32(UECN, offsetof(UfsReg, uecn))
+REG32(UECT, offsetof(UfsReg, uect))
+REG32(UECDME, offsetof(UfsReg, uecdme))
+REG32(UTRIACR, offsetof(UfsReg, utriacr))
+REG32(UTRLBA, offsetof(UfsReg, utrlba))
+    FIELD(UTRLBA, UTRLBA, 9, 22)
+REG32(UTRLBAU, offsetof(UfsReg, utrlbau))
+REG32(UTRLDBR, offsetof(UfsReg, utrldbr))
+REG32(UTRLCLR, offsetof(UfsReg, utrlclr))
+REG32(UTRLRSR, offsetof(UfsReg, utrlrsr))
+REG32(UTRLCNR, offsetof(UfsReg, utrlcnr))
+REG32(UTMRLBA, offsetof(UfsReg, utmrlba))
+    FIELD(UTMRLBA, UTMRLBA, 9, 22)
+REG32(UTMRLBAU, offsetof(UfsReg, utmrlbau))
+REG32(UTMRLDBR, offsetof(UfsReg, utmrldbr))
+REG32(UTMRLCLR, offsetof(UfsReg, utmrlclr))
+REG32(UTMRLRSR, offsetof(UfsReg, utmrlrsr))
+REG32(UICCMD, offsetof(UfsReg, uiccmd))
+REG32(UCMDARG1, offsetof(UfsReg, ucmdarg1))
+REG32(UCMDARG2, offsetof(UfsReg, ucmdarg2))
+REG32(UCMDARG3, offsetof(UfsReg, ucmdarg3))
+REG32(CCAP, offsetof(UfsReg, ccap))
+
+#define UFS_INTR_MASK                                    \
+    ((1 << R_IS_CEFES_SHIFT) | (1 << R_IS_SBFES_SHIFT) | \
+     (1 << R_IS_HCFES_SHIFT) | (1 << R_IS_UTPES_SHIFT) | \
+     (1 << R_IS_DFES_SHIFT) | (1 << R_IS_UCCS_SHIFT) |   \
+     (1 << R_IS_UTMRCS_SHIFT) | (1 << R_IS_ULSS_SHIFT) | \
+     (1 << R_IS_ULLS_SHIFT) | (1 << R_IS_UHES_SHIFT) |   \
+     (1 << R_IS_UHXS_SHIFT) | (1 << R_IS_UPMS_SHIFT) |   \
+     (1 << R_IS_UTMS_SHIFT) | (1 << R_IS_UE_SHIFT) |     \
+     (1 << R_IS_UDEPRI_SHIFT) | (1 << R_IS_UTRCS_SHIFT))
+
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT 24
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK 0xff
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE(dword0)                       \
+    ((be32_to_cpu(dword0) >> UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT) & \
+     UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK)
+
+#define UFS_UPIU_HEADER_QUERY_FUNC_SHIFT 16
+#define UFS_UPIU_HEADER_QUERY_FUNC_MASK 0xff
+#define UFS_UPIU_HEADER_QUERY_FUNC(dword1)                       \
+    ((be32_to_cpu(dword1) >> UFS_UPIU_HEADER_QUERY_FUNC_SHIFT) & \
+     UFS_UPIU_HEADER_QUERY_FUNC_MASK)
+
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT 0
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK 0xffff
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH(dword2)                       \
+    ((be32_to_cpu(dword2) >> UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT) & \
+     UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK)
+
+typedef struct QEMU_PACKED DeviceDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t device;
+    uint8_t device_class;
+    uint8_t device_sub_class;
+    uint8_t protocol;
+    uint8_t number_lu;
+    uint8_t number_wlu;
+    uint8_t boot_enable;
+    uint8_t descr_access_en;
+    uint8_t init_power_mode;
+    uint8_t high_priority_lun;
+    uint8_t secure_removal_type;
+    uint8_t security_lu;
+    uint8_t background_ops_term_lat;
+    uint8_t init_active_icc_level;
+    uint16_t spec_version;
+    uint16_t manufacture_date;
+    uint8_t manufacturer_name;
+    uint8_t product_name;
+    uint8_t serial_number;
+    uint8_t oem_id;
+    uint16_t manufacturer_id;
+    uint8_t ud_0_base_offset;
+    uint8_t ud_config_p_length;
+    uint8_t device_rtt_cap;
+    uint16_t periodic_rtc_update;
+    uint8_t ufs_features_support;
+    uint8_t ffu_timeout;
+    uint8_t queue_depth;
+    uint16_t device_version;
+    uint8_t num_secure_wp_area;
+    uint32_t psa_max_data_size;
+    uint8_t psa_state_timeout;
+    uint8_t product_revision_level;
+    uint8_t reserved[36];
+    uint32_t extended_ufs_features_support;
+    uint8_t write_booster_buffer_preserve_user_space_en;
+    uint8_t write_booster_buffer_type;
+    uint32_t num_shared_write_booster_buffer_alloc_units;
+} DeviceDescriptor;
+
+typedef struct QEMU_PACKED GeometryDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t media_technology;
+    uint8_t reserved;
+    uint64_t total_raw_device_capacity;
+    uint8_t max_number_lu;
+    uint32_t segment_size;
+    uint8_t allocation_unit_size;
+    uint8_t min_addr_block_size;
+    uint8_t optimal_read_block_size;
+    uint8_t optimal_write_block_size;
+    uint8_t max_in_buffer_size;
+    uint8_t max_out_buffer_size;
+    uint8_t rpmb_read_write_size;
+    uint8_t dynamic_capacity_resource_policy;
+    uint8_t data_ordering;
+    uint8_t max_context_id_number;
+    uint8_t sys_data_tag_unit_size;
+    uint8_t sys_data_tag_res_size;
+    uint8_t supported_sec_r_types;
+    uint16_t supported_memory_types;
+    uint32_t system_code_max_n_alloc_u;
+    uint16_t system_code_cap_adj_fac;
+    uint32_t non_persist_max_n_alloc_u;
+    uint16_t non_persist_cap_adj_fac;
+    uint32_t enhanced_1_max_n_alloc_u;
+    uint16_t enhanced_1_cap_adj_fac;
+    uint32_t enhanced_2_max_n_alloc_u;
+    uint16_t enhanced_2_cap_adj_fac;
+    uint32_t enhanced_3_max_n_alloc_u;
+    uint16_t enhanced_3_cap_adj_fac;
+    uint32_t enhanced_4_max_n_alloc_u;
+    uint16_t enhanced_4_cap_adj_fac;
+    uint32_t optimal_logical_block_size;
+    uint8_t reserved2[7];
+    uint32_t write_booster_buffer_max_n_alloc_units;
+    uint8_t device_max_write_booster_l_us;
+    uint8_t write_booster_buffer_cap_adj_fac;
+    uint8_t supported_write_booster_buffer_user_space_reduction_types;
+    uint8_t supported_write_booster_buffer_types;
+} GeometryDescriptor;
+
+#define UFS_GEOMETRY_CAPACITY_SHIFT 9
+
+typedef struct QEMU_PACKED UnitDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t unit_index;
+    uint8_t lu_enable;
+    uint8_t boot_lun_id;
+    uint8_t lu_write_protect;
+    uint8_t lu_queue_depth;
+    uint8_t psa_sensitive;
+    uint8_t memory_type;
+    uint8_t data_reliability;
+    uint8_t logical_block_size;
+    uint64_t logical_block_count;
+    uint32_t erase_block_size;
+    uint8_t provisioning_type;
+    uint64_t phy_mem_resource_count;
+    uint16_t context_capabilities;
+    uint8_t large_unit_granularity_m1;
+    uint8_t reserved[6];
+    uint32_t lu_num_write_booster_buffer_alloc_units;
+} UnitDescriptor;
+
+typedef struct QEMU_PACKED RpmbUnitDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t unit_index;
+    uint8_t lu_enable;
+    uint8_t boot_lun_id;
+    uint8_t lu_write_protect;
+    uint8_t lu_queue_depth;
+    uint8_t psa_sensitive;
+    uint8_t memory_type;
+    uint8_t reserved;
+    uint8_t logical_block_size;
+    uint64_t logical_block_count;
+    uint32_t erase_block_size;
+    uint8_t provisioning_type;
+    uint64_t phy_mem_resource_count;
+    uint8_t reserved2[3];
+} RpmbUnitDescriptor;
+
+typedef struct QEMU_PACKED PowerParametersDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t active_icc_levels_vcc[16];
+    uint16_t active_icc_levels_vccq[16];
+    uint16_t active_icc_levels_vccq_2[16];
+} PowerParametersDescriptor;
+
+typedef struct QEMU_PACKED InterconnectDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t bcd_unipro_version;
+    uint16_t bcd_mphy_version;
+} InterconnectDescriptor;
+
+typedef struct QEMU_PACKED StringDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t UC[126];
+} StringDescriptor;
+
+typedef struct QEMU_PACKED DeviceHealthDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t pre_eol_info;
+    uint8_t device_life_time_est_a;
+    uint8_t device_life_time_est_b;
+    uint8_t vendor_prop_info[32];
+    uint32_t refresh_total_count;
+    uint32_t refresh_progress;
+} DeviceHealthDescriptor;
+
+typedef struct QEMU_PACKED Flags {
+    uint8_t reserved;
+    uint8_t device_init;
+    uint8_t permanent_wp_en;
+    uint8_t power_on_wp_en;
+    uint8_t background_ops_en;
+    uint8_t device_life_span_mode_en;
+    uint8_t purge_enable;
+    uint8_t refresh_enable;
+    uint8_t phy_resource_removal;
+    uint8_t busy_rtc;
+    uint8_t reserved2;
+    uint8_t permanently_disable_fw_update;
+    uint8_t reserved3[2];
+    uint8_t wb_en;
+    uint8_t wb_buffer_flush_en;
+    uint8_t wb_buffer_flush_during_hibernate;
+    uint8_t reserved4[2];
+} Flags;
+
+typedef struct Attributes {
+    uint8_t boot_lun_en;
+    uint8_t reserved;
+    uint8_t current_power_mode;
+    uint8_t active_icc_level;
+    uint8_t out_of_order_data_en;
+    uint8_t background_op_status;
+    uint8_t purge_status;
+    uint8_t max_data_in_size;
+    uint8_t max_data_out_size;
+    uint32_t dyn_cap_needed;
+    uint8_t ref_clk_freq;
+    uint8_t config_descr_lock;
+    uint8_t max_num_of_rtt;
+    uint16_t exception_event_control;
+    uint16_t exception_event_status;
+    uint32_t seconds_passed;
+    uint16_t context_conf;
+    uint8_t device_ffu_status;
+    uint8_t psa_state;
+    uint32_t psa_data_size;
+    uint8_t ref_clk_gating_wait_time;
+    uint8_t device_case_rough_temperaure;
+    uint8_t device_too_high_temp_boundary;
+    uint8_t device_too_low_temp_boundary;
+    uint8_t throttling_status;
+    uint8_t wb_buffer_flush_status;
+    uint8_t available_wb_buffer_size;
+    uint8_t wb_buffer_life_time_est;
+    uint32_t current_wb_buffer_size;
+    uint8_t refresh_status;
+    uint8_t refresh_freq;
+    uint8_t refresh_unit;
+    uint8_t refresh_method;
+} Attributes;
+
+#define UFS_TRANSACTION_SPECIFIC_FIELD_SIZE 20
+#define UFS_MAX_QUERY_DATA_SIZE 256
+
+/* Command response result code */
+typedef enum CommandRespCode {
+    UFS_COMMAND_RESULT_SUCESS = 0x00,
+    UFS_COMMAND_RESULT_FAIL = 0x01,
+} CommandRespCode;
+
+enum {
+    UFS_UPIU_FLAG_UNDERFLOW = 0x20,
+    UFS_UPIU_FLAG_OVERFLOW = 0x40,
+};
+
+typedef struct QEMU_PACKED UtpUpiuHeader {
+    uint8_t trans_type;
+    uint8_t flags;
+    uint8_t lun;
+    uint8_t task_tag;
+    uint8_t iid_cmd_set_type;
+    uint8_t query_func;
+    uint8_t response;
+    uint8_t scsi_status;
+    uint8_t ehs_len;
+    uint8_t device_inf;
+    uint16_t data_segment_length;
+} UtpUpiuHeader;
+
+/*
+ * The code below is copied from the linux kernel
+ * ("include/uapi/scsi/scsi_bsg_ufs.h") and modified to fit the qemu style.
+ */
+
+typedef struct QEMU_PACKED UtpUpiuQuery {
+    uint8_t opcode;
+    uint8_t idn;
+    uint8_t index;
+    uint8_t selector;
+    uint16_t reserved_osf;
+    uint16_t length;
+    uint32_t value;
+    uint32_t reserved[2];
+    /* EHS length should be 0. We don't have to worry about EHS area. */
+    uint8_t data[UFS_MAX_QUERY_DATA_SIZE];
+} UtpUpiuQuery;
+
+#define UFS_CDB_SIZE 16
+
+/*
+ * struct UtpUpiuCmd - Command UPIU structure
+ * @data_transfer_len: Data Transfer Length DW-3
+ * @cdb: Command Descriptor Block CDB DW-4 to DW-7
+ */
+typedef struct QEMU_PACKED UtpUpiuCmd {
+    uint32_t exp_data_transfer_len;
+    uint8_t cdb[UFS_CDB_SIZE];
+} UtpUpiuCmd;
+
+/*
+ * struct UtpUpiuReq - general upiu request structure
+ * @header:UPIU header structure DW-0 to DW-2
+ * @sc: fields structure for scsi command DW-3 to DW-7
+ * @qr: fields structure for query request DW-3 to DW-7
+ * @uc: use utp_upiu_query to host the 4 dwords of uic command
+ */
+typedef struct QEMU_PACKED UtpUpiuReq {
+    UtpUpiuHeader header;
+    union {
+        UtpUpiuCmd sc;
+        UtpUpiuQuery qr;
+    };
+} UtpUpiuReq;
+
+/*
+ * The code below is copied from the linux kernel ("include/ufs/ufshci.h") and
+ * modified to fit the qemu style.
+ */
+
+enum {
+    UFS_PWR_OK = 0x0,
+    UFS_PWR_LOCAL = 0x01,
+    UFS_PWR_REMOTE = 0x02,
+    UFS_PWR_BUSY = 0x03,
+    UFS_PWR_ERROR_CAP = 0x04,
+    UFS_PWR_FATAL_ERROR = 0x05,
+};
+
+/* UIC Commands */
+enum uic_cmd_dme {
+    UFS_UIC_CMD_DME_GET = 0x01,
+    UFS_UIC_CMD_DME_SET = 0x02,
+    UFS_UIC_CMD_DME_PEER_GET = 0x03,
+    UFS_UIC_CMD_DME_PEER_SET = 0x04,
+    UFS_UIC_CMD_DME_POWERON = 0x10,
+    UFS_UIC_CMD_DME_POWEROFF = 0x11,
+    UFS_UIC_CMD_DME_ENABLE = 0x12,
+    UFS_UIC_CMD_DME_RESET = 0x14,
+    UFS_UIC_CMD_DME_END_PT_RST = 0x15,
+    UFS_UIC_CMD_DME_LINK_STARTUP = 0x16,
+    UFS_UIC_CMD_DME_HIBER_ENTER = 0x17,
+    UFS_UIC_CMD_DME_HIBER_EXIT = 0x18,
+    UFS_UIC_CMD_DME_TEST_MODE = 0x1A,
+};
+
+/* UIC Config result code / Generic error code */
+enum {
+    UFS_UIC_CMD_RESULT_SUCCESS = 0x00,
+    UFS_UIC_CMD_RESULT_INVALID_ATTR = 0x01,
+    UFS_UIC_CMD_RESULT_FAILURE = 0x01,
+    UFS_UIC_CMD_RESULT_INVALID_ATTR_VALUE = 0x02,
+    UFS_UIC_CMD_RESULT_READ_ONLY_ATTR = 0x03,
+    UFS_UIC_CMD_RESULT_WRITE_ONLY_ATTR = 0x04,
+    UFS_UIC_CMD_RESULT_BAD_INDEX = 0x05,
+    UFS_UIC_CMD_RESULT_LOCKED_ATTR = 0x06,
+    UFS_UIC_CMD_RESULT_BAD_TEST_FEATURE_INDEX = 0x07,
+    UFS_UIC_CMD_RESULT_PEER_COMM_FAILURE = 0x08,
+    UFS_UIC_CMD_RESULT_BUSY = 0x09,
+    UFS_UIC_CMD_RESULT_DME_FAILURE = 0x0A,
+};
+
+#define UFS_MASK_UIC_COMMAND_RESULT 0xFF
+
+/*
+ * Request Descriptor Definitions
+ */
+
+/* Transfer request command type */
+enum {
+    UFS_UTP_CMD_TYPE_SCSI = 0x0,
+    UFS_UTP_CMD_TYPE_UFS = 0x1,
+    UFS_UTP_CMD_TYPE_DEV_MANAGE = 0x2,
+};
+
+/* To accommodate UFS2.0 required Command type */
+enum {
+    UFS_UTP_CMD_TYPE_UFS_STORAGE = 0x1,
+};
+
+enum {
+    UFS_UTP_SCSI_COMMAND = 0x00000000,
+    UFS_UTP_NATIVE_UFS_COMMAND = 0x10000000,
+    UFS_UTP_DEVICE_MANAGEMENT_FUNCTION = 0x20000000,
+    UFS_UTP_REQ_DESC_INT_CMD = 0x01000000,
+    UFS_UTP_REQ_DESC_CRYPTO_ENABLE_CMD = 0x00800000,
+};
+
+/* UTP Transfer Request Data Direction (DD) */
+enum {
+    UFS_UTP_NO_DATA_TRANSFER = 0x00000000,
+    UFS_UTP_HOST_TO_DEVICE = 0x02000000,
+    UFS_UTP_DEVICE_TO_HOST = 0x04000000,
+};
+
+/* Overall command status values */
+enum UtpOcsCodes {
+    UFS_OCS_SUCCESS = 0x0,
+    UFS_OCS_INVALID_CMD_TABLE_ATTR = 0x1,
+    UFS_OCS_INVALID_PRDT_ATTR = 0x2,
+    UFS_OCS_MISMATCH_DATA_BUF_SIZE = 0x3,
+    UFS_OCS_MISMATCH_RESP_UPIU_SIZE = 0x4,
+    UFS_OCS_PEER_COMM_FAILURE = 0x5,
+    UFS_OCS_ABORTED = 0x6,
+    UFS_OCS_FATAL_ERROR = 0x7,
+    UFS_OCS_DEVICE_FATAL_ERROR = 0x8,
+    UFS_OCS_INVALID_CRYPTO_CONFIG = 0x9,
+    UFS_OCS_GENERAL_CRYPTO_ERROR = 0xa,
+    UFS_OCS_INVALID_COMMAND_STATUS = 0xf,
+};
+
+enum {
+    UFS_MASK_OCS = 0x0F,
+};
+
+/*
+ * struct UfshcdSgEntry - UFSHCI PRD Entry
+ * @addr: Physical address; DW-0 and DW-1.
+ * @reserved: Reserved for future use DW-2
+ * @size: size of physical segment DW-3
+ */
+typedef struct QEMU_PACKED UfshcdSgEntry {
+    uint64_t addr;
+    uint32_t reserved;
+    uint32_t size;
+    /*
+     * followed by variant-specific fields if
+     * CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE has been defined.
+     */
+} UfshcdSgEntry;
+
+/*
+ * struct RequestDescHeader - Descriptor Header common to both UTRD and UTMRD
+ * @dword0: Descriptor Header DW0
+ * @dword1: Descriptor Header DW1
+ * @dword2: Descriptor Header DW2
+ * @dword3: Descriptor Header DW3
+ */
+typedef struct QEMU_PACKED RequestDescHeader {
+    uint32_t dword_0;
+    uint32_t dword_1;
+    uint32_t dword_2;
+    uint32_t dword_3;
+} RequestDescHeader;
+
+/*
+ * struct UtpTransferReqDesc - UTP Transfer Request Descriptor (UTRD)
+ * @header: UTRD header DW-0 to DW-3
+ * @command_desc_base_addr_lo: UCD base address low DW-4
+ * @command_desc_base_addr_hi: UCD base address high DW-5
+ * @response_upiu_length: response UPIU length DW-6
+ * @response_upiu_offset: response UPIU offset DW-6
+ * @prd_table_length: Physical region descriptor length DW-7
+ * @prd_table_offset: Physical region descriptor offset DW-7
+ */
+typedef struct QEMU_PACKED UtpTransferReqDesc {
+    /* DW 0-3 */
+    RequestDescHeader header;
+
+    /* DW 4-5*/
+    uint32_t command_desc_base_addr_lo;
+    uint32_t command_desc_base_addr_hi;
+
+    /* DW 6 */
+    uint16_t response_upiu_length;
+    uint16_t response_upiu_offset;
+
+    /* DW 7 */
+    uint16_t prd_table_length;
+    uint16_t prd_table_offset;
+} UtpTransferReqDesc;
+
+/*
+ * UTMRD structure.
+ */
+typedef struct QEMU_PACKED UtpTaskReqDesc {
+    /* DW 0-3 */
+    RequestDescHeader header;
+
+    /* DW 4-11 - Task request UPIU structure */
+    struct {
+        UtpUpiuHeader req_header;
+        uint32_t input_param1;
+        uint32_t input_param2;
+        uint32_t input_param3;
+        uint32_t reserved1[2];
+    } upiu_req;
+
+    /* DW 12-19 - Task Management Response UPIU structure */
+    struct {
+        UtpUpiuHeader rsp_header;
+        uint32_t output_param1;
+        uint32_t output_param2;
+        uint32_t reserved2[3];
+    } upiu_rsp;
+} UtpTaskReqDesc;
+
+/*
+ * The code below is copied from the linux kernel ("include/ufs/ufs.h") and
+ * modified to fit the qemu style.
+ */
+
+#define UFS_GENERAL_UPIU_REQUEST_SIZE (sizeof(UtpUpiuReq))
+#define UFS_QUERY_DESC_MAX_SIZE 255
+#define UFS_QUERY_DESC_MIN_SIZE 2
+#define UFS_QUERY_DESC_HDR_SIZE 2
+#define UFS_QUERY_OSF_SIZE (GENERAL_UPIU_REQUEST_SIZE - (sizeof(UtpUpiuHeader)))
+#define UFS_SENSE_SIZE 18
+
+/*
+ * UFS device may have standard LUs and LUN id could be from 0x00 to
+ * 0x7F. Standard LUs use "Peripheral Device Addressing Format".
+ * UFS device may also have the Well Known LUs (also referred as W-LU)
+ * which again could be from 0x00 to 0x7F. For W-LUs, device only use
+ * the "Extended Addressing Format" which means the W-LUNs would be
+ * from 0xc100 (SCSI_W_LUN_BASE) onwards.
+ * This means max. LUN number reported from UFS device could be 0xC17F.
+ */
+#define UFS_UPIU_MAX_UNIT_NUM_ID 0x7F
+#define UFS_UPIU_WLUN_ID (1 << 7)
+
+/* WriteBooster buffer is available only for the logical unit from 0 to 7 */
+#define UFS_UPIU_MAX_WB_LUN_ID 8
+
+/*
+ * WriteBooster buffer lifetime has a limit setted by vendor.
+ * If it is over the limit, WriteBooster feature will be disabled.
+ */
+#define UFS_WB_EXCEED_LIFETIME 0x0B
+
+/*
+ * In UFS Spec, the Extra Header Segment (EHS) starts from byte 32 in UPIU
+ * request/response packet
+ */
+#define UFS_EHS_OFFSET_IN_RESPONSE 32
+
+/* Well known logical unit id in LUN field of UPIU */
+enum {
+    UFS_UPIU_REPORT_LUNS_WLUN = 0x81,
+    UFS_UPIU_UFS_DEVICE_WLUN = 0xD0,
+    UFS_UPIU_BOOT_WLUN = 0xB0,
+    UFS_UPIU_RPMB_WLUN = 0xC4,
+};
+
+/*
+ * UFS Protocol Information Unit related definitions
+ */
+
+/* Task management functions */
+enum {
+    UFS_ABORT_TASK = 0x01,
+    UFS_ABORT_TASK_SET = 0x02,
+    UFS_CLEAR_TASK_SET = 0x04,
+    UFS_LOGICAL_RESET = 0x08,
+    UFS_QUERY_TASK = 0x80,
+    UFS_QUERY_TASK_SET = 0x81,
+};
+
+/* UTP UPIU Transaction Codes Initiator to Target */
+enum {
+    UFS_UPIU_TRANSACTION_NOP_OUT = 0x00,
+    UFS_UPIU_TRANSACTION_COMMAND = 0x01,
+    UFS_UPIU_TRANSACTION_DATA_OUT = 0x02,
+    UFS_UPIU_TRANSACTION_TASK_REQ = 0x04,
+    UFS_UPIU_TRANSACTION_QUERY_REQ = 0x16,
+};
+
+/* UTP UPIU Transaction Codes Target to Initiator */
+enum {
+    UFS_UPIU_TRANSACTION_NOP_IN = 0x20,
+    UFS_UPIU_TRANSACTION_RESPONSE = 0x21,
+    UFS_UPIU_TRANSACTION_DATA_IN = 0x22,
+    UFS_UPIU_TRANSACTION_TASK_RSP = 0x24,
+    UFS_UPIU_TRANSACTION_READY_XFER = 0x31,
+    UFS_UPIU_TRANSACTION_QUERY_RSP = 0x36,
+    UFS_UPIU_TRANSACTION_REJECT_UPIU = 0x3F,
+};
+
+/* UPIU Read/Write flags */
+enum {
+    UFS_UPIU_CMD_FLAGS_NONE = 0x00,
+    UFS_UPIU_CMD_FLAGS_WRITE = 0x20,
+    UFS_UPIU_CMD_FLAGS_READ = 0x40,
+};
+
+/* UPIU Task Attributes */
+enum {
+    UFS_UPIU_TASK_ATTR_SIMPLE = 0x00,
+    UFS_UPIU_TASK_ATTR_ORDERED = 0x01,
+    UFS_UPIU_TASK_ATTR_HEADQ = 0x02,
+    UFS_UPIU_TASK_ATTR_ACA = 0x03,
+};
+
+/* UPIU Query request function */
+enum {
+    UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST = 0x01,
+    UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST = 0x81,
+};
+
+/* Flag idn for Query Requests*/
+enum flag_idn {
+    UFS_QUERY_FLAG_IDN_FDEVICEINIT = 0x01,
+    UFS_QUERY_FLAG_IDN_PERMANENT_WPE = 0x02,
+    UFS_QUERY_FLAG_IDN_PWR_ON_WPE = 0x03,
+    UFS_QUERY_FLAG_IDN_BKOPS_EN = 0x04,
+    UFS_QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE = 0x05,
+    UFS_QUERY_FLAG_IDN_PURGE_ENABLE = 0x06,
+    UFS_QUERY_FLAG_IDN_REFRESH_ENABLE = 0x07,
+    UFS_QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL = 0x08,
+    UFS_QUERY_FLAG_IDN_BUSY_RTC = 0x09,
+    UFS_QUERY_FLAG_IDN_RESERVED3 = 0x0A,
+    UFS_QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE = 0x0B,
+    UFS_QUERY_FLAG_IDN_WB_EN = 0x0E,
+    UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN = 0x0F,
+    UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 = 0x10,
+    UFS_QUERY_FLAG_IDN_HPB_RESET = 0x11,
+    UFS_QUERY_FLAG_IDN_HPB_EN = 0x12,
+    UFS_QUERY_FLAG_IDN_COUNT,
+};
+
+/* Attribute idn for Query requests */
+enum attr_idn {
+    UFS_QUERY_ATTR_IDN_BOOT_LU_EN = 0x00,
+    UFS_QUERY_ATTR_IDN_MAX_HPB_SINGLE_CMD = 0x01,
+    UFS_QUERY_ATTR_IDN_POWER_MODE = 0x02,
+    UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL = 0x03,
+    UFS_QUERY_ATTR_IDN_OOO_DATA_EN = 0x04,
+    UFS_QUERY_ATTR_IDN_BKOPS_STATUS = 0x05,
+    UFS_QUERY_ATTR_IDN_PURGE_STATUS = 0x06,
+    UFS_QUERY_ATTR_IDN_MAX_DATA_IN = 0x07,
+    UFS_QUERY_ATTR_IDN_MAX_DATA_OUT = 0x08,
+    UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED = 0x09,
+    UFS_QUERY_ATTR_IDN_REF_CLK_FREQ = 0x0A,
+    UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK = 0x0B,
+    UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT = 0x0C,
+    UFS_QUERY_ATTR_IDN_EE_CONTROL = 0x0D,
+    UFS_QUERY_ATTR_IDN_EE_STATUS = 0x0E,
+    UFS_QUERY_ATTR_IDN_SECONDS_PASSED = 0x0F,
+    UFS_QUERY_ATTR_IDN_CNTX_CONF = 0x10,
+    UFS_QUERY_ATTR_IDN_CORR_PRG_BLK_NUM = 0x11,
+    UFS_QUERY_ATTR_IDN_RESERVED2 = 0x12,
+    UFS_QUERY_ATTR_IDN_RESERVED3 = 0x13,
+    UFS_QUERY_ATTR_IDN_FFU_STATUS = 0x14,
+    UFS_QUERY_ATTR_IDN_PSA_STATE = 0x15,
+    UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16,
+    UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17,
+    UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP = 0x18,
+    UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND = 0x19,
+    UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND = 0x1A,
+    UFS_QUERY_ATTR_IDN_THROTTLING_STATUS = 0x1B,
+    UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS = 0x1C,
+    UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE = 0x1D,
+    UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST = 0x1E,
+    UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE = 0x1F,
+    UFS_QUERY_ATTR_IDN_REFRESH_STATUS = 0x2C,
+    UFS_QUERY_ATTR_IDN_REFRESH_FREQ = 0x2D,
+    UFS_QUERY_ATTR_IDN_REFRESH_UNIT = 0x2E,
+    UFS_QUERY_ATTR_IDN_COUNT,
+};
+
+/* Descriptor idn for Query requests */
+enum desc_idn {
+    UFS_QUERY_DESC_IDN_DEVICE = 0x0,
+    UFS_QUERY_DESC_IDN_CONFIGURATION = 0x1,
+    UFS_QUERY_DESC_IDN_UNIT = 0x2,
+    UFS_QUERY_DESC_IDN_RFU_0 = 0x3,
+    UFS_QUERY_DESC_IDN_INTERCONNECT = 0x4,
+    UFS_QUERY_DESC_IDN_STRING = 0x5,
+    UFS_QUERY_DESC_IDN_RFU_1 = 0x6,
+    UFS_QUERY_DESC_IDN_GEOMETRY = 0x7,
+    UFS_QUERY_DESC_IDN_POWER = 0x8,
+    UFS_QUERY_DESC_IDN_HEALTH = 0x9,
+    UFS_QUERY_DESC_IDN_MAX,
+};
+
+enum desc_header_offset {
+    UFS_QUERY_DESC_LENGTH_OFFSET = 0x00,
+    UFS_QUERY_DESC_DESC_TYPE_OFFSET = 0x01,
+};
+
+/* Unit descriptor parameters offsets in bytes*/
+enum unit_desc_param {
+    UFS_UNIT_DESC_PARAM_LEN = 0x0,
+    UFS_UNIT_DESC_PARAM_TYPE = 0x1,
+    UFS_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
+    UFS_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
+    UFS_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
+    UFS_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
+    UFS_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
+    UFS_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
+    UFS_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
+    UFS_UNIT_DESC_PARAM_DATA_RELIABILITY = 0x9,
+    UFS_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
+    UFS_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
+    UFS_UNIT_DESC_PARAM_ERASE_BLK_SIZE = 0x13,
+    UFS_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
+    UFS_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
+    UFS_UNIT_DESC_PARAM_CTX_CAPABILITIES = 0x20,
+    UFS_UNIT_DESC_PARAM_LARGE_UNIT_SIZE_M1 = 0x22,
+    UFS_UNIT_DESC_PARAM_HPB_LU_MAX_ACTIVE_RGNS = 0x23,
+    UFS_UNIT_DESC_PARAM_HPB_PIN_RGN_START_OFF = 0x25,
+    UFS_UNIT_DESC_PARAM_HPB_NUM_PIN_RGNS = 0x27,
+    UFS_UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS = 0x29,
+};
+
+/* RPMB Unit descriptor parameters offsets in bytes*/
+enum rpmb_unit_desc_param {
+    UFS_RPMB_UNIT_DESC_PARAM_LEN = 0x0,
+    UFS_RPMB_UNIT_DESC_PARAM_TYPE = 0x1,
+    UFS_RPMB_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
+    UFS_RPMB_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
+    UFS_RPMB_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
+    UFS_RPMB_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
+    UFS_RPMB_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
+    UFS_RPMB_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
+    UFS_RPMB_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
+    UFS_RPMB_UNIT_DESC_PARAM_REGION_EN = 0x9,
+    UFS_RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
+    UFS_RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
+    UFS_RPMB_UNIT_DESC_PARAM_REGION0_SIZE = 0x13,
+    UFS_RPMB_UNIT_DESC_PARAM_REGION1_SIZE = 0x14,
+    UFS_RPMB_UNIT_DESC_PARAM_REGION2_SIZE = 0x15,
+    UFS_RPMB_UNIT_DESC_PARAM_REGION3_SIZE = 0x16,
+    UFS_RPMB_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
+    UFS_RPMB_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
+};
+
+/* Device descriptor parameters offsets in bytes*/
+enum device_desc_param {
+    UFS_DEVICE_DESC_PARAM_LEN = 0x0,
+    UFS_DEVICE_DESC_PARAM_TYPE = 0x1,
+    UFS_DEVICE_DESC_PARAM_DEVICE_TYPE = 0x2,
+    UFS_DEVICE_DESC_PARAM_DEVICE_CLASS = 0x3,
+    UFS_DEVICE_DESC_PARAM_DEVICE_SUB_CLASS = 0x4,
+    UFS_DEVICE_DESC_PARAM_PRTCL = 0x5,
+    UFS_DEVICE_DESC_PARAM_NUM_LU = 0x6,
+    UFS_DEVICE_DESC_PARAM_NUM_WLU = 0x7,
+    UFS_DEVICE_DESC_PARAM_BOOT_ENBL = 0x8,
+    UFS_DEVICE_DESC_PARAM_DESC_ACCSS_ENBL = 0x9,
+    UFS_DEVICE_DESC_PARAM_INIT_PWR_MODE = 0xA,
+    UFS_DEVICE_DESC_PARAM_HIGH_PR_LUN = 0xB,
+    UFS_DEVICE_DESC_PARAM_SEC_RMV_TYPE = 0xC,
+    UFS_DEVICE_DESC_PARAM_SEC_LU = 0xD,
+    UFS_DEVICE_DESC_PARAM_BKOP_TERM_LT = 0xE,
+    UFS_DEVICE_DESC_PARAM_ACTVE_ICC_LVL = 0xF,
+    UFS_DEVICE_DESC_PARAM_SPEC_VER = 0x10,
+    UFS_DEVICE_DESC_PARAM_MANF_DATE = 0x12,
+    UFS_DEVICE_DESC_PARAM_MANF_NAME = 0x14,
+    UFS_DEVICE_DESC_PARAM_PRDCT_NAME = 0x15,
+    UFS_DEVICE_DESC_PARAM_SN = 0x16,
+    UFS_DEVICE_DESC_PARAM_OEM_ID = 0x17,
+    UFS_DEVICE_DESC_PARAM_MANF_ID = 0x18,
+    UFS_DEVICE_DESC_PARAM_UD_OFFSET = 0x1A,
+    UFS_DEVICE_DESC_PARAM_UD_LEN = 0x1B,
+    UFS_DEVICE_DESC_PARAM_RTT_CAP = 0x1C,
+    UFS_DEVICE_DESC_PARAM_FRQ_RTC = 0x1D,
+    UFS_DEVICE_DESC_PARAM_UFS_FEAT = 0x1F,
+    UFS_DEVICE_DESC_PARAM_FFU_TMT = 0x20,
+    UFS_DEVICE_DESC_PARAM_Q_DPTH = 0x21,
+    UFS_DEVICE_DESC_PARAM_DEV_VER = 0x22,
+    UFS_DEVICE_DESC_PARAM_NUM_SEC_WPA = 0x24,
+    UFS_DEVICE_DESC_PARAM_PSA_MAX_DATA = 0x25,
+    UFS_DEVICE_DESC_PARAM_PSA_TMT = 0x29,
+    UFS_DEVICE_DESC_PARAM_PRDCT_REV = 0x2A,
+    UFS_DEVICE_DESC_PARAM_HPB_VER = 0x40,
+    UFS_DEVICE_DESC_PARAM_HPB_CONTROL = 0x42,
+    UFS_DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP = 0x4F,
+    UFS_DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN = 0x53,
+    UFS_DEVICE_DESC_PARAM_WB_TYPE = 0x54,
+    UFS_DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS = 0x55,
+};
+
+/* Interconnect descriptor parameters offsets in bytes*/
+enum interconnect_desc_param {
+    UFS_INTERCONNECT_DESC_PARAM_LEN = 0x0,
+    UFS_INTERCONNECT_DESC_PARAM_TYPE = 0x1,
+    UFS_INTERCONNECT_DESC_PARAM_UNIPRO_VER = 0x2,
+    UFS_INTERCONNECT_DESC_PARAM_MPHY_VER = 0x4,
+};
+
+/* Geometry descriptor parameters offsets in bytes*/
+enum geometry_desc_param {
+    UFS_GEOMETRY_DESC_PARAM_LEN = 0x0,
+    UFS_GEOMETRY_DESC_PARAM_TYPE = 0x1,
+    UFS_GEOMETRY_DESC_PARAM_DEV_CAP = 0x4,
+    UFS_GEOMETRY_DESC_PARAM_MAX_NUM_LUN = 0xC,
+    UFS_GEOMETRY_DESC_PARAM_SEG_SIZE = 0xD,
+    UFS_GEOMETRY_DESC_PARAM_ALLOC_UNIT_SIZE = 0x11,
+    UFS_GEOMETRY_DESC_PARAM_MIN_BLK_SIZE = 0x12,
+    UFS_GEOMETRY_DESC_PARAM_OPT_RD_BLK_SIZE = 0x13,
+    UFS_GEOMETRY_DESC_PARAM_OPT_WR_BLK_SIZE = 0x14,
+    UFS_GEOMETRY_DESC_PARAM_MAX_IN_BUF_SIZE = 0x15,
+    UFS_GEOMETRY_DESC_PARAM_MAX_OUT_BUF_SIZE = 0x16,
+    UFS_GEOMETRY_DESC_PARAM_RPMB_RW_SIZE = 0x17,
+    UFS_GEOMETRY_DESC_PARAM_DYN_CAP_RSRC_PLC = 0x18,
+    UFS_GEOMETRY_DESC_PARAM_DATA_ORDER = 0x19,
+    UFS_GEOMETRY_DESC_PARAM_MAX_NUM_CTX = 0x1A,
+    UFS_GEOMETRY_DESC_PARAM_TAG_UNIT_SIZE = 0x1B,
+    UFS_GEOMETRY_DESC_PARAM_TAG_RSRC_SIZE = 0x1C,
+    UFS_GEOMETRY_DESC_PARAM_SEC_RM_TYPES = 0x1D,
+    UFS_GEOMETRY_DESC_PARAM_MEM_TYPES = 0x1E,
+    UFS_GEOMETRY_DESC_PARAM_SCM_MAX_NUM_UNITS = 0x20,
+    UFS_GEOMETRY_DESC_PARAM_SCM_CAP_ADJ_FCTR = 0x24,
+    UFS_GEOMETRY_DESC_PARAM_NPM_MAX_NUM_UNITS = 0x26,
+    UFS_GEOMETRY_DESC_PARAM_NPM_CAP_ADJ_FCTR = 0x2A,
+    UFS_GEOMETRY_DESC_PARAM_ENM1_MAX_NUM_UNITS = 0x2C,
+    UFS_GEOMETRY_DESC_PARAM_ENM1_CAP_ADJ_FCTR = 0x30,
+    UFS_GEOMETRY_DESC_PARAM_ENM2_MAX_NUM_UNITS = 0x32,
+    UFS_GEOMETRY_DESC_PARAM_ENM2_CAP_ADJ_FCTR = 0x36,
+    UFS_GEOMETRY_DESC_PARAM_ENM3_MAX_NUM_UNITS = 0x38,
+    UFS_GEOMETRY_DESC_PARAM_ENM3_CAP_ADJ_FCTR = 0x3C,
+    UFS_GEOMETRY_DESC_PARAM_ENM4_MAX_NUM_UNITS = 0x3E,
+    UFS_GEOMETRY_DESC_PARAM_ENM4_CAP_ADJ_FCTR = 0x42,
+    UFS_GEOMETRY_DESC_PARAM_OPT_LOG_BLK_SIZE = 0x44,
+    UFS_GEOMETRY_DESC_PARAM_HPB_REGION_SIZE = 0x48,
+    UFS_GEOMETRY_DESC_PARAM_HPB_NUMBER_LU = 0x49,
+    UFS_GEOMETRY_DESC_PARAM_HPB_SUBREGION_SIZE = 0x4A,
+    UFS_GEOMETRY_DESC_PARAM_HPB_MAX_ACTIVE_REGS = 0x4B,
+    UFS_GEOMETRY_DESC_PARAM_WB_MAX_ALLOC_UNITS = 0x4F,
+    UFS_GEOMETRY_DESC_PARAM_WB_MAX_WB_LUNS = 0x53,
+    UFS_GEOMETRY_DESC_PARAM_WB_BUFF_CAP_ADJ = 0x54,
+    UFS_GEOMETRY_DESC_PARAM_WB_SUP_RED_TYPE = 0x55,
+    UFS_GEOMETRY_DESC_PARAM_WB_SUP_WB_TYPE = 0x56,
+};
+
+/* Health descriptor parameters offsets in bytes*/
+enum health_desc_param {
+    UFS_HEALTH_DESC_PARAM_LEN = 0x0,
+    UFS_HEALTH_DESC_PARAM_TYPE = 0x1,
+    UFS_HEALTH_DESC_PARAM_EOL_INFO = 0x2,
+    UFS_HEALTH_DESC_PARAM_LIFE_TIME_EST_A = 0x3,
+    UFS_HEALTH_DESC_PARAM_LIFE_TIME_EST_B = 0x4,
+};
+
+/* WriteBooster buffer mode */
+enum {
+    UFS_WB_BUF_MODE_LU_DEDICATED = 0x0,
+    UFS_WB_BUF_MODE_SHARED = 0x1,
+};
+
+/*
+ * Logical Unit Write Protect
+ * 00h: LU not write protected
+ * 01h: LU write protected when fPowerOnWPEn =1
+ * 02h: LU permanently write protected when fPermanentWPEn =1
+ */
+enum ufs_lu_wp_type {
+    UFS_LU_NO_WP = 0x00,
+    UFS_LU_POWER_ON_WP = 0x01,
+    UFS_LU_PERM_WP = 0x02,
+};
+
+/* UTP QUERY Transaction Specific Fields OpCode */
+enum query_opcode {
+    UFS_UPIU_QUERY_OPCODE_NOP = 0x0,
+    UFS_UPIU_QUERY_OPCODE_READ_DESC = 0x1,
+    UFS_UPIU_QUERY_OPCODE_WRITE_DESC = 0x2,
+    UFS_UPIU_QUERY_OPCODE_READ_ATTR = 0x3,
+    UFS_UPIU_QUERY_OPCODE_WRITE_ATTR = 0x4,
+    UFS_UPIU_QUERY_OPCODE_READ_FLAG = 0x5,
+    UFS_UPIU_QUERY_OPCODE_SET_FLAG = 0x6,
+    UFS_UPIU_QUERY_OPCODE_CLEAR_FLAG = 0x7,
+    UFS_UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8,
+};
+
+/* Query response result code */
+typedef enum QueryRespCode {
+    UFS_QUERY_RESULT_SUCCESS = 0x00,
+    UFS_QUERY_RESULT_NOT_READABLE = 0xF6,
+    UFS_QUERY_RESULT_NOT_WRITEABLE = 0xF7,
+    UFS_QUERY_RESULT_ALREADY_WRITTEN = 0xF8,
+    UFS_QUERY_RESULT_INVALID_LENGTH = 0xF9,
+    UFS_QUERY_RESULT_INVALID_VALUE = 0xFA,
+    UFS_QUERY_RESULT_INVALID_SELECTOR = 0xFB,
+    UFS_QUERY_RESULT_INVALID_INDEX = 0xFC,
+    UFS_QUERY_RESULT_INVALID_IDN = 0xFD,
+    UFS_QUERY_RESULT_INVALID_OPCODE = 0xFE,
+    UFS_QUERY_RESULT_GENERAL_FAILURE = 0xFF,
+} QueryRespCode;
+
+/* UTP Transfer Request Command Type (CT) */
+enum {
+    UFS_UPIU_COMMAND_SET_TYPE_SCSI = 0x0,
+    UFS_UPIU_COMMAND_SET_TYPE_UFS = 0x1,
+    UFS_UPIU_COMMAND_SET_TYPE_QUERY = 0x2,
+};
+
+/* Task management service response */
+enum {
+    UFS_UPIU_TASK_MANAGEMENT_FUNC_COMPL = 0x00,
+    UFS_UPIU_TASK_MANAGEMENT_FUNC_NOT_SUPPORTED = 0x04,
+    UFS_UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED = 0x08,
+    UFS_UPIU_TASK_MANAGEMENT_FUNC_FAILED = 0x05,
+    UFS_UPIU_INCORRECT_LOGICAL_UNIT_NO = 0x09,
+};
+
+/* UFS device power modes */
+enum ufs_dev_pwr_mode {
+    UFS_ACTIVE_PWR_MODE = 1,
+    UFS_SLEEP_PWR_MODE = 2,
+    UFS_POWERDOWN_PWR_MODE = 3,
+    UFS_DEEPSLEEP_PWR_MODE = 4,
+};
+
+/*
+ * struct UtpCmdRsp - Response UPIU structure
+ * @residual_transfer_count: Residual transfer count DW-3
+ * @reserved: Reserved double words DW-4 to DW-7
+ * @sense_data_len: Sense data length DW-8 U16
+ * @sense_data: Sense data field DW-8 to DW-12
+ */
+typedef struct QEMU_PACKED UtpCmdRsp {
+    uint32_t residual_transfer_count;
+    uint32_t reserved[4];
+    uint16_t sense_data_len;
+    uint8_t sense_data[UFS_SENSE_SIZE];
+} UtpCmdRsp;
+
+/*
+ * struct UtpUpiuRsp - general upiu response structure
+ * @header: UPIU header structure DW-0 to DW-2
+ * @sr: fields structure for scsi command DW-3 to DW-12
+ * @qr: fields structure for query request DW-3 to DW-7
+ */
+typedef struct QEMU_PACKED UtpUpiuRsp {
+    UtpUpiuHeader header;
+    union {
+        UtpCmdRsp sr;
+        UtpUpiuQuery qr;
+    };
+} UtpUpiuRsp;
+
+static inline void _ufs_check_size(void)
+{
+    QEMU_BUILD_BUG_ON(sizeof(UfsReg) != 0x104);
+    QEMU_BUILD_BUG_ON(sizeof(DeviceDescriptor) != 89);
+    QEMU_BUILD_BUG_ON(sizeof(GeometryDescriptor) != 87);
+    QEMU_BUILD_BUG_ON(sizeof(UnitDescriptor) != 45);
+    QEMU_BUILD_BUG_ON(sizeof(RpmbUnitDescriptor) != 35);
+    QEMU_BUILD_BUG_ON(sizeof(PowerParametersDescriptor) != 98);
+    QEMU_BUILD_BUG_ON(sizeof(InterconnectDescriptor) != 6);
+    QEMU_BUILD_BUG_ON(sizeof(StringDescriptor) != 254);
+    QEMU_BUILD_BUG_ON(sizeof(DeviceHealthDescriptor) != 45);
+    QEMU_BUILD_BUG_ON(sizeof(Flags) != 0x13);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuHeader) != 12);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuQuery) != 276);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuCmd) != 20);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuReq) != 288);
+    QEMU_BUILD_BUG_ON(sizeof(UfshcdSgEntry) != 16);
+    QEMU_BUILD_BUG_ON(sizeof(RequestDescHeader) != 16);
+    QEMU_BUILD_BUG_ON(sizeof(UtpTransferReqDesc) != 32);
+    QEMU_BUILD_BUG_ON(sizeof(UtpTaskReqDesc) != 80);
+    QEMU_BUILD_BUG_ON(sizeof(UtpCmdRsp) != 40);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuRsp) != 288);
+}
+#endif
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -XXX,XX +XXX,XX @@ extern bool pci_available;
 #define PCI_DEVICE_ID_REDHAT_NVME        0x0010
 #define PCI_DEVICE_ID_REDHAT_PVPANIC     0x0011
 #define PCI_DEVICE_ID_REDHAT_ACPI_ERST   0x0012
+#define PCI_DEVICE_ID_REDHAT_UFS         0x0013
 #define PCI_DEVICE_ID_REDHAT_QXL         0x0100
 
 #define FMT_PCIBUS                      PRIx64
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -XXX,XX +XXX,XX @@
 #define PCI_CLASS_STORAGE_SATA           0x0106
 #define PCI_CLASS_STORAGE_SAS            0x0107
 #define PCI_CLASS_STORAGE_EXPRESS        0x0108
+#define PCI_CLASS_STORAGE_UFS            0x0109
 #define PCI_CLASS_STORAGE_OTHER          0x0180
 
 #define PCI_BASE_CLASS_NETWORK           0x02
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU Universal Flash Storage (UFS) Controller
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "migration/vmstate.h"
+#include "trace.h"
+#include "ufs.h"
+
+/* The QEMU-UFS device follows spec version 3.1 */
+#define UFS_SPEC_VER 0x00000310
+#define UFS_MAX_NUTRS 32
+#define UFS_MAX_NUTMRS 8
+
+static void ufs_irq_check(UfsHc *u)
+{
+    PCIDevice *pci = PCI_DEVICE(u);
+
+    if ((u->reg.is & UFS_INTR_MASK) & u->reg.ie) {
+        trace_ufs_irq_raise();
+        pci_irq_assert(pci);
+    } else {
+        trace_ufs_irq_lower();
+        pci_irq_deassert(pci);
+    }
+}
+
+static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
+{
+    trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
+                             u->reg.ucmdarg3);
+    /*
+     * Only the essential uic commands for running drivers on Linux and Windows
+     * are implemented.
+     */
+    switch (val) {
+    case UFS_UIC_CMD_DME_LINK_STARTUP:
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, DP, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTRLRDY, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTMRLRDY, 1);
+        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
+        break;
+    /* TODO: Revisit it when Power Management is implemented */
+    case UFS_UIC_CMD_DME_HIBER_ENTER:
+        u->reg.is = FIELD_DP32(u->reg.is, IS, UHES, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, UFS_PWR_LOCAL);
+        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
+        break;
+    case UFS_UIC_CMD_DME_HIBER_EXIT:
+        u->reg.is = FIELD_DP32(u->reg.is, IS, UHXS, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, UFS_PWR_LOCAL);
+        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_SUCCESS;
+        break;
+    default:
+        u->reg.ucmdarg2 = UFS_UIC_CMD_RESULT_FAILURE;
+    }
+
+    u->reg.is = FIELD_DP32(u->reg.is, IS, UCCS, 1);
+
+    ufs_irq_check(u);
+}
+
+static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
+{
+    switch (offset) {
+    case A_IS:
+        u->reg.is &= ~data;
+        ufs_irq_check(u);
+        break;
+    case A_IE:
+        u->reg.ie = data;
+        ufs_irq_check(u);
+        break;
+    case A_HCE:
+        if (!FIELD_EX32(u->reg.hce, HCE, HCE) && FIELD_EX32(data, HCE, HCE)) {
+            u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UCRDY, 1);
+            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 1);
+        } else if (FIELD_EX32(u->reg.hce, HCE, HCE) &&
+                   !FIELD_EX32(data, HCE, HCE)) {
+            u->reg.hcs = 0;
+            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 0);
+        }
+        break;
+    case A_UTRLBA:
+        u->reg.utrlba = data & R_UTRLBA_UTRLBA_MASK;
+        break;
+    case A_UTRLBAU:
+        u->reg.utrlbau = data;
+        break;
+    case A_UTRLDBR:
+        /* Not yet supported */
+        break;
+    case A_UTRLRSR:
+        u->reg.utrlrsr = data;
+        break;
+    case A_UTRLCNR:
+        u->reg.utrlcnr &= ~data;
+        break;
+    case A_UTMRLBA:
+        u->reg.utmrlba = data & R_UTMRLBA_UTMRLBA_MASK;
+        break;
+    case A_UTMRLBAU:
+        u->reg.utmrlbau = data;
+        break;
+    case A_UICCMD:
+        ufs_process_uiccmd(u, data);
+        break;
+    case A_UCMDARG1:
+        u->reg.ucmdarg1 = data;
+        break;
+    case A_UCMDARG2:
+        u->reg.ucmdarg2 = data;
+        break;
+    case A_UCMDARG3:
+        u->reg.ucmdarg3 = data;
+        break;
+    case A_UTRLCLR:
+    case A_UTMRLDBR:
+    case A_UTMRLCLR:
+    case A_UTMRLRSR:
+        trace_ufs_err_unsupport_register_offset(offset);
+        break;
+    default:
+        trace_ufs_err_invalid_register_offset(offset);
+        break;
+    }
+}
+
+static uint64_t ufs_mmio_read(void *opaque, hwaddr addr, unsigned size)
+{
+    UfsHc *u = (UfsHc *)opaque;
+    uint8_t *ptr = (uint8_t *)&u->reg;
+    uint64_t value;
+
+    if (addr > sizeof(u->reg) - size) {
+        trace_ufs_err_invalid_register_offset(addr);
+        return 0;
+    }
+
+    value = *(uint32_t *)(ptr + addr);
+    trace_ufs_mmio_read(addr, value, size);
+    return value;
+}
+
+static void ufs_mmio_write(void *opaque, hwaddr addr, uint64_t data,
+                           unsigned size)
+{
+    UfsHc *u = (UfsHc *)opaque;
+
+    if (addr > sizeof(u->reg) - size) {
+        trace_ufs_err_invalid_register_offset(addr);
+        return;
+    }
+
+    trace_ufs_mmio_write(addr, data, size);
+    ufs_write_reg(u, addr, data, size);
+}
+
+static const MemoryRegionOps ufs_mmio_ops = {
+    .read = ufs_mmio_read,
+    .write = ufs_mmio_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+    .impl = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    },
+};
+
+static bool ufs_check_constraints(UfsHc *u, Error **errp)
+{
+    if (u->params.nutrs > UFS_MAX_NUTRS) {
+        error_setg(errp, "nutrs must be less than or equal to %d",
+                   UFS_MAX_NUTRS);
+        return false;
+    }
+
+    if (u->params.nutmrs > UFS_MAX_NUTMRS) {
+        error_setg(errp, "nutmrs must be less than or equal to %d",
+                   UFS_MAX_NUTMRS);
+        return false;
+    }
+
+    return true;
+}
+
+static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
+{
+    uint8_t *pci_conf = pci_dev->config;
+
+    pci_conf[PCI_INTERRUPT_PIN] = 1;
+    pci_config_set_prog_interface(pci_conf, 0x1);
+
+    memory_region_init_io(&u->iomem, OBJECT(u), &ufs_mmio_ops, u, "ufs",
+                          u->reg_size);
+    pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &u->iomem);
+    u->irq = pci_allocate_irq(pci_dev);
+}
+
+static void ufs_init_hc(UfsHc *u)
+{
+    uint32_t cap = 0;
+
+    u->reg_size = pow2ceil(sizeof(UfsReg));
+
+    memset(&u->reg, 0, sizeof(u->reg));
+    cap = FIELD_DP32(cap, CAP, NUTRS, (u->params.nutrs - 1));
+    cap = FIELD_DP32(cap, CAP, RTT, 2);
+    cap = FIELD_DP32(cap, CAP, NUTMRS, (u->params.nutmrs - 1));
+    cap = FIELD_DP32(cap, CAP, AUTOH8, 0);
+    cap = FIELD_DP32(cap, CAP, 64AS, 1);
+    cap = FIELD_DP32(cap, CAP, OODDS, 0);
+    cap = FIELD_DP32(cap, CAP, UICDMETMS, 0);
+    cap = FIELD_DP32(cap, CAP, CS, 0);
+    u->reg.cap = cap;
+    u->reg.ver = UFS_SPEC_VER;
+}
+
+static void ufs_realize(PCIDevice *pci_dev, Error **errp)
+{
+    UfsHc *u = UFS(pci_dev);
+
+    if (!ufs_check_constraints(u, errp)) {
+        return;
+    }
+
+    ufs_init_hc(u);
+    ufs_init_pci(u, pci_dev);
+}
+
+static Property ufs_props[] = {
+    DEFINE_PROP_STRING("serial", UfsHc, params.serial),
+    DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
+    DEFINE_PROP_UINT8("nutmrs", UfsHc, params.nutmrs, 8),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static const VMStateDescription ufs_vmstate = {
+    .name = "ufs",
+    .unmigratable = 1,
+};
+
+static void ufs_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
+
+    pc->realize = ufs_realize;
+    pc->vendor_id = PCI_VENDOR_ID_REDHAT;
+    pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
+    pc->class_id = PCI_CLASS_STORAGE_UFS;
+
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+    dc->desc = "Universal Flash Storage";
+    device_class_set_props(dc, ufs_props);
+    dc->vmsd = &ufs_vmstate;
+}
+
+static const TypeInfo ufs_info = {
+    .name = TYPE_UFS,
+    .parent = TYPE_PCI_DEVICE,
+    .class_init = ufs_class_init,
+    .instance_size = sizeof(UfsHc),
+    .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
+};
+
+static void ufs_register_types(void)
+{
+    type_register_static(&ufs_info);
+}
+
+type_init(ufs_register_types)
diff --git a/hw/Kconfig b/hw/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -XXX,XX +XXX,XX @@ source smbios/Kconfig
 source ssi/Kconfig
 source timer/Kconfig
 source tpm/Kconfig
+source ufs/Kconfig
 source usb/Kconfig
 source virtio/Kconfig
 source vfio/Kconfig
diff --git a/hw/meson.build b/hw/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -XXX,XX +XXX,XX @@ subdir('smbios')
 subdir('ssi')
 subdir('timer')
 subdir('tpm')
+subdir('ufs')
 subdir('usb')
 subdir('vfio')
 subdir('virtio')
diff --git a/hw/ufs/Kconfig b/hw/ufs/Kconfig
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/Kconfig
@@ -XXX,XX +XXX,XX @@
+config UFS_PCI
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/meson.build
@@ -0,0 +1 @@
+system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@
+# ufs.c
+ufs_irq_raise(void) "INTx"
+ufs_irq_lower(void) "INTx"
+ufs_mmio_read(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
+ufs_mmio_write(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
+ufs_process_db(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_process_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_complete_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_sendback_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_exec_nop_cmd(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", lun 0x%"PRIx8", opcode 0x%"PRIx8""
+ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
+ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
+
+# error condition
+ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
+ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
+ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
+ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
+ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
+ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
+ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
+ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
+ufs_err_scsi_cmd_invalid_lun(uint8_t lun) "scsi command has invalid lun: 0x%"PRIx8""
+ufs_err_query_flag_not_readable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to read"
+ufs_err_query_flag_not_writable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to write"
+ufs_err_query_attr_not_readable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to read"
+ufs_err_query_attr_not_writable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to write"
+ufs_err_query_invalid_opcode(uint8_t opcode) "query request has invalid opcode. opcode: 0x%"PRIx8""
+ufs_err_query_invalid_idn(uint8_t opcode, uint8_t idn) "query request has invalid idn. opcode: 0x%"PRIx8", idn 0x%"PRIx8""
+ufs_err_query_invalid_index(uint8_t opcode, uint8_t index) "query request has invalid index. opcode: 0x%"PRIx8", index 0x%"PRIx8""
+ufs_err_invalid_trans_code(uint32_t slot, uint8_t trans_code) "request upiu has invalid transaction code. slot: %"PRIu32", trans_code: 0x%"PRIx8""
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@samsung.com>

This commit makes the UFS device support query
and nop out transfer requests.

The next patch would be support for UFS logical
unit and scsi command transfer request.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: ff7a5f0fd26761936a553ffb89d3df0ba62844e9.1693980783.git.jeuk20.kim@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ufs/ufs.h        |  46 +++
 hw/ufs/ufs.c        | 988 +++++++++++++++++++++++++++++++++++++++++++-
 hw/ufs/trace-events |   1 +
 3 files changed, 1033 insertions(+), 2 deletions(-)

diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.h
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
 #define UFS_MAX_LUS 32
 #define UFS_BLOCK_SIZE 4096
 
+typedef enum UfsRequestState {
+    UFS_REQUEST_IDLE = 0,
+    UFS_REQUEST_READY = 1,
+    UFS_REQUEST_RUNNING = 2,
+    UFS_REQUEST_COMPLETE = 3,
+    UFS_REQUEST_ERROR = 4,
+} UfsRequestState;
+
+typedef enum UfsReqResult {
+    UFS_REQUEST_SUCCESS = 0,
+    UFS_REQUEST_FAIL = 1,
+} UfsReqResult;
+
+typedef struct UfsRequest {
+    struct UfsHc *hc;
+    UfsRequestState state;
+    int slot;
+
+    UtpTransferReqDesc utrd;
+    UtpUpiuReq req_upiu;
+    UtpUpiuRsp rsp_upiu;
+
+    /* for scsi command */
+    QEMUSGList *sg;
+} UfsRequest;
+
 typedef struct UfsParams {
     char *serial;
     uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
     UfsReg reg;
     UfsParams params;
     uint32_t reg_size;
+    UfsRequest *req_list;
+
+    DeviceDescriptor device_desc;
+    GeometryDescriptor geometry_desc;
+    Attributes attributes;
+    Flags flags;
 
     qemu_irq irq;
     QEMUBH *doorbell_bh;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
 #define TYPE_UFS "ufs"
 #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 
+typedef enum UfsQueryFlagPerm {
+    UFS_QUERY_FLAG_NONE = 0x0,
+    UFS_QUERY_FLAG_READ = 0x1,
+    UFS_QUERY_FLAG_SET = 0x2,
+    UFS_QUERY_FLAG_CLEAR = 0x4,
+    UFS_QUERY_FLAG_TOGGLE = 0x8,
+} UfsQueryFlagPerm;
+
+typedef enum UfsQueryAttrPerm {
+    UFS_QUERY_ATTR_NONE = 0x0,
+    UFS_QUERY_ATTR_READ = 0x1,
+    UFS_QUERY_ATTR_WRITE = 0x2,
+} UfsQueryAttrPerm;
+
 #endif /* HW_UFS_UFS_H */
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.c
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
 #include "ufs.h"
 
 /* The QEMU-UFS device follows spec version 3.1 */
-#define UFS_SPEC_VER 0x00000310
+#define UFS_SPEC_VER 0x0310
 #define UFS_MAX_NUTRS 32
 #define UFS_MAX_NUTMRS 8
 
+static MemTxResult ufs_addr_read(UfsHc *u, hwaddr addr, void *buf, int size)
+{
+    hwaddr hi = addr + size - 1;
+
+    if (hi < addr) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    return pci_dma_read(PCI_DEVICE(u), addr, buf, size);
+}
+
+static MemTxResult ufs_addr_write(UfsHc *u, hwaddr addr, const void *buf,
+                                  int size)
+{
+    hwaddr hi = addr + size - 1;
+    if (hi < addr) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    return pci_dma_write(PCI_DEVICE(u), addr, buf, size);
+}
+
+static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result);
+
+static inline hwaddr ufs_get_utrd_addr(UfsHc *u, uint32_t slot)
+{
+    hwaddr utrl_base_addr = (((hwaddr)u->reg.utrlbau) << 32) + u->reg.utrlba;
+    hwaddr utrd_addr = utrl_base_addr + slot * sizeof(UtpTransferReqDesc);
+
+    return utrd_addr;
+}
+
+static inline hwaddr ufs_get_req_upiu_base_addr(const UtpTransferReqDesc *utrd)
+{
+    uint32_t cmd_desc_base_addr_lo =
+        le32_to_cpu(utrd->command_desc_base_addr_lo);
+    uint32_t cmd_desc_base_addr_hi =
+        le32_to_cpu(utrd->command_desc_base_addr_hi);
+
+    return (((hwaddr)cmd_desc_base_addr_hi) << 32) + cmd_desc_base_addr_lo;
+}
+
+static inline hwaddr ufs_get_rsp_upiu_base_addr(const UtpTransferReqDesc *utrd)
+{
+    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(utrd);
+    uint32_t rsp_upiu_byte_off =
+        le16_to_cpu(utrd->response_upiu_offset) * sizeof(uint32_t);
+    return req_upiu_base_addr + rsp_upiu_byte_off;
+}
+
+static MemTxResult ufs_dma_read_utrd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
+    MemTxResult ret;
+
+    ret = ufs_addr_read(u, utrd_addr, &req->utrd, sizeof(req->utrd));
+    if (ret) {
+        trace_ufs_err_dma_read_utrd(req->slot, utrd_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_read_req_upiu(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
+    UtpUpiuReq *req_upiu = &req->req_upiu;
+    uint32_t copy_size;
+    uint16_t data_segment_length;
+    MemTxResult ret;
+
+    /*
+     * To know the size of the req_upiu, we need to read the
+     * data_segment_length in the header first.
+     */
+    ret = ufs_addr_read(u, req_upiu_base_addr, &req_upiu->header,
+                        sizeof(UtpUpiuHeader));
+    if (ret) {
+        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
+        return ret;
+    }
+    data_segment_length = be16_to_cpu(req_upiu->header.data_segment_length);
+
+    copy_size = sizeof(UtpUpiuHeader) + UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
+                data_segment_length;
+
+    ret = ufs_addr_read(u, req_upiu_base_addr, &req->req_upiu, copy_size);
+    if (ret) {
+        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_read_prdt(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint16_t prdt_len = le16_to_cpu(req->utrd.prd_table_length);
+    uint16_t prdt_byte_off =
+        le16_to_cpu(req->utrd.prd_table_offset) * sizeof(uint32_t);
+    uint32_t prdt_size = prdt_len * sizeof(UfshcdSgEntry);
+    g_autofree UfshcdSgEntry *prd_entries = NULL;
+    hwaddr req_upiu_base_addr, prdt_base_addr;
+    int err;
+
+    assert(!req->sg);
+
+    if (prdt_size == 0) {
+        return MEMTX_OK;
+    }
+    prd_entries = g_new(UfshcdSgEntry, prdt_size);
+
+    req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
+    prdt_base_addr = req_upiu_base_addr + prdt_byte_off;
+
+    err = ufs_addr_read(u, prdt_base_addr, prd_entries, prdt_size);
+    if (err) {
+        trace_ufs_err_dma_read_prdt(req->slot, prdt_base_addr);
+        return err;
+    }
+
+    req->sg = g_malloc0(sizeof(QEMUSGList));
+    pci_dma_sglist_init(req->sg, PCI_DEVICE(u), prdt_len);
+
+    for (uint16_t i = 0; i < prdt_len; ++i) {
+        hwaddr data_dma_addr = le64_to_cpu(prd_entries[i].addr);
+        uint32_t data_byte_count = le32_to_cpu(prd_entries[i].size) + 1;
+        qemu_sglist_add(req->sg, data_dma_addr, data_byte_count);
+    }
+    return MEMTX_OK;
+}
+
+static MemTxResult ufs_dma_read_upiu(UfsRequest *req)
+{
+    MemTxResult ret;
+
+    ret = ufs_dma_read_utrd(req);
+    if (ret) {
+        return ret;
+    }
+
+    ret = ufs_dma_read_req_upiu(req);
+    if (ret) {
+        return ret;
+    }
+
+    ret = ufs_dma_read_prdt(req);
+    if (ret) {
+        return ret;
+    }
+
+    return 0;
+}
+
+static MemTxResult ufs_dma_write_utrd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
+    MemTxResult ret;
+
+    ret = ufs_addr_write(u, utrd_addr, &req->utrd, sizeof(req->utrd));
+    if (ret) {
+        trace_ufs_err_dma_write_utrd(req->slot, utrd_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_write_rsp_upiu(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr rsp_upiu_base_addr = ufs_get_rsp_upiu_base_addr(&req->utrd);
+    uint32_t rsp_upiu_byte_len =
+        le16_to_cpu(req->utrd.response_upiu_length) * sizeof(uint32_t);
+    uint16_t data_segment_length =
+        be16_to_cpu(req->rsp_upiu.header.data_segment_length);
+    uint32_t copy_size = sizeof(UtpUpiuHeader) +
+                         UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
+                         data_segment_length;
+    MemTxResult ret;
+
+    if (copy_size > rsp_upiu_byte_len) {
+        copy_size = rsp_upiu_byte_len;
+    }
+
+    ret = ufs_addr_write(u, rsp_upiu_base_addr, &req->rsp_upiu, copy_size);
+    if (ret) {
+        trace_ufs_err_dma_write_rsp_upiu(req->slot, rsp_upiu_base_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_write_upiu(UfsRequest *req)
+{
+    MemTxResult ret;
+
+    ret = ufs_dma_write_rsp_upiu(req);
+    if (ret) {
+        return ret;
+    }
+
+    return ufs_dma_write_utrd(req);
+}
+
 static void ufs_irq_check(UfsHc *u)
 {
     PCIDevice *pci = PCI_DEVICE(u);
@@ -XXX,XX +XXX,XX @@ static void ufs_irq_check(UfsHc *u)
     }
 }
 
+static void ufs_process_db(UfsHc *u, uint32_t val)
+{
+    unsigned long doorbell;
+    uint32_t slot;
+    uint32_t nutrs = u->params.nutrs;
+    UfsRequest *req;
+
+    val &= ~u->reg.utrldbr;
+    if (!val) {
+        return;
+    }
+
+    doorbell = val;
+    slot = find_first_bit(&doorbell, nutrs);
+
+    while (slot < nutrs) {
+        req = &u->req_list[slot];
+        if (req->state == UFS_REQUEST_ERROR) {
+            trace_ufs_err_utrl_slot_error(req->slot);
+            return;
+        }
+
+        if (req->state != UFS_REQUEST_IDLE) {
+            trace_ufs_err_utrl_slot_busy(req->slot);
+            return;
+        }
+
+        trace_ufs_process_db(slot);
+        req->state = UFS_REQUEST_READY;
+        slot = find_next_bit(&doorbell, nutrs, slot + 1);
+    }
+
+    qemu_bh_schedule(u->doorbell_bh);
+}
+
 static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
 {
     trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
@@ -XXX,XX +XXX,XX @@ static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
         u->reg.utrlbau = data;
         break;
     case A_UTRLDBR:
-        /* Not yet supported */
+        ufs_process_db(u, data);
+        u->reg.utrldbr |= data;
         break;
     case A_UTRLRSR:
         u->reg.utrlrsr = data;
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
     },
 };
 
+static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
+                                  uint8_t flags, uint8_t response,
+                                  uint8_t scsi_status,
+                                  uint16_t data_segment_length)
+{
+    memcpy(&req->rsp_upiu.header, &req->req_upiu.header, sizeof(UtpUpiuHeader));
+    req->rsp_upiu.header.trans_type = trans_type;
+    req->rsp_upiu.header.flags = flags;
+    req->rsp_upiu.header.response = response;
+    req->rsp_upiu.header.scsi_status = scsi_status;
+    req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
+}
+
+static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
+{
+    trace_ufs_exec_nop_cmd(req->slot);
+    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_NOP_IN, 0, 0, 0, 0);
+    return UFS_REQUEST_SUCCESS;
+}
+
+/*
+ * This defines the permission of flags based on their IDN. There are some
+ * things that are declared read-only, which is inconsistent with the ufs spec,
+ * because we want to return an error for features that are not yet supported.
+ */
+static const int flag_permission[UFS_QUERY_FLAG_IDN_COUNT] = {
+    [UFS_QUERY_FLAG_IDN_FDEVICEINIT] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET,
+    /* Write protection is not supported */
+    [UFS_QUERY_FLAG_IDN_PERMANENT_WPE] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_PWR_ON_WPE] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_BKOPS_EN] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET |
+                                    UFS_QUERY_FLAG_CLEAR |
+                                    UFS_QUERY_FLAG_TOGGLE,
+    [UFS_QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE] =
+        UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET | UFS_QUERY_FLAG_CLEAR |
+        UFS_QUERY_FLAG_TOGGLE,
+    /* Purge Operation is not supported */
+    [UFS_QUERY_FLAG_IDN_PURGE_ENABLE] = UFS_QUERY_FLAG_NONE,
+    /* Refresh Operation is not supported */
+    [UFS_QUERY_FLAG_IDN_REFRESH_ENABLE] = UFS_QUERY_FLAG_NONE,
+    /* Physical Resource Removal is not supported */
+    [UFS_QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_BUSY_RTC] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE] = UFS_QUERY_FLAG_READ,
+    /* Write Booster is not supported */
+    [UFS_QUERY_FLAG_IDN_WB_EN] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN] = UFS_QUERY_FLAG_READ,
+    [UFS_QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8] = UFS_QUERY_FLAG_READ,
+};
+
+static inline QueryRespCode ufs_flag_check_idn_valid(uint8_t idn, int op)
+{
+    if (idn >= UFS_QUERY_FLAG_IDN_COUNT) {
+        return UFS_QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (!(flag_permission[idn] & op)) {
+        if (op == UFS_QUERY_FLAG_READ) {
+            trace_ufs_err_query_flag_not_readable(idn);
+            return UFS_QUERY_RESULT_NOT_READABLE;
+        }
+        trace_ufs_err_query_flag_not_writable(idn);
+        return UFS_QUERY_RESULT_NOT_WRITEABLE;
+    }
+
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static const int attr_permission[UFS_QUERY_ATTR_IDN_COUNT] = {
+    /* booting is not supported */
+    [UFS_QUERY_ATTR_IDN_BOOT_LU_EN] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_POWER_MODE] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_OOO_DATA_EN] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_BKOPS_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_PURGE_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_MAX_DATA_IN] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_MAX_DATA_OUT] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_REF_CLK_FREQ] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_EE_CONTROL] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_EE_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_SECONDS_PASSED] = UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_CNTX_CONF] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_FFU_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_PSA_STATE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_THROTTLING_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
+    /* refresh operation is not supported */
+    [UFS_QUERY_ATTR_IDN_REFRESH_STATUS] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_REFRESH_FREQ] = UFS_QUERY_ATTR_READ,
+    [UFS_QUERY_ATTR_IDN_REFRESH_UNIT] = UFS_QUERY_ATTR_READ,
+};
+
+static inline QueryRespCode ufs_attr_check_idn_valid(uint8_t idn, int op)
+{
+    if (idn >= UFS_QUERY_ATTR_IDN_COUNT) {
+        return UFS_QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (!(attr_permission[idn] & op)) {
+        if (op == UFS_QUERY_ATTR_READ) {
+            trace_ufs_err_query_attr_not_readable(idn);
+            return UFS_QUERY_RESULT_NOT_READABLE;
+        }
+        trace_ufs_err_query_attr_not_writable(idn);
+        return UFS_QUERY_RESULT_NOT_WRITEABLE;
+    }
+
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static QueryRespCode ufs_exec_query_flag(UfsRequest *req, int op)
+{
+    UfsHc *u = req->hc;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint32_t value;
+    QueryRespCode ret;
+
+    ret = ufs_flag_check_idn_valid(idn, op);
+    if (ret) {
+        return ret;
+    }
+
+    if (idn == UFS_QUERY_FLAG_IDN_FDEVICEINIT) {
+        value = 0;
+    } else if (op == UFS_QUERY_FLAG_READ) {
+        value = *(((uint8_t *)&u->flags) + idn);
+    } else if (op == UFS_QUERY_FLAG_SET) {
+        value = 1;
+    } else if (op == UFS_QUERY_FLAG_CLEAR) {
+        value = 0;
+    } else if (op == UFS_QUERY_FLAG_TOGGLE) {
+        value = *(((uint8_t *)&u->flags) + idn);
+        value = !value;
+    } else {
+        trace_ufs_err_query_invalid_opcode(op);
+        return UFS_QUERY_RESULT_INVALID_OPCODE;
+    }
+
+    *(((uint8_t *)&u->flags) + idn) = value;
+    req->rsp_upiu.qr.value = cpu_to_be32(value);
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static uint32_t ufs_read_attr_value(UfsHc *u, uint8_t idn)
+{
+    switch (idn) {
+    case UFS_QUERY_ATTR_IDN_BOOT_LU_EN:
+        return u->attributes.boot_lun_en;
+    case UFS_QUERY_ATTR_IDN_POWER_MODE:
+        return u->attributes.current_power_mode;
+    case UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
+        return u->attributes.active_icc_level;
+    case UFS_QUERY_ATTR_IDN_OOO_DATA_EN:
+        return u->attributes.out_of_order_data_en;
+    case UFS_QUERY_ATTR_IDN_BKOPS_STATUS:
+        return u->attributes.background_op_status;
+    case UFS_QUERY_ATTR_IDN_PURGE_STATUS:
+        return u->attributes.purge_status;
+    case UFS_QUERY_ATTR_IDN_MAX_DATA_IN:
+        return u->attributes.max_data_in_size;
+    case UFS_QUERY_ATTR_IDN_MAX_DATA_OUT:
+        return u->attributes.max_data_out_size;
+    case UFS_QUERY_ATTR_IDN_DYN_CAP_NEEDED:
+        return be32_to_cpu(u->attributes.dyn_cap_needed);
+    case UFS_QUERY_ATTR_IDN_REF_CLK_FREQ:
+        return u->attributes.ref_clk_freq;
+    case UFS_QUERY_ATTR_IDN_CONF_DESC_LOCK:
+        return u->attributes.config_descr_lock;
+    case UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
+        return u->attributes.max_num_of_rtt;
+    case UFS_QUERY_ATTR_IDN_EE_CONTROL:
+        return be16_to_cpu(u->attributes.exception_event_control);
+    case UFS_QUERY_ATTR_IDN_EE_STATUS:
+        return be16_to_cpu(u->attributes.exception_event_status);
+    case UFS_QUERY_ATTR_IDN_SECONDS_PASSED:
+        return be32_to_cpu(u->attributes.seconds_passed);
+    case UFS_QUERY_ATTR_IDN_CNTX_CONF:
+        return be16_to_cpu(u->attributes.context_conf);
+    case UFS_QUERY_ATTR_IDN_FFU_STATUS:
+        return u->attributes.device_ffu_status;
+    case UFS_QUERY_ATTR_IDN_PSA_STATE:
+        return be32_to_cpu(u->attributes.psa_state);
+    case UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE:
+        return be32_to_cpu(u->attributes.psa_data_size);
+    case UFS_QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME:
+        return u->attributes.ref_clk_gating_wait_time;
+    case UFS_QUERY_ATTR_IDN_CASE_ROUGH_TEMP:
+        return u->attributes.device_case_rough_temperaure;
+    case UFS_QUERY_ATTR_IDN_HIGH_TEMP_BOUND:
+        return u->attributes.device_too_high_temp_boundary;
+    case UFS_QUERY_ATTR_IDN_LOW_TEMP_BOUND:
+        return u->attributes.device_too_low_temp_boundary;
+    case UFS_QUERY_ATTR_IDN_THROTTLING_STATUS:
+        return u->attributes.throttling_status;
+    case UFS_QUERY_ATTR_IDN_WB_FLUSH_STATUS:
+        return u->attributes.wb_buffer_flush_status;
+    case UFS_QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE:
+        return u->attributes.available_wb_buffer_size;
+    case UFS_QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST:
+        return u->attributes.wb_buffer_life_time_est;
+    case UFS_QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE:
+        return be32_to_cpu(u->attributes.current_wb_buffer_size);
+    case UFS_QUERY_ATTR_IDN_REFRESH_STATUS:
+        return u->attributes.refresh_status;
+    case UFS_QUERY_ATTR_IDN_REFRESH_FREQ:
+        return u->attributes.refresh_freq;
+    case UFS_QUERY_ATTR_IDN_REFRESH_UNIT:
+        return u->attributes.refresh_unit;
+    }
+    return 0;
+}
+
+static void ufs_write_attr_value(UfsHc *u, uint8_t idn, uint32_t value)
+{
+    switch (idn) {
+    case UFS_QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
+        u->attributes.active_icc_level = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_MAX_DATA_IN:
+        u->attributes.max_data_in_size = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_MAX_DATA_OUT:
+        u->attributes.max_data_out_size = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_REF_CLK_FREQ:
+        u->attributes.ref_clk_freq = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
+        u->attributes.max_num_of_rtt = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_EE_CONTROL:
+        u->attributes.exception_event_control = cpu_to_be16(value);
+        break;
+    case UFS_QUERY_ATTR_IDN_SECONDS_PASSED:
+        u->attributes.seconds_passed = cpu_to_be32(value);
+        break;
+    case UFS_QUERY_ATTR_IDN_PSA_STATE:
+        u->attributes.psa_state = value;
+        break;
+    case UFS_QUERY_ATTR_IDN_PSA_DATA_SIZE:
+        u->attributes.psa_data_size = cpu_to_be32(value);
+        break;
+    }
+}
+
+static QueryRespCode ufs_exec_query_attr(UfsRequest *req, int op)
+{
+    UfsHc *u = req->hc;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint32_t value;
+    QueryRespCode ret;
+
+    ret = ufs_attr_check_idn_valid(idn, op);
+    if (ret) {
+        return ret;
+    }
+
+    if (op == UFS_QUERY_ATTR_READ) {
+        value = ufs_read_attr_value(u, idn);
+    } else {
+        value = be32_to_cpu(req->req_upiu.qr.value);
+        ufs_write_attr_value(u, idn, value);
+    }
+
+    req->rsp_upiu.qr.value = cpu_to_be32(value);
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static const RpmbUnitDescriptor rpmb_unit_desc = {
+    .length = sizeof(RpmbUnitDescriptor),
+    .descriptor_idn = 2,
+    .unit_index = UFS_UPIU_RPMB_WLUN,
+    .lu_enable = 0,
+};
+
+static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
+{
+    uint8_t lun = req->req_upiu.qr.index;
+
+    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
+        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
+        return UFS_QUERY_RESULT_INVALID_INDEX;
+    }
+
+    if (lun == UFS_UPIU_RPMB_WLUN) {
+        memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
+    } else {
+        /* unit descriptor is not yet supported */
+        return UFS_QUERY_RESULT_INVALID_INDEX;
+    }
+
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static inline StringDescriptor manufacturer_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x12,
+        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('R');
+    desc.UC[1] = cpu_to_be16('E');
+    desc.UC[2] = cpu_to_be16('D');
+    desc.UC[3] = cpu_to_be16('H');
+    desc.UC[4] = cpu_to_be16('A');
+    desc.UC[5] = cpu_to_be16('T');
+    return desc;
+}
+
+static inline StringDescriptor product_name_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x22,
+        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('Q');
+    desc.UC[1] = cpu_to_be16('E');
+    desc.UC[2] = cpu_to_be16('M');
+    desc.UC[3] = cpu_to_be16('U');
+    desc.UC[4] = cpu_to_be16(' ');
+    desc.UC[5] = cpu_to_be16('U');
+    desc.UC[6] = cpu_to_be16('F');
+    desc.UC[7] = cpu_to_be16('S');
+    return desc;
+}
+
+static inline StringDescriptor product_rev_level_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x0a,
+        .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('0');
+    desc.UC[1] = cpu_to_be16('0');
+    desc.UC[2] = cpu_to_be16('0');
+    desc.UC[3] = cpu_to_be16('1');
+    return desc;
+}
+
+static const StringDescriptor null_str_desc = {
+    .length = 0x02,
+    .descriptor_idn = UFS_QUERY_DESC_IDN_STRING,
+};
+
+static QueryRespCode ufs_read_string_desc(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint8_t index = req->req_upiu.qr.index;
+    StringDescriptor desc;
+
+    if (index == u->device_desc.manufacturer_name) {
+        desc = manufacturer_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else if (index == u->device_desc.product_name) {
+        desc = product_name_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else if (index == u->device_desc.serial_number) {
+        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
+    } else if (index == u->device_desc.oem_id) {
+        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
+    } else if (index == u->device_desc.product_revision_level) {
+        desc = product_rev_level_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else {
+        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, index);
+        return UFS_QUERY_RESULT_INVALID_INDEX;
+    }
+    return UFS_QUERY_RESULT_SUCCESS;
+}
+
+static inline InterconnectDescriptor interconnect_desc(void)
+{
+    InterconnectDescriptor desc = {
+        .length = sizeof(InterconnectDescriptor),
+        .descriptor_idn = UFS_QUERY_DESC_IDN_INTERCONNECT,
+    };
+    desc.bcd_unipro_version = cpu_to_be16(0x180);
+    desc.bcd_mphy_version = cpu_to_be16(0x410);
+    return desc;
+}
+
+static QueryRespCode ufs_read_desc(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    QueryRespCode status;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint16_t length = be16_to_cpu(req->req_upiu.qr.length);
+    InterconnectDescriptor desc;
+
+    switch (idn) {
+    case UFS_QUERY_DESC_IDN_DEVICE:
+        memcpy(&req->rsp_upiu.qr.data, &u->device_desc, sizeof(u->device_desc));
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    case UFS_QUERY_DESC_IDN_UNIT:
+        status = ufs_read_unit_desc(req);
+        break;
+    case UFS_QUERY_DESC_IDN_GEOMETRY:
+        memcpy(&req->rsp_upiu.qr.data, &u->geometry_desc,
+               sizeof(u->geometry_desc));
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    case UFS_QUERY_DESC_IDN_INTERCONNECT: {
+        desc = interconnect_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, sizeof(InterconnectDescriptor));
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    }
+    case UFS_QUERY_DESC_IDN_STRING:
+        status = ufs_read_string_desc(req);
+        break;
+    case UFS_QUERY_DESC_IDN_POWER:
+        /* mocking of power descriptor is not supported */
+        memset(&req->rsp_upiu.qr.data, 0, sizeof(PowerParametersDescriptor));
+        req->rsp_upiu.qr.data[0] = sizeof(PowerParametersDescriptor);
+        req->rsp_upiu.qr.data[1] = UFS_QUERY_DESC_IDN_POWER;
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    case UFS_QUERY_DESC_IDN_HEALTH:
+        /* mocking of health descriptor is not supported */
+        memset(&req->rsp_upiu.qr.data, 0, sizeof(DeviceHealthDescriptor));
+        req->rsp_upiu.qr.data[0] = sizeof(DeviceHealthDescriptor);
+        req->rsp_upiu.qr.data[1] = UFS_QUERY_DESC_IDN_HEALTH;
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    default:
+        length = 0;
+        trace_ufs_err_query_invalid_idn(req->req_upiu.qr.opcode, idn);
+        status = UFS_QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (length > req->rsp_upiu.qr.data[0]) {
+        length = req->rsp_upiu.qr.data[0];
+    }
+    req->rsp_upiu.qr.opcode = req->req_upiu.qr.opcode;
+    req->rsp_upiu.qr.idn = req->req_upiu.qr.idn;
+    req->rsp_upiu.qr.index = req->req_upiu.qr.index;
+    req->rsp_upiu.qr.selector = req->req_upiu.qr.selector;
+    req->rsp_upiu.qr.length = cpu_to_be16(length);
+
+    return status;
+}
+
+static QueryRespCode ufs_exec_query_read(UfsRequest *req)
+{
+    QueryRespCode status;
+    switch (req->req_upiu.qr.opcode) {
+    case UFS_UPIU_QUERY_OPCODE_NOP:
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    case UFS_UPIU_QUERY_OPCODE_READ_DESC:
+        status = ufs_read_desc(req);
+        break;
+    case UFS_UPIU_QUERY_OPCODE_READ_ATTR:
+        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_READ);
+        break;
+    case UFS_UPIU_QUERY_OPCODE_READ_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_READ);
+        break;
+    default:
+        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
+        status = UFS_QUERY_RESULT_INVALID_OPCODE;
+        break;
+    }
+
+    return status;
+}
+
+static QueryRespCode ufs_exec_query_write(UfsRequest *req)
+{
+    QueryRespCode status;
+    switch (req->req_upiu.qr.opcode) {
+    case UFS_UPIU_QUERY_OPCODE_NOP:
+        status = UFS_QUERY_RESULT_SUCCESS;
+        break;
+    case UFS_UPIU_QUERY_OPCODE_WRITE_DESC:
+        /* write descriptor is not supported */
+        status = UFS_QUERY_RESULT_NOT_WRITEABLE;
+        break;
+    case UFS_UPIU_QUERY_OPCODE_WRITE_ATTR:
+        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_WRITE);
+        break;
+    case UFS_UPIU_QUERY_OPCODE_SET_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_SET);
+        break;
+    case UFS_UPIU_QUERY_OPCODE_CLEAR_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_CLEAR);
+        break;
+    case UFS_UPIU_QUERY_OPCODE_TOGGLE_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_TOGGLE);
+        break;
+    default:
+        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
+        status = UFS_QUERY_RESULT_INVALID_OPCODE;
+        break;
+    }
+
+    return status;
+}
+
+static UfsReqResult ufs_exec_query_cmd(UfsRequest *req)
+{
+    uint8_t query_func = req->req_upiu.header.query_func;
+    uint16_t data_segment_length;
+    QueryRespCode status;
+
+    trace_ufs_exec_query_cmd(req->slot, req->req_upiu.qr.opcode);
+    if (query_func == UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST) {
+        status = ufs_exec_query_read(req);
+    } else if (query_func == UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST) {
+        status = ufs_exec_query_write(req);
+    } else {
+        status = UFS_QUERY_RESULT_GENERAL_FAILURE;
+    }
+
+    data_segment_length = be16_to_cpu(req->rsp_upiu.qr.length);
+    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_QUERY_RSP, 0, status, 0,
+                          data_segment_length);
+
+    if (status != UFS_QUERY_RESULT_SUCCESS) {
+        return UFS_REQUEST_FAIL;
+    }
+    return UFS_REQUEST_SUCCESS;
+}
+
+static void ufs_exec_req(UfsRequest *req)
+{
+    UfsReqResult req_result;
+
+    if (ufs_dma_read_upiu(req)) {
+        return;
+    }
+
+    switch (req->req_upiu.header.trans_type) {
+    case UFS_UPIU_TRANSACTION_NOP_OUT:
+        req_result = ufs_exec_nop_cmd(req);
+        break;
+    case UFS_UPIU_TRANSACTION_COMMAND:
+        /* Not yet implemented */
+        req_result = UFS_REQUEST_FAIL;
+        break;
+    case UFS_UPIU_TRANSACTION_QUERY_REQ:
+        req_result = ufs_exec_query_cmd(req);
+        break;
+    default:
+        trace_ufs_err_invalid_trans_code(req->slot,
+                                         req->req_upiu.header.trans_type);
+        req_result = UFS_REQUEST_FAIL;
+    }
+
+    ufs_complete_req(req, req_result);
+}
+
+static void ufs_process_req(void *opaque)
+{
+    UfsHc *u = opaque;
+    UfsRequest *req;
+    int slot;
+
+    for (slot = 0; slot < u->params.nutrs; slot++) {
+        req = &u->req_list[slot];
+
+        if (req->state != UFS_REQUEST_READY) {
+            continue;
+        }
+        trace_ufs_process_req(slot);
+        req->state = UFS_REQUEST_RUNNING;
+
+        ufs_exec_req(req);
+    }
+}
+
+static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result)
+{
+    UfsHc *u = req->hc;
+    assert(req->state == UFS_REQUEST_RUNNING);
+
+    if (req_result == UFS_REQUEST_SUCCESS) {
+        req->utrd.header.dword_2 = cpu_to_le32(UFS_OCS_SUCCESS);
+    } else {
+        req->utrd.header.dword_2 = cpu_to_le32(UFS_OCS_INVALID_CMD_TABLE_ATTR);
+    }
+
+    trace_ufs_complete_req(req->slot);
+    req->state = UFS_REQUEST_COMPLETE;
+    qemu_bh_schedule(u->complete_bh);
+}
+
+static void ufs_clear_req(UfsRequest *req)
+{
+    if (req->sg != NULL) {
+        qemu_sglist_destroy(req->sg);
+        g_free(req->sg);
+        req->sg = NULL;
+    }
+
+    memset(&req->utrd, 0, sizeof(req->utrd));
+    memset(&req->req_upiu, 0, sizeof(req->req_upiu));
+    memset(&req->rsp_upiu, 0, sizeof(req->rsp_upiu));
+}
+
+static void ufs_sendback_req(void *opaque)
+{
+    UfsHc *u = opaque;
+    UfsRequest *req;
+    int slot;
+
+    for (slot = 0; slot < u->params.nutrs; slot++) {
+        req = &u->req_list[slot];
+
+        if (req->state != UFS_REQUEST_COMPLETE) {
+            continue;
+        }
+
+        if (ufs_dma_write_upiu(req)) {
+            req->state = UFS_REQUEST_ERROR;
+            continue;
+        }
+
+        /*
+         * TODO: UTP Transfer Request Interrupt Aggregation Control is not yet
+         * supported
+         */
+        if (le32_to_cpu(req->utrd.header.dword_2) != UFS_OCS_SUCCESS ||
+            le32_to_cpu(req->utrd.header.dword_0) & UFS_UTP_REQ_DESC_INT_CMD) {
+            u->reg.is = FIELD_DP32(u->reg.is, IS, UTRCS, 1);
+        }
+
+        u->reg.utrldbr &= ~(1 << slot);
+        u->reg.utrlcnr |= (1 << slot);
+
+        trace_ufs_sendback_req(req->slot);
+
+        ufs_clear_req(req);
+        req->state = UFS_REQUEST_IDLE;
+    }
+
+    ufs_irq_check(u);
+}
+
 static bool ufs_check_constraints(UfsHc *u, Error **errp)
 {
     if (u->params.nutrs > UFS_MAX_NUTRS) {
@@ -XXX,XX +XXX,XX @@ static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
     u->irq = pci_allocate_irq(pci_dev);
 }
 
+static void ufs_init_state(UfsHc *u)
+{
+    u->req_list = g_new0(UfsRequest, u->params.nutrs);
+
+    for (int i = 0; i < u->params.nutrs; i++) {
+        u->req_list[i].hc = u;
+        u->req_list[i].slot = i;
+        u->req_list[i].sg = NULL;
+        u->req_list[i].state = UFS_REQUEST_IDLE;
+    }
+
+    u->doorbell_bh = qemu_bh_new_guarded(ufs_process_req, u,
+                                         &DEVICE(u)->mem_reentrancy_guard);
+    u->complete_bh = qemu_bh_new_guarded(ufs_sendback_req, u,
+                                         &DEVICE(u)->mem_reentrancy_guard);
+}
+
 static void ufs_init_hc(UfsHc *u)
 {
     uint32_t cap = 0;
@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
     cap = FIELD_DP32(cap, CAP, CS, 0);
     u->reg.cap = cap;
     u->reg.ver = UFS_SPEC_VER;
+
+    memset(&u->device_desc, 0, sizeof(DeviceDescriptor));
+    u->device_desc.length = sizeof(DeviceDescriptor);
+    u->device_desc.descriptor_idn = UFS_QUERY_DESC_IDN_DEVICE;
+    u->device_desc.device_sub_class = 0x01;
+    u->device_desc.number_lu = 0x00;
+    u->device_desc.number_wlu = 0x04;
+    /* TODO: Revisit it when Power Management is implemented */
+    u->device_desc.init_power_mode = 0x01; /* Active Mode */
+    u->device_desc.high_priority_lun = 0x7F; /* Same Priority */
+    u->device_desc.spec_version = cpu_to_be16(UFS_SPEC_VER);
+    u->device_desc.manufacturer_name = 0x00;
+    u->device_desc.product_name = 0x01;
+    u->device_desc.serial_number = 0x02;
+    u->device_desc.oem_id = 0x03;
+    u->device_desc.ud_0_base_offset = 0x16;
+    u->device_desc.ud_config_p_length = 0x1A;
+    u->device_desc.device_rtt_cap = 0x02;
+    u->device_desc.queue_depth = u->params.nutrs;
+    u->device_desc.product_revision_level = 0x04;
+
+    memset(&u->geometry_desc, 0, sizeof(GeometryDescriptor));
+    u->geometry_desc.length = sizeof(GeometryDescriptor);
+    u->geometry_desc.descriptor_idn = UFS_QUERY_DESC_IDN_GEOMETRY;
+    u->geometry_desc.max_number_lu = (UFS_MAX_LUS == 32) ? 0x1 : 0x0;
+    u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4KB */
+    u->geometry_desc.allocation_unit_size = 0x1; /* 4KB */
+    u->geometry_desc.min_addr_block_size = 0x8; /* 4KB */
+    u->geometry_desc.max_in_buffer_size = 0x8;
+    u->geometry_desc.max_out_buffer_size = 0x8;
+    u->geometry_desc.rpmb_read_write_size = 0x40;
+    u->geometry_desc.data_ordering =
+        0x0; /* out-of-order data transfer is not supported */
+    u->geometry_desc.max_context_id_number = 0x5;
+    u->geometry_desc.supported_memory_types = cpu_to_be16(0x8001);
+
+    memset(&u->attributes, 0, sizeof(u->attributes));
+    u->attributes.max_data_in_size = 0x08;
+    u->attributes.max_data_out_size = 0x08;
+    u->attributes.ref_clk_freq = 0x01; /* 26 MHz */
+    /* configure descriptor is not supported */
+    u->attributes.config_descr_lock = 0x01;
+    u->attributes.max_num_of_rtt = 0x02;
+
+    memset(&u->flags, 0, sizeof(u->flags));
+    u->flags.permanently_disable_fw_update = 1;
 }
 
 static void ufs_realize(PCIDevice *pci_dev, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
         return;
     }
 
+    ufs_init_state(u);
     ufs_init_hc(u);
     ufs_init_pci(u, pci_dev);
 }
 
+static void ufs_exit(PCIDevice *pci_dev)
+{
+    UfsHc *u = UFS(pci_dev);
+
+    qemu_bh_delete(u->doorbell_bh);
+    qemu_bh_delete(u->complete_bh);
+
+    for (int i = 0; i < u->params.nutrs; i++) {
+        ufs_clear_req(&u->req_list[i]);
+    }
+    g_free(u->req_list);
+}
+
 static Property ufs_props[] = {
     DEFINE_PROP_STRING("serial", UfsHc, params.serial),
     DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
     PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
 
     pc->realize = ufs_realize;
+    pc->exit = ufs_exit;
     pc->vendor_id = PCI_VENDOR_ID_REDHAT;
     pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
     pc->class_id = PCI_CLASS_STORAGE_UFS;
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/trace-events
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@ ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu
 ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
 ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
+ufs_err_utrl_slot_error(uint32_t slot) "UTRLDBR slot %"PRIu32" is in error"
 ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
 ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
 ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@samsung.com>

This commit adds support for ufs logical unit.
The LU handles processing for the SCSI command,
unit descriptor query request.

This commit enables the UFS device to process
IO requests.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: beacc504376ab6a14b1a3830bb3c69382cf6aebc.1693980783.git.jeuk20.kim@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ufs/ufs.h             |   43 ++
 include/scsi/constants.h |    1 +
 hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++++
 hw/ufs/ufs.c             |  252 ++++++-
 hw/ufs/meson.build       |    2 +-
 hw/ufs/trace-events      |   25 +
 6 files changed, 1761 insertions(+), 7 deletions(-)
 create mode 100644 hw/ufs/lu.c

diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.h
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
 #define UFS_MAX_LUS 32
 #define UFS_BLOCK_SIZE 4096
 
+typedef struct UfsBusClass {
+    BusClass parent_class;
+    bool (*parent_check_address)(BusState *bus, DeviceState *dev, Error **errp);
+} UfsBusClass;
+
+typedef struct UfsBus {
+    SCSIBus parent_bus;
+} UfsBus;
+
+#define TYPE_UFS_BUS "ufs-bus"
+DECLARE_OBJ_CHECKERS(UfsBus, UfsBusClass, UFS_BUS, TYPE_UFS_BUS)
+
 typedef enum UfsRequestState {
     UFS_REQUEST_IDLE = 0,
     UFS_REQUEST_READY = 1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsRequestState {
 typedef enum UfsReqResult {
     UFS_REQUEST_SUCCESS = 0,
     UFS_REQUEST_FAIL = 1,
+    UFS_REQUEST_NO_COMPLETE = 2,
 } UfsReqResult;
 
 typedef struct UfsRequest {
@@ -XXX,XX +XXX,XX @@ typedef struct UfsRequest {
     QEMUSGList *sg;
 } UfsRequest;
 
+typedef struct UfsLu {
+    SCSIDevice qdev;
+    uint8_t lun;
+    UnitDescriptor unit_desc;
+} UfsLu;
+
+typedef struct UfsWLu {
+    SCSIDevice qdev;
+    uint8_t lun;
+} UfsWLu;
+
 typedef struct UfsParams {
     char *serial;
     uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsParams {
 
 typedef struct UfsHc {
     PCIDevice parent_obj;
+    UfsBus bus;
     MemoryRegion iomem;
     UfsReg reg;
     UfsParams params;
     uint32_t reg_size;
     UfsRequest *req_list;
 
+    UfsLu *lus[UFS_MAX_LUS];
+    UfsWLu *report_wlu;
+    UfsWLu *dev_wlu;
+    UfsWLu *boot_wlu;
+    UfsWLu *rpmb_wlu;
     DeviceDescriptor device_desc;
     GeometryDescriptor geometry_desc;
     Attributes attributes;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
 #define TYPE_UFS "ufs"
 #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 
+#define TYPE_UFS_LU "ufs-lu"
+#define UFSLU(obj) OBJECT_CHECK(UfsLu, (obj), TYPE_UFS_LU)
+
+#define TYPE_UFS_WLU "ufs-wlu"
+#define UFSWLU(obj) OBJECT_CHECK(UfsWLu, (obj), TYPE_UFS_WLU)
+
 typedef enum UfsQueryFlagPerm {
     UFS_QUERY_FLAG_NONE = 0x0,
     UFS_QUERY_FLAG_READ = 0x1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsQueryAttrPerm {
     UFS_QUERY_ATTR_WRITE = 0x2,
 } UfsQueryAttrPerm;
 
+static inline bool is_wlun(uint8_t lun)
+{
+    return (lun == UFS_UPIU_REPORT_LUNS_WLUN ||
+            lun == UFS_UPIU_UFS_DEVICE_WLUN || lun == UFS_UPIU_BOOT_WLUN ||
+            lun == UFS_UPIU_RPMB_WLUN);
+}
+
 #endif /* HW_UFS_UFS_H */
diff --git a/include/scsi/constants.h b/include/scsi/constants.h
index XXXXXXX..XXXXXXX 100644
--- a/include/scsi/constants.h
+++ b/include/scsi/constants.h
@@ -XXX,XX +XXX,XX @@
 #define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
 #define MODE_PAGE_CACHING                     0x08
 #define MODE_PAGE_AUDIO_CTL                   0x0e
+#define MODE_PAGE_CONTROL                     0x0a
 #define MODE_PAGE_POWER                       0x1a
 #define MODE_PAGE_FAULT_FAIL                  0x1c
 #define MODE_PAGE_TO_PROTECT                  0x1d
diff --git a/hw/ufs/lu.c b/hw/ufs/lu.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/lu.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU UFS Logical Unit
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * This code is licensed under the GNU GPL v2 or later.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/units.h"
+#include "qapi/error.h"
+#include "qemu/memalign.h"
+#include "hw/scsi/scsi.h"
+#include "scsi/constants.h"
+#include "sysemu/block-backend.h"
+#include "qemu/cutils.h"
+#include "trace.h"
+#include "ufs.h"
+
+/*
+ * The code below handling SCSI commands is copied from hw/scsi/scsi-disk.c,
+ * with minor adjustments to make it work for UFS.
+ */
+
+#define SCSI_DMA_BUF_SIZE (128 * KiB)
+#define SCSI_MAX_INQUIRY_LEN 256
+#define SCSI_INQUIRY_DATA_SIZE 36
+#define SCSI_MAX_MODE_LEN 256
+
+typedef struct UfsSCSIReq {
+    SCSIRequest req;
+    /* Both sector and sector_count are in terms of BDRV_SECTOR_SIZE bytes.  */
+    uint64_t sector;
+    uint32_t sector_count;
+    uint32_t buflen;
+    bool started;
+    bool need_fua_emulation;
+    struct iovec iov;
+    QEMUIOVector qiov;
+    BlockAcctCookie acct;
+} UfsSCSIReq;
+
+static void ufs_scsi_free_request(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    qemu_vfree(r->iov.iov_base);
+}
+
+static void scsi_check_condition(UfsSCSIReq *r, SCSISense sense)
+{
+    trace_ufs_scsi_check_condition(r->req.tag, sense.key, sense.asc,
+                                   sense.ascq);
+    scsi_req_build_sense(&r->req, sense);
+    scsi_req_complete(&r->req, CHECK_CONDITION);
+}
+
+static int ufs_scsi_emulate_vpd_page(SCSIRequest *req, uint8_t *outbuf,
+                                     uint32_t outbuf_len)
+{
+    UfsHc *u = UFS(req->bus->qbus.parent);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint8_t page_code = req->cmd.buf[2];
+    int start, buflen = 0;
+
+    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
+        return -1;
+    }
+
+    outbuf[buflen++] = lu->qdev.type & 0x1f;
+    outbuf[buflen++] = page_code;
+    outbuf[buflen++] = 0x00;
+    outbuf[buflen++] = 0x00;
+    start = buflen;
+
+    switch (page_code) {
+    case 0x00: /* Supported page codes, mandatory */
+    {
+        trace_ufs_scsi_emulate_vpd_page_00(req->cmd.xfer);
+        outbuf[buflen++] = 0x00; /* list of supported pages (this page) */
+        if (u->params.serial) {
+            outbuf[buflen++] = 0x80; /* unit serial number */
+        }
+        outbuf[buflen++] = 0x87; /* mode page policy */
+        break;
+    }
+    case 0x80: /* Device serial number, optional */
+    {
+        int l;
+
+        if (!u->params.serial) {
+            trace_ufs_scsi_emulate_vpd_page_80_not_supported();
+            return -1;
+        }
+
+        l = strlen(u->params.serial);
+        if (l > SCSI_INQUIRY_DATA_SIZE) {
+            l = SCSI_INQUIRY_DATA_SIZE;
+        }
+
+        trace_ufs_scsi_emulate_vpd_page_80(req->cmd.xfer);
+        memcpy(outbuf + buflen, u->params.serial, l);
+        buflen += l;
+        break;
+    }
+    case 0x87: /* Mode Page Policy, mandatory */
+    {
+        trace_ufs_scsi_emulate_vpd_page_87(req->cmd.xfer);
+        outbuf[buflen++] = 0x3f; /* apply to all mode pages and subpages */
+        outbuf[buflen++] = 0xff;
+        outbuf[buflen++] = 0; /* shared */
+        outbuf[buflen++] = 0;
+        break;
+    }
+    default:
+        return -1;
+    }
+    /* done with EVPD */
+    assert(buflen - start <= 255);
+    outbuf[start - 1] = buflen - start;
+    return buflen;
+}
+
+static int ufs_scsi_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf,
+                                    uint32_t outbuf_len)
+{
+    int buflen = 0;
+
+    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
+        return -1;
+    }
+
+    if (req->cmd.buf[1] & 0x1) {
+        /* Vital product data */
+        return ufs_scsi_emulate_vpd_page(req, outbuf, outbuf_len);
+    }
+
+    /* Standard INQUIRY data */
+    if (req->cmd.buf[2] != 0) {
+        return -1;
+    }
+
+    /* PAGE CODE == 0 */
+    buflen = req->cmd.xfer;
+    if (buflen > SCSI_MAX_INQUIRY_LEN) {
+        buflen = SCSI_MAX_INQUIRY_LEN;
+    }
+
+    if (is_wlun(req->lun)) {
+        outbuf[0] = TYPE_WLUN;
+    } else {
+        outbuf[0] = 0;
+    }
+    outbuf[1] = 0;
+
+    strpadcpy((char *)&outbuf[16], 16, "QEMU UFS", ' ');
+    strpadcpy((char *)&outbuf[8], 8, "QEMU", ' ');
+
+    memset(&outbuf[32], 0, 4);
+
+    outbuf[2] = 0x06; /* SPC-4 */
+    outbuf[3] = 0x2;
+
+    if (buflen > SCSI_INQUIRY_DATA_SIZE) {
+        outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */
+    } else {
+        /*
+         * If the allocation length of CDB is too small, the additional
+         * length is not adjusted
+         */
+        outbuf[4] = SCSI_INQUIRY_DATA_SIZE - 5;
+    }
+
+    /* Support TCQ.  */
+    outbuf[7] = req->bus->info->tcq ? 0x02 : 0;
+    return buflen;
+}
+
+static int mode_sense_page(UfsLu *lu, int page, uint8_t **p_outbuf,
+                           int page_control)
+{
+    static const int mode_sense_valid[0x3f] = {
+        [MODE_PAGE_CACHING] = 1,
+        [MODE_PAGE_R_W_ERROR] = 1,
+        [MODE_PAGE_CONTROL] = 1,
+    };
+
+    uint8_t *p = *p_outbuf + 2;
+    int length;
+
+    assert(page < ARRAY_SIZE(mode_sense_valid));
+    if ((mode_sense_valid[page]) == 0) {
+        return -1;
+    }
+
+    /*
+     * If Changeable Values are requested, a mask denoting those mode parameters
+     * that are changeable shall be returned. As we currently don't support
+     * parameter changes via MODE_SELECT all bits are returned set to zero.
+     * The buffer was already memset to zero by the caller of this function.
+     */
+    switch (page) {
+    case MODE_PAGE_CACHING:
+        length = 0x12;
+        if (page_control == 1 || /* Changeable Values */
+            blk_enable_write_cache(lu->qdev.conf.blk)) {
+            p[0] = 4; /* WCE */
+        }
+        break;
+
+    case MODE_PAGE_R_W_ERROR:
+        length = 10;
+        if (page_control == 1) { /* Changeable Values */
+            break;
+        }
+        p[0] = 0x80; /* Automatic Write Reallocation Enabled */
+        break;
+
+    case MODE_PAGE_CONTROL:
+        length = 10;
+        if (page_control == 1) { /* Changeable Values */
+            break;
+        }
+        p[1] = 0x10; /* Queue Algorithm modifier */
+        p[8] = 0xff; /* Busy Timeout Period */
+        p[9] = 0xff;
+        break;
+
+    default:
+        return -1;
+    }
+
+    assert(length < 256);
+    (*p_outbuf)[0] = page;
+    (*p_outbuf)[1] = length;
+    *p_outbuf += length + 2;
+    return length + 2;
+}
+
+static int ufs_scsi_emulate_mode_sense(UfsSCSIReq *r, uint8_t *outbuf)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    bool dbd;
+    int page, buflen, ret, page_control;
+    uint8_t *p;
+    uint8_t dev_specific_param = 0;
+
+    dbd = (r->req.cmd.buf[1] & 0x8) != 0;
+    if (!dbd) {
+        return -1;
+    }
+
+    page = r->req.cmd.buf[2] & 0x3f;
+    page_control = (r->req.cmd.buf[2] & 0xc0) >> 6;
+
+    trace_ufs_scsi_emulate_mode_sense((r->req.cmd.buf[0] == MODE_SENSE) ? 6 :
+                                                                          10,
+                                      page, r->req.cmd.xfer, page_control);
+    memset(outbuf, 0, r->req.cmd.xfer);
+    p = outbuf;
+
+    if (!blk_is_writable(lu->qdev.conf.blk)) {
+        dev_specific_param |= 0x80; /* Readonly.  */
+    }
+
+    p[2] = 0; /* Medium type.  */
+    p[3] = dev_specific_param;
+    p[6] = p[7] = 0; /* Block descriptor length.  */
+    p += 8;
+
+    if (page_control == 3) {
+        /* Saved Values */
+        scsi_check_condition(r, SENSE_CODE(SAVING_PARAMS_NOT_SUPPORTED));
+        return -1;
+    }
+
+    if (page == 0x3f) {
+        for (page = 0; page <= 0x3e; page++) {
+            mode_sense_page(lu, page, &p, page_control);
+        }
+    } else {
+        ret = mode_sense_page(lu, page, &p, page_control);
+        if (ret == -1) {
+            return -1;
+        }
+    }
+
+    buflen = p - outbuf;
+    /*
+     * The mode data length field specifies the length in bytes of the
+     * following data that is available to be transferred. The mode data
+     * length does not include itself.
+     */
+    outbuf[0] = ((buflen - 2) >> 8) & 0xff;
+    outbuf[1] = (buflen - 2) & 0xff;
+    return buflen;
+}
+
+/*
+ * scsi_handle_rw_error has two return values.  False means that the error
+ * must be ignored, true means that the error has been processed and the
+ * caller should not do anything else for this request.  Note that
+ * scsi_handle_rw_error always manages its reference counts, independent
+ * of the return value.
+ */
+static bool scsi_handle_rw_error(UfsSCSIReq *r, int ret, bool acct_failed)
+{
+    bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    SCSISense sense = SENSE_CODE(NO_SENSE);
+    int error = 0;
+    bool req_has_sense = false;
+    BlockErrorAction action;
+    int status;
+
+    if (ret < 0) {
+        status = scsi_sense_from_errno(-ret, &sense);
+        error = -ret;
+    } else {
+        /* A passthrough command has completed with nonzero status.  */
+        status = ret;
+        if (status == CHECK_CONDITION) {
+            req_has_sense = true;
+            error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
+        } else {
+            error = EINVAL;
+        }
+    }
+
+    /*
+     * Check whether the error has to be handled by the guest or should
+     * rather follow the rerror=/werror= settings.  Guest-handled errors
+     * are usually retried immediately, so do not post them to QMP and
+     * do not account them as failed I/O.
+     */
+    if (req_has_sense && scsi_sense_buf_is_guest_recoverable(
+                             r->req.sense, sizeof(r->req.sense))) {
+        action = BLOCK_ERROR_ACTION_REPORT;
+        acct_failed = false;
+    } else {
+        action = blk_get_error_action(lu->qdev.conf.blk, is_read, error);
+        blk_error_action(lu->qdev.conf.blk, action, is_read, error);
+    }
+
+    switch (action) {
+    case BLOCK_ERROR_ACTION_REPORT:
+        if (acct_failed) {
+            block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+        }
+        if (!req_has_sense && status == CHECK_CONDITION) {
+            scsi_req_build_sense(&r->req, sense);
+        }
+        scsi_req_complete(&r->req, status);
+        return true;
+
+    case BLOCK_ERROR_ACTION_IGNORE:
+        return false;
+
+    case BLOCK_ERROR_ACTION_STOP:
+        scsi_req_retry(&r->req);
+        return true;
+
+    default:
+        g_assert_not_reached();
+    }
+}
+
+static bool ufs_scsi_req_check_error(UfsSCSIReq *r, int ret, bool acct_failed)
+{
+    if (r->req.io_canceled) {
+        scsi_req_cancel_complete(&r->req);
+        return true;
+    }
+
+    if (ret < 0) {
+        return scsi_handle_rw_error(r, ret, acct_failed);
+    }
+
+    return false;
+}
+
+static void scsi_aio_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ufs_scsi_req_check_error(r, ret, true)) {
+        goto done;
+    }
+
+    block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    scsi_req_complete(&r->req, GOOD);
+
+done:
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+    scsi_req_unref(&r->req);
+}
+
+static int32_t ufs_scsi_emulate_command(SCSIRequest *req, uint8_t *buf)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint32_t last_block = 0;
+    uint8_t *outbuf;
+    int buflen;
+
+    switch (req->cmd.buf[0]) {
+    case INQUIRY:
+    case MODE_SENSE_10:
+    case START_STOP:
+    case REQUEST_SENSE:
+        break;
+
+    default:
+        if (!blk_is_available(lu->qdev.conf.blk)) {
+            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
+            return 0;
+        }
+        break;
+    }
+
+    /*
+     * FIXME: we shouldn't return anything bigger than 4k, but the code
+     * requires the buffer to be as big as req->cmd.xfer in several
+     * places.  So, do not allow CDBs with a very large ALLOCATION
+     * LENGTH.  The real fix would be to modify scsi_read_data and
+     * dma_buf_read, so that they return data beyond the buflen
+     * as all zeros.
+     */
+    if (req->cmd.xfer > 65536) {
+        goto illegal_request;
+    }
+    r->buflen = MAX(4096, req->cmd.xfer);
+
+    if (!r->iov.iov_base) {
+        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
+    }
+
+    outbuf = r->iov.iov_base;
+    memset(outbuf, 0, r->buflen);
+    switch (req->cmd.buf[0]) {
+    case TEST_UNIT_READY:
+        assert(blk_is_available(lu->qdev.conf.blk));
+        break;
+    case INQUIRY:
+        buflen = ufs_scsi_emulate_inquiry(req, outbuf, r->buflen);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case MODE_SENSE_10:
+        buflen = ufs_scsi_emulate_mode_sense(r, outbuf);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case READ_CAPACITY_10:
+        /* The normal LEN field for this command is zero.  */
+        memset(outbuf, 0, 8);
+        if (lu->qdev.max_lba > 0) {
+            last_block = lu->qdev.max_lba - 1;
+        };
+        outbuf[0] = (last_block >> 24) & 0xff;
+        outbuf[1] = (last_block >> 16) & 0xff;
+        outbuf[2] = (last_block >> 8) & 0xff;
+        outbuf[3] = last_block & 0xff;
+        outbuf[4] = (lu->qdev.blocksize >> 24) & 0xff;
+        outbuf[5] = (lu->qdev.blocksize >> 16) & 0xff;
+        outbuf[6] = (lu->qdev.blocksize >> 8) & 0xff;
+        outbuf[7] = lu->qdev.blocksize & 0xff;
+        break;
+    case REQUEST_SENSE:
+        /* Just return "NO SENSE".  */
+        buflen = scsi_convert_sense(NULL, 0, outbuf, r->buflen,
+                                    (req->cmd.buf[1] & 1) == 0);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case SYNCHRONIZE_CACHE:
+        /* The request is used as the AIO opaque value, so add a ref.  */
+        scsi_req_ref(&r->req);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return 0;
+    case VERIFY_10:
+        trace_ufs_scsi_emulate_command_VERIFY((req->cmd.buf[1] >> 1) & 3);
+        if (req->cmd.buf[1] & 6) {
+            goto illegal_request;
+        }
+        break;
+    case SERVICE_ACTION_IN_16:
+        /* Service Action In subcommands. */
+        if ((req->cmd.buf[1] & 31) == SAI_READ_CAPACITY_16) {
+            trace_ufs_scsi_emulate_command_SAI_16();
+            memset(outbuf, 0, req->cmd.xfer);
+
+            if (lu->qdev.max_lba > 0) {
+                last_block = lu->qdev.max_lba - 1;
+            };
+            outbuf[0] = 0;
+            outbuf[1] = 0;
+            outbuf[2] = 0;
+            outbuf[3] = 0;
+            outbuf[4] = (last_block >> 24) & 0xff;
+            outbuf[5] = (last_block >> 16) & 0xff;
+            outbuf[6] = (last_block >> 8) & 0xff;
+            outbuf[7] = last_block & 0xff;
+            outbuf[8] = (lu->qdev.blocksize >> 24) & 0xff;
+            outbuf[9] = (lu->qdev.blocksize >> 16) & 0xff;
+            outbuf[10] = (lu->qdev.blocksize >> 8) & 0xff;
+            outbuf[11] = lu->qdev.blocksize & 0xff;
+            outbuf[12] = 0;
+            outbuf[13] = get_physical_block_exp(&lu->qdev.conf);
+
+            if (lu->unit_desc.provisioning_type == 2 ||
+                lu->unit_desc.provisioning_type == 3) {
+                outbuf[14] = 0x80;
+            }
+            /* Protection, exponent and lowest lba field left blank. */
+            break;
+        }
+        trace_ufs_scsi_emulate_command_SAI_unsupported();
+        goto illegal_request;
+    case MODE_SELECT_10:
+        trace_ufs_scsi_emulate_command_MODE_SELECT_10(r->req.cmd.xfer);
+        break;
+    case START_STOP:
+        /*
+         * TODO: START_STOP is not yet implemented. It always returns success.
+         * Revisit it when ufs power management is implemented.
+         */
+        trace_ufs_scsi_emulate_command_START_STOP();
+        break;
+    case FORMAT_UNIT:
+        trace_ufs_scsi_emulate_command_FORMAT_UNIT();
+        break;
+    case SEND_DIAGNOSTIC:
+        trace_ufs_scsi_emulate_command_SEND_DIAGNOSTIC();
+        break;
+    default:
+        trace_ufs_scsi_emulate_command_UNKNOWN(buf[0],
+                                               scsi_command_name(buf[0]));
+        scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
+        return 0;
+    }
+    assert(!r->req.aiocb);
+    r->iov.iov_len = MIN(r->buflen, req->cmd.xfer);
+    if (r->iov.iov_len == 0) {
+        scsi_req_complete(&r->req, GOOD);
+    }
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        assert(r->iov.iov_len == req->cmd.xfer);
+        return -r->iov.iov_len;
+    } else {
+        return r->iov.iov_len;
+    }
+
+illegal_request:
+    if (r->req.status == -1) {
+        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+    }
+    return 0;
+}
+
+static void ufs_scsi_emulate_read_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    int buflen = r->iov.iov_len;
+
+    if (buflen) {
+        trace_ufs_scsi_emulate_read_data(buflen);
+        r->iov.iov_len = 0;
+        r->started = true;
+        scsi_req_data(&r->req, buflen);
+        return;
+    }
+
+    /* This also clears the sense buffer for REQUEST SENSE.  */
+    scsi_req_complete(&r->req, GOOD);
+}
+
+static int ufs_scsi_check_mode_select(UfsLu *lu, int page, uint8_t *inbuf,
+                                      int inlen)
+{
+    uint8_t mode_current[SCSI_MAX_MODE_LEN];
+    uint8_t mode_changeable[SCSI_MAX_MODE_LEN];
+    uint8_t *p;
+    int len, expected_len, changeable_len, i;
+
+    /*
+     * The input buffer does not include the page header, so it is
+     * off by 2 bytes.
+     */
+    expected_len = inlen + 2;
+    if (expected_len > SCSI_MAX_MODE_LEN) {
+        return -1;
+    }
+
+    /* MODE_PAGE_ALLS is only valid for MODE SENSE commands */
+    if (page == MODE_PAGE_ALLS) {
+        return -1;
+    }
+
+    p = mode_current;
+    memset(mode_current, 0, inlen + 2);
+    len = mode_sense_page(lu, page, &p, 0);
+    if (len < 0 || len != expected_len) {
+        return -1;
+    }
+
+    p = mode_changeable;
+    memset(mode_changeable, 0, inlen + 2);
+    changeable_len = mode_sense_page(lu, page, &p, 1);
+    assert(changeable_len == len);
+
+    /*
+     * Check that unchangeable bits are the same as what MODE SENSE
+     * would return.
+     */
+    for (i = 2; i < len; i++) {
+        if (((mode_current[i] ^ inbuf[i - 2]) & ~mode_changeable[i]) != 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static void ufs_scsi_apply_mode_select(UfsLu *lu, int page, uint8_t *p)
+{
+    switch (page) {
+    case MODE_PAGE_CACHING:
+        blk_set_enable_write_cache(lu->qdev.conf.blk, (p[0] & 4) != 0);
+        break;
+
+    default:
+        break;
+    }
+}
+
+static int mode_select_pages(UfsSCSIReq *r, uint8_t *p, int len, bool change)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    while (len > 0) {
+        int page, page_len;
+
+        page = p[0] & 0x3f;
+        if (p[0] & 0x40) {
+            goto invalid_param;
+        } else {
+            if (len < 2) {
+                goto invalid_param_len;
+            }
+            page_len = p[1];
+            p += 2;
+            len -= 2;
+        }
+
+        if (page_len > len) {
+            goto invalid_param_len;
+        }
+
+        if (!change) {
+            if (ufs_scsi_check_mode_select(lu, page, p, page_len) < 0) {
+                goto invalid_param;
+            }
+        } else {
+            ufs_scsi_apply_mode_select(lu, page, p);
+        }
+
+        p += page_len;
+        len -= page_len;
+    }
+    return 0;
+
+invalid_param:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
+    return -1;
+
+invalid_param_len:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+    return -1;
+}
+
+static void ufs_scsi_emulate_mode_select(UfsSCSIReq *r, uint8_t *inbuf)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    uint8_t *p = inbuf;
+    int len = r->req.cmd.xfer;
+    int hdr_len = 8;
+    int bd_len;
+    int pass;
+
+    /* We only support PF=1, SP=0.  */
+    if ((r->req.cmd.buf[1] & 0x11) != 0x10) {
+        goto invalid_field;
+    }
+
+    if (len < hdr_len) {
+        goto invalid_param_len;
+    }
+
+    bd_len = lduw_be_p(&p[6]);
+    if (bd_len != 0) {
+        goto invalid_param;
+    }
+
+    len -= hdr_len;
+    p += hdr_len;
+
+    /* Ensure no change is made if there is an error!  */
+    for (pass = 0; pass < 2; pass++) {
+        if (mode_select_pages(r, p, len, pass == 1) < 0) {
+            assert(pass == 0);
+            return;
+        }
+    }
+
+    if (!blk_enable_write_cache(lu->qdev.conf.blk)) {
+        /* The request is used as the AIO opaque value, so add a ref.  */
+        scsi_req_ref(&r->req);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return;
+    }
+
+    scsi_req_complete(&r->req, GOOD);
+    return;
+
+invalid_param:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
+    return;
+
+invalid_param_len:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+    return;
+
+invalid_field:
+    scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+}
+
+/* block_num and nb_blocks expected to be in qdev blocksize */
+static inline bool check_lba_range(UfsLu *lu, uint64_t block_num,
+                                   uint32_t nb_blocks)
+{
+    /*
+     * The first line tests that no overflow happens when computing the last
+     * block.  The second line tests that the last accessed block is in
+     * range.
+     *
+     * Careful, the computations should not underflow for nb_blocks == 0,
+     * and a 0-block read to the first LBA beyond the end of device is
+     * valid.
+     */
+    return (block_num <= block_num + nb_blocks &&
+            block_num + nb_blocks <= lu->qdev.max_lba + 1);
+}
+
+static void ufs_scsi_emulate_write_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    if (r->iov.iov_len) {
+        int buflen = r->iov.iov_len;
+        trace_ufs_scsi_emulate_write_data(buflen);
+        r->iov.iov_len = 0;
+        scsi_req_data(&r->req, buflen);
+        return;
+    }
+
+    switch (req->cmd.buf[0]) {
+    case MODE_SELECT_10:
+        /* This also clears the sense buffer for REQUEST SENSE.  */
+        ufs_scsi_emulate_mode_select(r, r->iov.iov_base);
+        break;
+    default:
+        abort();
+    }
+}
+
+/* Return a pointer to the data buffer.  */
+static uint8_t *ufs_scsi_get_buf(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    return (uint8_t *)r->iov.iov_base;
+}
+
+static int32_t ufs_scsi_dma_command(SCSIRequest *req, uint8_t *buf)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint32_t len;
+    uint8_t command;
+
+    command = buf[0];
+
+    if (!blk_is_available(lu->qdev.conf.blk)) {
+        scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
+        return 0;
+    }
+
+    len = scsi_data_cdb_xfer(r->req.cmd.buf);
+    switch (command) {
+    case READ_6:
+    case READ_10:
+        trace_ufs_scsi_dma_command_READ(r->req.cmd.lba, len);
+        if (r->req.cmd.buf[1] & 0xe0) {
+            goto illegal_request;
+        }
+        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
+            goto illegal_lba;
+        }
+        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        break;
+    case WRITE_6:
+    case WRITE_10:
+        trace_ufs_scsi_dma_command_WRITE(r->req.cmd.lba, len);
+        if (!blk_is_writable(lu->qdev.conf.blk)) {
+            scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
+            return 0;
+        }
+        if (r->req.cmd.buf[1] & 0xe0) {
+            goto illegal_request;
+        }
+        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
+            goto illegal_lba;
+        }
+        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        break;
+    default:
+        abort();
+    illegal_request:
+        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+        return 0;
+    illegal_lba:
+        scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
+        return 0;
+    }
+    r->need_fua_emulation = ((r->req.cmd.buf[1] & 8) != 0);
+    if (r->sector_count == 0) {
+        scsi_req_complete(&r->req, GOOD);
+    }
+    assert(r->iov.iov_len == 0);
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        return -r->sector_count * BDRV_SECTOR_SIZE;
+    } else {
+        return r->sector_count * BDRV_SECTOR_SIZE;
+    }
+}
+
+static void scsi_write_do_fua(UfsSCSIReq *r)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb == NULL);
+    assert(!r->req.io_canceled);
+
+    if (r->need_fua_emulation) {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return;
+    }
+
+    scsi_req_complete(&r->req, GOOD);
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_dma_complete_noio(UfsSCSIReq *r, int ret)
+{
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    r->sector += r->sector_count;
+    r->sector_count = 0;
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        scsi_write_do_fua(r);
+        return;
+    } else {
+        scsi_req_complete(&r->req, GOOD);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_dma_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_dma_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+static BlockAIOCB *scsi_dma_readv(int64_t offset, QEMUIOVector *iov,
+                                  BlockCompletionFunc *cb, void *cb_opaque,
+                                  void *opaque)
+{
+    UfsSCSIReq *r = opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    return blk_aio_preadv(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
+}
+
+static void scsi_init_iovec(UfsSCSIReq *r, size_t size)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    if (!r->iov.iov_base) {
+        r->buflen = size;
+        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
+    }
+    r->iov.iov_len = MIN(r->sector_count * BDRV_SECTOR_SIZE, r->buflen);
+    qemu_iovec_init_external(&r->qiov, &r->iov, 1);
+}
+
+static void scsi_read_complete_noio(UfsSCSIReq *r, int ret)
+{
+    uint32_t n;
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    n = r->qiov.size / BDRV_SECTOR_SIZE;
+    r->sector += n;
+    r->sector_count -= n;
+    scsi_req_data(&r->req, r->qiov.size);
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_read_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+    trace_ufs_scsi_read_data_count(r->sector_count);
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+        trace_ufs_scsi_read_complete(r->req.tag, r->qiov.size);
+    }
+    scsi_read_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+/* Actually issue a read to the block device.  */
+static void scsi_do_read(UfsSCSIReq *r, int ret)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+
+    if (r->req.sg) {
+        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_READ);
+        r->req.residual -= r->req.sg->size;
+        r->req.aiocb = dma_blk_io(
+            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
+            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_readv, r,
+            scsi_dma_complete, r, DMA_DIRECTION_FROM_DEVICE);
+    } else {
+        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
+                         r->qiov.size, BLOCK_ACCT_READ);
+        r->req.aiocb = scsi_dma_readv(r->sector << BDRV_SECTOR_BITS, &r->qiov,
+                                      scsi_read_complete, r, r);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_do_read_cb(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_do_read(opaque, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+/* Read more data from scsi device into buffer.  */
+static void scsi_read_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    bool first;
+
+    trace_ufs_scsi_read_data_count(r->sector_count);
+    if (r->sector_count == 0) {
+        /* This also clears the sense buffer for REQUEST SENSE.  */
+        scsi_req_complete(&r->req, GOOD);
+        return;
+    }
+
+    /* No data transfer may already be in progress */
+    assert(r->req.aiocb == NULL);
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        trace_ufs_scsi_read_data_invalid();
+        scsi_read_complete_noio(r, -EINVAL);
+        return;
+    }
+
+    if (!blk_is_available(req->dev->conf.blk)) {
+        scsi_read_complete_noio(r, -ENOMEDIUM);
+        return;
+    }
+
+    first = !r->started;
+    r->started = true;
+    if (first && r->need_fua_emulation) {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_do_read_cb, r);
+    } else {
+        scsi_do_read(r, 0);
+    }
+}
+
+static void scsi_write_complete_noio(UfsSCSIReq *r, int ret)
+{
+    uint32_t n;
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    n = r->qiov.size / BDRV_SECTOR_SIZE;
+    r->sector += n;
+    r->sector_count -= n;
+    if (r->sector_count == 0) {
+        scsi_write_do_fua(r);
+        return;
+    } else {
+        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
+        trace_ufs_scsi_write_complete_noio(r->req.tag, r->qiov.size);
+        scsi_req_data(&r->req, r->qiov.size);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_write_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_write_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+static BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVector *iov,
+                                   BlockCompletionFunc *cb, void *cb_opaque,
+                                   void *opaque)
+{
+    UfsSCSIReq *r = opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    return blk_aio_pwritev(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
+}
+
+static void scsi_write_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    /* No data transfer may already be in progress */
+    assert(r->req.aiocb == NULL);
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+    if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
+        trace_ufs_scsi_write_data_invalid();
+        scsi_write_complete_noio(r, -EINVAL);
+        return;
+    }
+
+    if (!r->req.sg && !r->qiov.size) {
+        /* Called for the first time.  Ask the driver to send us more data.  */
+        r->started = true;
+        scsi_write_complete_noio(r, 0);
+        return;
+    }
+    if (!blk_is_available(req->dev->conf.blk)) {
+        scsi_write_complete_noio(r, -ENOMEDIUM);
+        return;
+    }
+
+    if (r->req.sg) {
+        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg,
+                       BLOCK_ACCT_WRITE);
+        r->req.residual -= r->req.sg->size;
+        r->req.aiocb = dma_blk_io(
+            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
+            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_writev, r,
+            scsi_dma_complete, r, DMA_DIRECTION_TO_DEVICE);
+    } else {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
+                         r->qiov.size, BLOCK_ACCT_WRITE);
+        r->req.aiocb = scsi_dma_writev(r->sector << BDRV_SECTOR_BITS, &r->qiov,
+                                       scsi_write_complete, r, r);
+    }
+}
+
+static const SCSIReqOps ufs_scsi_emulate_reqops = {
+    .size = sizeof(UfsSCSIReq),
+    .free_req = ufs_scsi_free_request,
+    .send_command = ufs_scsi_emulate_command,
+    .read_data = ufs_scsi_emulate_read_data,
+    .write_data = ufs_scsi_emulate_write_data,
+    .get_buf = ufs_scsi_get_buf,
+};
+
+static const SCSIReqOps ufs_scsi_dma_reqops = {
+    .size = sizeof(UfsSCSIReq),
+    .free_req = ufs_scsi_free_request,
+    .send_command = ufs_scsi_dma_command,
+    .read_data = scsi_read_data,
+    .write_data = scsi_write_data,
+    .get_buf = ufs_scsi_get_buf,
+};
+
+/*
+ * Following commands are not yet supported
+ * PRE_FETCH(10),
+ * UNMAP,
+ * WRITE_BUFFER, READ_BUFFER,
+ * SECURITY_PROTOCOL_IN, SECURITY_PROTOCOL_OUT
+ */
+static const SCSIReqOps *const ufs_scsi_reqops_dispatch[256] = {
+    [TEST_UNIT_READY] = &ufs_scsi_emulate_reqops,
+    [INQUIRY] = &ufs_scsi_emulate_reqops,
+    [MODE_SENSE_10] = &ufs_scsi_emulate_reqops,
+    [START_STOP] = &ufs_scsi_emulate_reqops,
+    [READ_CAPACITY_10] = &ufs_scsi_emulate_reqops,
+    [REQUEST_SENSE] = &ufs_scsi_emulate_reqops,
+    [SYNCHRONIZE_CACHE] = &ufs_scsi_emulate_reqops,
+    [MODE_SELECT_10] = &ufs_scsi_emulate_reqops,
+    [VERIFY_10] = &ufs_scsi_emulate_reqops,
+    [FORMAT_UNIT] = &ufs_scsi_emulate_reqops,
+    [SERVICE_ACTION_IN_16] = &ufs_scsi_emulate_reqops,
+    [SEND_DIAGNOSTIC] = &ufs_scsi_emulate_reqops,
+
+    [READ_6] = &ufs_scsi_dma_reqops,
+    [READ_10] = &ufs_scsi_dma_reqops,
+    [WRITE_6] = &ufs_scsi_dma_reqops,
+    [WRITE_10] = &ufs_scsi_dma_reqops,
+};
+
+static SCSIRequest *scsi_new_request(SCSIDevice *dev, uint32_t tag,
+                                     uint32_t lun, uint8_t *buf,
+                                     void *hba_private)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+    SCSIRequest *req;
+    const SCSIReqOps *ops;
+    uint8_t command;
+
+    command = buf[0];
+    ops = ufs_scsi_reqops_dispatch[command];
+    if (!ops) {
+        ops = &ufs_scsi_emulate_reqops;
+    }
+    req = scsi_req_alloc(ops, &lu->qdev, tag, lun, hba_private);
+
+    return req;
+}
+
+static Property ufs_lu_props[] = {
+    DEFINE_PROP_DRIVE("drive", UfsLu, qdev.conf.blk),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static bool ufs_lu_brdv_init(UfsLu *lu, Error **errp)
+{
+    SCSIDevice *dev = &lu->qdev;
+    bool read_only;
+
+    if (!lu->qdev.conf.blk) {
+        error_setg(errp, "drive property not set");
+        return false;
+    }
+
+    if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
+        return false;
+    }
+
+    if (blk_get_aio_context(lu->qdev.conf.blk) != qemu_get_aio_context() &&
+        !lu->qdev.hba_supports_iothread) {
+        error_setg(errp, "HBA does not support iothreads");
+        return false;
+    }
+
+    read_only = !blk_supports_write_perm(lu->qdev.conf.blk);
+
+    if (!blkconf_apply_backend_options(&dev->conf, read_only,
+                                       dev->type == TYPE_DISK, errp)) {
+        return false;
+    }
+
+    if (blk_is_sg(lu->qdev.conf.blk)) {
+        error_setg(errp, "unwanted /dev/sg*");
+        return false;
+    }
+
+    blk_iostatus_enable(lu->qdev.conf.blk);
+    return true;
+}
+
+static bool ufs_add_lu(UfsHc *u, UfsLu *lu, Error **errp)
+{
+    BlockBackend *blk = lu->qdev.conf.blk;
+    int64_t brdv_len = blk_getlength(blk);
+    uint64_t raw_dev_cap =
+        be64_to_cpu(u->geometry_desc.total_raw_device_capacity);
+
+    if (u->device_desc.number_lu >= UFS_MAX_LUS) {
+        error_setg(errp, "ufs host controller has too many logical units.");
+        return false;
+    }
+
+    if (u->lus[lu->lun] != NULL) {
+        error_setg(errp, "ufs logical unit %d already exists.", lu->lun);
+        return false;
+    }
+
+    u->lus[lu->lun] = lu;
+    u->device_desc.number_lu++;
+    raw_dev_cap += (brdv_len >> UFS_GEOMETRY_CAPACITY_SHIFT);
+    u->geometry_desc.total_raw_device_capacity = cpu_to_be64(raw_dev_cap);
+    return true;
+}
+
+static inline uint8_t ufs_log2(uint64_t input)
+{
+    int log = 0;
+    while (input >>= 1) {
+        log++;
+    }
+    return log;
+}
+
+static void ufs_init_lu(UfsLu *lu)
+{
+    BlockBackend *blk = lu->qdev.conf.blk;
+    int64_t brdv_len = blk_getlength(blk);
+
+    lu->lun = lu->qdev.lun;
+    memset(&lu->unit_desc, 0, sizeof(lu->unit_desc));
+    lu->unit_desc.length = sizeof(UnitDescriptor);
+    lu->unit_desc.descriptor_idn = UFS_QUERY_DESC_IDN_UNIT;
+    lu->unit_desc.lu_enable = 0x01;
+    lu->unit_desc.logical_block_size = ufs_log2(lu->qdev.blocksize);
+    lu->unit_desc.unit_index = lu->qdev.lun;
+    lu->unit_desc.logical_block_count =
+        cpu_to_be64(brdv_len / (1 << lu->unit_desc.logical_block_size));
+}
+
+static bool ufs_lu_check_constraints(UfsLu *lu, Error **errp)
+{
+    if (!lu->qdev.conf.blk) {
+        error_setg(errp, "drive property not set");
+        return false;
+    }
+
+    if (lu->qdev.channel != 0) {
+        error_setg(errp, "ufs logical unit does not support channel");
+        return false;
+    }
+
+    if (lu->qdev.lun >= UFS_MAX_LUS) {
+        error_setg(errp, "lun must be between 1 and %d", UFS_MAX_LUS - 1);
+        return false;
+    }
+
+    return true;
+}
+
+static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+    BusState *s = qdev_get_parent_bus(&dev->qdev);
+    UfsHc *u = UFS(s->parent);
+    AioContext *ctx = NULL;
+    uint64_t nb_sectors, nb_blocks;
+
+    if (!ufs_lu_check_constraints(lu, errp)) {
+        return;
+    }
+
+    if (lu->qdev.conf.blk) {
+        ctx = blk_get_aio_context(lu->qdev.conf.blk);
+        aio_context_acquire(ctx);
+        if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
+            goto out;
+        }
+    }
+    lu->qdev.blocksize = UFS_BLOCK_SIZE;
+    blk_get_geometry(lu->qdev.conf.blk, &nb_sectors);
+    nb_blocks = nb_sectors / (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+    if (nb_blocks > UINT32_MAX) {
+        nb_blocks = UINT32_MAX;
+    }
+    lu->qdev.max_lba = nb_blocks;
+    lu->qdev.type = TYPE_DISK;
+
+    ufs_init_lu(lu);
+    if (!ufs_add_lu(u, lu, errp)) {
+        goto out;
+    }
+
+    ufs_lu_brdv_init(lu, errp);
+out:
+    if (ctx) {
+        aio_context_release(ctx);
+    }
+}
+
+static void ufs_lu_unrealize(SCSIDevice *dev)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+
+    blk_drain(lu->qdev.conf.blk);
+}
+
+static void ufs_wlu_realize(DeviceState *qdev, Error **errp)
+{
+    UfsWLu *wlu = UFSWLU(qdev);
+    SCSIDevice *dev = &wlu->qdev;
+
+    if (!is_wlun(dev->lun)) {
+        error_setg(errp, "not well-known logical unit number");
+        return;
+    }
+
+    QTAILQ_INIT(&dev->requests);
+}
+
+static void ufs_lu_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
+
+    sc->realize = ufs_lu_realize;
+    sc->unrealize = ufs_lu_unrealize;
+    sc->alloc_req = scsi_new_request;
+    dc->bus_type = TYPE_UFS_BUS;
+    device_class_set_props(dc, ufs_lu_props);
+    dc->desc = "Virtual UFS logical unit";
+}
+
+static void ufs_wlu_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
+
+    /*
+     * The realize() function of TYPE_SCSI_DEVICE causes a segmentation fault
+     * if a block drive does not exist. Define a new realize function for
+     * well-known LUs that do not have a block drive.
+     */
+    dc->realize = ufs_wlu_realize;
+    sc->alloc_req = scsi_new_request;
+    dc->bus_type = TYPE_UFS_BUS;
+    dc->desc = "Virtual UFS well-known logical unit";
+}
+
+static const TypeInfo ufs_lu_info = {
+    .name = TYPE_UFS_LU,
+    .parent = TYPE_SCSI_DEVICE,
+    .class_init = ufs_lu_class_init,
+    .instance_size = sizeof(UfsLu),
+};
+
+static const TypeInfo ufs_wlu_info = {
+    .name = TYPE_UFS_WLU,
+    .parent = TYPE_SCSI_DEVICE,
+    .class_init = ufs_wlu_class_init,
+    .instance_size = sizeof(UfsWLu),
+};
+
+static void ufs_lu_register_types(void)
+{
+    type_register_static(&ufs_lu_info);
+    type_register_static(&ufs_wlu_info);
+}
+
+type_init(ufs_lu_register_types)
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.c
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+/**
+ * Reference Specs: https://www.jedec.org/, 3.1
+ *
+ * Usage
+ * -----
+ *
+ * Add options:
+ *      -drive file=<file>,if=none,id=<drive_id>
+ *      -device ufs,serial=<serial>,id=<bus_name>, \
+ *              nutrs=<N[optional]>,nutmrs=<N[optional]>
+ *      -device ufs-lu,drive=<drive_id>,bus=<bus_name>
+ */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
     },
 };
 
+static QEMUSGList *ufs_get_sg_list(SCSIRequest *scsi_req)
+{
+    UfsRequest *req = scsi_req->hba_private;
+    return req->sg;
+}
+
+static void ufs_build_upiu_sense_data(UfsRequest *req, SCSIRequest *scsi_req)
+{
+    req->rsp_upiu.sr.sense_data_len = cpu_to_be16(scsi_req->sense_len);
+    assert(scsi_req->sense_len <= SCSI_SENSE_LEN);
+    memcpy(req->rsp_upiu.sr.sense_data, scsi_req->sense, scsi_req->sense_len);
+}
+
 static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
                                   uint8_t flags, uint8_t response,
                                   uint8_t scsi_status,
@@ -XXX,XX +XXX,XX @@ static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
     req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
 }
 
+static void ufs_scsi_command_complete(SCSIRequest *scsi_req, size_t resid)
+{
+    UfsRequest *req = scsi_req->hba_private;
+    int16_t status = scsi_req->status;
+    uint32_t expected_len = be32_to_cpu(req->req_upiu.sc.exp_data_transfer_len);
+    uint32_t transfered_len = scsi_req->cmd.xfer - resid;
+    uint8_t flags = 0, response = UFS_COMMAND_RESULT_SUCESS;
+    uint16_t data_segment_length;
+
+    if (expected_len > transfered_len) {
+        req->rsp_upiu.sr.residual_transfer_count =
+            cpu_to_be32(expected_len - transfered_len);
+        flags |= UFS_UPIU_FLAG_UNDERFLOW;
+    } else if (expected_len < transfered_len) {
+        req->rsp_upiu.sr.residual_transfer_count =
+            cpu_to_be32(transfered_len - expected_len);
+        flags |= UFS_UPIU_FLAG_OVERFLOW;
+    }
+
+    if (status != 0) {
+        ufs_build_upiu_sense_data(req, scsi_req);
+        response = UFS_COMMAND_RESULT_FAIL;
+    }
+
+    data_segment_length = cpu_to_be16(scsi_req->sense_len +
+                                      sizeof(req->rsp_upiu.sr.sense_data_len));
+    ufs_build_upiu_header(req, UFS_UPIU_TRANSACTION_RESPONSE, flags, response,
+                          status, data_segment_length);
+
+    ufs_complete_req(req, UFS_REQUEST_SUCCESS);
+
+    scsi_req->hba_private = NULL;
+    scsi_req_unref(scsi_req);
+}
+
+static const struct SCSIBusInfo ufs_scsi_info = {
+    .tcq = true,
+    .max_target = 0,
+    .max_lun = UFS_MAX_LUS,
+    .max_channel = 0,
+
+    .get_sg_list = ufs_get_sg_list,
+    .complete = ufs_scsi_command_complete,
+};
+
+static UfsReqResult ufs_exec_scsi_cmd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint8_t lun = req->req_upiu.header.lun;
+    uint8_t task_tag = req->req_upiu.header.task_tag;
+    SCSIDevice *dev = NULL;
+
+    trace_ufs_exec_scsi_cmd(req->slot, lun, req->req_upiu.sc.cdb[0]);
+
+    if (!is_wlun(lun)) {
+        if (lun >= u->device_desc.number_lu) {
+            trace_ufs_err_scsi_cmd_invalid_lun(lun);
+            return UFS_REQUEST_FAIL;
+        } else if (u->lus[lun] == NULL) {
+            trace_ufs_err_scsi_cmd_invalid_lun(lun);
+            return UFS_REQUEST_FAIL;
+        }
+    }
+
+    switch (lun) {
+    case UFS_UPIU_REPORT_LUNS_WLUN:
+        dev = &u->report_wlu->qdev;
+        break;
+    case UFS_UPIU_UFS_DEVICE_WLUN:
+        dev = &u->dev_wlu->qdev;
+        break;
+    case UFS_UPIU_BOOT_WLUN:
+        dev = &u->boot_wlu->qdev;
+        break;
+    case UFS_UPIU_RPMB_WLUN:
+        dev = &u->rpmb_wlu->qdev;
+        break;
+    default:
+        dev = &u->lus[lun]->qdev;
+    }
+
+    SCSIRequest *scsi_req = scsi_req_new(
+        dev, task_tag, lun, req->req_upiu.sc.cdb, UFS_CDB_SIZE, req);
+
+    uint32_t len = scsi_req_enqueue(scsi_req);
+    if (len) {
+        scsi_req_continue(scsi_req);
+    }
+
+    return UFS_REQUEST_NO_COMPLETE;
+}
+
 static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
 {
     trace_ufs_exec_nop_cmd(req->slot);
@@ -XXX,XX +XXX,XX @@ static const RpmbUnitDescriptor rpmb_unit_desc = {
 
 static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
 {
+    UfsHc *u = req->hc;
     uint8_t lun = req->req_upiu.qr.index;
 
-    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
+    if (lun != UFS_UPIU_RPMB_WLUN &&
+        (lun > UFS_MAX_LUS || u->lus[lun] == NULL)) {
         trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
         return UFS_QUERY_RESULT_INVALID_INDEX;
     }
@@ -XXX,XX +XXX,XX @@ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
     if (lun == UFS_UPIU_RPMB_WLUN) {
         memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
     } else {
-        /* unit descriptor is not yet supported */
-        return UFS_QUERY_RESULT_INVALID_INDEX;
+        memcpy(&req->rsp_upiu.qr.data, &u->lus[lun]->unit_desc,
+               sizeof(u->lus[lun]->unit_desc));
     }
 
     return UFS_QUERY_RESULT_SUCCESS;
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
         req_result = ufs_exec_nop_cmd(req);
         break;
     case UFS_UPIU_TRANSACTION_COMMAND:
-        /* Not yet implemented */
-        req_result = UFS_REQUEST_FAIL;
+        req_result = ufs_exec_scsi_cmd(req);
         break;
     case UFS_UPIU_TRANSACTION_QUERY_REQ:
         req_result = ufs_exec_query_cmd(req);
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
         req_result = UFS_REQUEST_FAIL;
     }
 
-    ufs_complete_req(req, req_result);
+    /*
+     * The ufs_complete_req for scsi commands is handled by the
+     * ufs_scsi_command_complete() callback function. Therefore, to avoid
+     * duplicate processing, ufs_complete_req() is not called for scsi commands.
+     */
+    if (req_result != UFS_REQUEST_NO_COMPLETE) {
+        ufs_complete_req(req, req_result);
+    }
 }
 
 static void ufs_process_req(void *opaque)
@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
     u->flags.permanently_disable_fw_update = 1;
 }
 
+static bool ufs_init_wlu(UfsHc *u, UfsWLu **wlu, uint8_t wlun, Error **errp)
+{
+    UfsWLu *new_wlu = UFSWLU(qdev_new(TYPE_UFS_WLU));
+
+    qdev_prop_set_uint32(DEVICE(new_wlu), "lun", wlun);
+
+    /*
+     * The well-known lu shares the same bus as the normal lu. If the well-known
+     * lu writes the same channel value as the normal lu, the report will be
+     * made not only for the normal lu but also for the well-known lu at
+     * REPORT_LUN time. To prevent this, the channel value of normal lu is fixed
+     * to 0 and the channel value of well-known lu is fixed to 1.
+     */
+    qdev_prop_set_uint32(DEVICE(new_wlu), "channel", 1);
+    if (!qdev_realize_and_unref(DEVICE(new_wlu), BUS(&u->bus), errp)) {
+        return false;
+    }
+
+    *wlu = new_wlu;
+    return true;
+}
+
 static void ufs_realize(PCIDevice *pci_dev, Error **errp)
 {
     UfsHc *u = UFS(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
         return;
     }
 
+    qbus_init(&u->bus, sizeof(UfsBus), TYPE_UFS_BUS, &pci_dev->qdev,
+              u->parent_obj.qdev.id);
+    u->bus.parent_bus.info = &ufs_scsi_info;
+
     ufs_init_state(u);
     ufs_init_hc(u);
     ufs_init_pci(u, pci_dev);
+
+    if (!ufs_init_wlu(u, &u->report_wlu, UFS_UPIU_REPORT_LUNS_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->dev_wlu, UFS_UPIU_UFS_DEVICE_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->boot_wlu, UFS_UPIU_BOOT_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->rpmb_wlu, UFS_UPIU_RPMB_WLUN, errp)) {
+        return;
+    }
 }
 
 static void ufs_exit(PCIDevice *pci_dev)
 {
     UfsHc *u = UFS(pci_dev);
 
+    if (u->dev_wlu) {
+        object_unref(OBJECT(u->dev_wlu));
+        u->dev_wlu = NULL;
+    }
+
+    if (u->report_wlu) {
+        object_unref(OBJECT(u->report_wlu));
+        u->report_wlu = NULL;
+    }
+
+    if (u->rpmb_wlu) {
+        object_unref(OBJECT(u->rpmb_wlu));
+        u->rpmb_wlu = NULL;
+    }
+
+    if (u->boot_wlu) {
+        object_unref(OBJECT(u->boot_wlu));
+        u->boot_wlu = NULL;
+    }
+
     qemu_bh_delete(u->doorbell_bh);
     qemu_bh_delete(u->complete_bh);
 
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
     dc->vmsd = &ufs_vmstate;
 }
 
+static bool ufs_bus_check_address(BusState *qbus, DeviceState *qdev,
+                                  Error **errp)
+{
+    SCSIDevice *dev = SCSI_DEVICE(qdev);
+    UfsBusClass *ubc = UFS_BUS_GET_CLASS(qbus);
+    UfsHc *u = UFS(qbus->parent);
+
+    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_WLU) == 0) {
+        if (dev->lun != UFS_UPIU_REPORT_LUNS_WLUN &&
+            dev->lun != UFS_UPIU_UFS_DEVICE_WLUN &&
+            dev->lun != UFS_UPIU_BOOT_WLUN && dev->lun != UFS_UPIU_RPMB_WLUN) {
+            error_setg(errp, "bad well-known lun: %d", dev->lun);
+            return false;
+        }
+
+        if ((dev->lun == UFS_UPIU_REPORT_LUNS_WLUN && u->report_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_UFS_DEVICE_WLUN && u->dev_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_BOOT_WLUN && u->boot_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_RPMB_WLUN && u->rpmb_wlu != NULL)) {
+            error_setg(errp, "well-known lun %d already exists", dev->lun);
+            return false;
+        }
+
+        return true;
+    }
+
+    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_LU) != 0) {
+        error_setg(errp, "%s cannot be connected to ufs-bus",
+                   object_get_typename(OBJECT(dev)));
+        return false;
+    }
+
+    return ubc->parent_check_address(qbus, qdev, errp);
+}
+
+static void ufs_bus_class_init(ObjectClass *class, void *data)
+{
+    BusClass *bc = BUS_CLASS(class);
+    UfsBusClass *ubc = UFS_BUS_CLASS(class);
+    ubc->parent_check_address = bc->check_address;
+    bc->check_address = ufs_bus_check_address;
+}
+
 static const TypeInfo ufs_info = {
     .name = TYPE_UFS,
     .parent = TYPE_PCI_DEVICE,
@@ -XXX,XX +XXX,XX @@ static const TypeInfo ufs_info = {
     .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
 };
 
+static const TypeInfo ufs_bus_info = {
+    .name = TYPE_UFS_BUS,
+    .parent = TYPE_SCSI_BUS,
+    .class_init = ufs_bus_class_init,
+    .class_size = sizeof(UfsBusClass),
+    .instance_size = sizeof(UfsBus),
+};
+
 static void ufs_register_types(void)
 {
     type_register_static(&ufs_info);
+    type_register_static(&ufs_bus_info);
 }
 
 type_init(ufs_register_types)
diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/meson.build
+++ b/hw/ufs/meson.build
@@ -1 +1 @@
-system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
+system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c', 'lu.c'))
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/trace-events
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@ ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", l
 ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
 ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
 
+# lu.c
+ufs_scsi_check_condition(uint32_t tag, uint8_t key, uint8_t asc, uint8_t ascq) "Command complete tag=0x%x sense=%d/%d/%d"
+ufs_scsi_read_complete(uint32_t tag, size_t size) "Data ready tag=0x%x len=%zd"
+ufs_scsi_read_data_count(uint32_t sector_count) "Read sector_count=%d"
+ufs_scsi_read_data_invalid(void) "Data transfer direction invalid"
+ufs_scsi_write_complete_noio(uint32_t tag, size_t size) "Write complete tag=0x%x more=%zd"
+ufs_scsi_write_data_invalid(void) "Data transfer direction invalid"
+ufs_scsi_emulate_vpd_page_00(size_t xfer) "Inquiry EVPD[Supported pages] buffer size %zd"
+ufs_scsi_emulate_vpd_page_80_not_supported(void) "Inquiry EVPD[Serial number] not supported"
+ufs_scsi_emulate_vpd_page_80(size_t xfer) "Inquiry EVPD[Serial number] buffer size %zd"
+ufs_scsi_emulate_vpd_page_87(size_t xfer) "Inquiry EVPD[Mode Page Policy] buffer size %zd"
+ufs_scsi_emulate_mode_sense(int cmd, int page, size_t xfer, int control) "Mode Sense(%d) (page %d, xfer %zd, page_control %d)"
+ufs_scsi_emulate_read_data(int buflen) "Read buf_len=%d"
+ufs_scsi_emulate_write_data(int buflen) "Write buf_len=%d"
+ufs_scsi_emulate_command_START_STOP(void) "START STOP UNIT"
+ufs_scsi_emulate_command_FORMAT_UNIT(void) "FORMAT UNIT"
+ufs_scsi_emulate_command_SEND_DIAGNOSTIC(void) "SEND DIAGNOSTIC"
+ufs_scsi_emulate_command_SAI_16(void) "SAI READ CAPACITY(16)"
+ufs_scsi_emulate_command_SAI_unsupported(void) "Unsupported Service Action In"
+ufs_scsi_emulate_command_MODE_SELECT_10(size_t xfer) "Mode Select(10) (len %zd)"
+ufs_scsi_emulate_command_VERIFY(int bytchk) "Verify (bytchk %d)"
+ufs_scsi_emulate_command_UNKNOWN(int cmd, const char *name) "Unknown SCSI command (0x%2.2x=%s)"
+ufs_scsi_dma_command_READ(uint64_t lba, uint32_t len) "Read (block %" PRIu64 ", count %u)"
+ufs_scsi_dma_command_WRITE(uint64_t lba, int len) "Write (block %" PRIu64 ", count %u)"
+
 # error condition
 ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@samsung.com>

This patch includes the following tests
  Test mmio read
  Test ufs device initialization and ufs-lu recognition
  Test I/O (Performs a write followed by a read to verify)

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 9e9207f54505e9ba30931849f949ff6f474ac333.1693980783.git.jeuk20.kim@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS             |   1 +
 tests/qtest/ufs-test.c  | 587 ++++++++++++++++++++++++++++++++++++++++
 tests/qtest/meson.build |   1 +
 3 files changed, 589 insertions(+)
 create mode 100644 tests/qtest/ufs-test.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ M: Jeuk Kim <jeuk20.kim@samsung.com>
 S: Supported
 F: hw/ufs/*
 F: include/block/ufs.h
+F: tests/qtest/ufs-test.c
 
 megasas
 M: Hannes Reinecke <hare@suse.com>
diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qtest/ufs-test.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QTest testcase for UFS
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/module.h"
+#include "qemu/units.h"
+#include "libqtest.h"
+#include "libqos/qgraph.h"
+#include "libqos/pci.h"
+#include "scsi/constants.h"
+#include "include/block/ufs.h"
+
+/* Test images sizes in Bytes */
+#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
+/* Timeout for various operations, in seconds. */
+#define TIMEOUT_SECONDS 10
+/* Maximum PRD entry count */
+#define MAX_PRD_ENTRY_COUNT 10
+#define PRD_ENTRY_DATA_SIZE 4096
+/* Constants to build upiu */
+#define UTP_COMMAND_DESCRIPTOR_SIZE 4096
+#define UTP_RESPONSE_UPIU_OFFSET 1024
+#define UTP_PRDT_UPIU_OFFSET 2048
+
+typedef struct QUfs QUfs;
+
+struct QUfs {
+    QOSGraphObject obj;
+    QPCIDevice dev;
+    QPCIBar bar;
+
+    uint64_t utrlba;
+    uint64_t utmrlba;
+    uint64_t cmd_desc_addr;
+    uint64_t data_buffer_addr;
+
+    bool enabled;
+};
+
+static inline uint32_t ufs_rreg(QUfs *ufs, size_t offset)
+{
+    return qpci_io_readl(&ufs->dev, ufs->bar, offset);
+}
+
+static inline void ufs_wreg(QUfs *ufs, size_t offset, uint32_t value)
+{
+    qpci_io_writel(&ufs->dev, ufs->bar, offset, value);
+}
+
+static void ufs_wait_for_irq(QUfs *ufs)
+{
+    uint64_t end_time;
+    uint32_t is;
+    /* Wait for device to reset as the linux driver does. */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        is = ufs_rreg(ufs, A_IS);
+    } while (is == 0 && g_get_monotonic_time() < end_time);
+}
+
+static UtpTransferReqDesc ufs_build_req_utrd(uint64_t cmd_desc_addr,
+                                             uint8_t slot,
+                                             uint32_t data_direction,
+                                             uint16_t prd_table_length)
+{
+    UtpTransferReqDesc req = { 0 };
+    uint64_t command_desc_base_addr =
+        cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+
+    req.header.dword_0 =
+        cpu_to_le32(1 << 28 | data_direction | UFS_UTP_REQ_DESC_INT_CMD);
+    req.header.dword_2 = cpu_to_le32(UFS_OCS_INVALID_COMMAND_STATUS);
+
+    req.command_desc_base_addr_hi = cpu_to_le32(command_desc_base_addr >> 32);
+    req.command_desc_base_addr_lo =
+        cpu_to_le32(command_desc_base_addr & 0xffffffff);
+    req.response_upiu_offset =
+        cpu_to_le16(UTP_RESPONSE_UPIU_OFFSET / sizeof(uint32_t));
+    req.response_upiu_length = cpu_to_le16(sizeof(UtpUpiuRsp));
+    req.prd_table_offset = cpu_to_le16(UTP_PRDT_UPIU_OFFSET / sizeof(uint32_t));
+    req.prd_table_length = cpu_to_le16(prd_table_length);
+    return req;
+}
+
+static void ufs_send_nop_out(QUfs *ufs, uint8_t slot,
+                             UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
+{
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd = ufs_build_req_utrd(ufs->cmd_desc_addr, slot,
+                                                 UFS_UTP_NO_DATA_TRANSFER, 0);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_NOP_OUT;
+    req_upiu.header.task_tag = slot;
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+}
+
+static void ufs_send_query(QUfs *ufs, uint8_t slot, uint8_t query_function,
+                           uint8_t query_opcode, uint8_t idn, uint8_t index,
+                           UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
+{
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd = ufs_build_req_utrd(ufs->cmd_desc_addr, slot,
+                                                 UFS_UTP_NO_DATA_TRANSFER, 0);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_QUERY_REQ;
+    req_upiu.header.query_func = query_function;
+    req_upiu.header.task_tag = slot;
+    /*
+     * QEMU UFS does not currently support Write descriptor and Write attribute,
+     * so the value of data_segment_length is always 0.
+     */
+    req_upiu.header.data_segment_length = 0;
+    req_upiu.qr.opcode = query_opcode;
+    req_upiu.qr.idn = idn;
+    req_upiu.qr.index = index;
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+}
+
+static void ufs_send_scsi_command(QUfs *ufs, uint8_t slot, uint8_t lun,
+                                  const uint8_t *cdb, const uint8_t *data_in,
+                                  size_t data_in_len, uint8_t *data_out,
+                                  size_t data_out_len,
+                                  UtpTransferReqDesc *utrd_out,
+                                  UtpUpiuRsp *rsp_out)
+
+{
+    /* Build up PRDT */
+    UfshcdSgEntry entries[MAX_PRD_ENTRY_COUNT] = {
+        0,
+    };
+    uint8_t flags;
+    uint16_t prd_table_length, i;
+    uint32_t data_direction, data_len;
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t prdt_addr = req_upiu_addr + UTP_PRDT_UPIU_OFFSET;
+
+    g_assert_true(data_in_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    g_assert_true(data_out_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    if (data_in_len > 0) {
+        g_assert_nonnull(data_in);
+        data_direction = UFS_UTP_HOST_TO_DEVICE;
+        data_len = data_in_len;
+        flags = UFS_UPIU_CMD_FLAGS_WRITE;
+    } else if (data_out_len > 0) {
+        g_assert_nonnull(data_out);
+        data_direction = UFS_UTP_DEVICE_TO_HOST;
+        data_len = data_out_len;
+        flags = UFS_UPIU_CMD_FLAGS_READ;
+    } else {
+        data_direction = UFS_UTP_NO_DATA_TRANSFER;
+        data_len = 0;
+        flags = UFS_UPIU_CMD_FLAGS_NONE;
+    }
+    prd_table_length = DIV_ROUND_UP(data_len, PRD_ENTRY_DATA_SIZE);
+
+    qtest_memset(ufs->dev.bus->qts, ufs->data_buffer_addr, 0,
+                 MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    if (data_in_len) {
+        qtest_memwrite(ufs->dev.bus->qts, ufs->data_buffer_addr, data_in,
+                       data_in_len);
+    }
+
+    for (i = 0; i < prd_table_length; i++) {
+        entries[i].addr =
+            cpu_to_le64(ufs->data_buffer_addr + i * sizeof(UfshcdSgEntry));
+        if (i + 1 != prd_table_length) {
+            entries[i].size = cpu_to_le32(PRD_ENTRY_DATA_SIZE - 1);
+        } else {
+            entries[i].size = cpu_to_le32(
+                data_len - (PRD_ENTRY_DATA_SIZE * (prd_table_length - 1)) - 1);
+        }
+    }
+    qtest_memwrite(ufs->dev.bus->qts, prdt_addr, entries,
+                   prd_table_length * sizeof(UfshcdSgEntry));
+
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd = ufs_build_req_utrd(
+        ufs->cmd_desc_addr, slot, data_direction, prd_table_length);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UFS_UPIU_TRANSACTION_COMMAND;
+    req_upiu.header.flags = flags;
+    req_upiu.header.lun = lun;
+    req_upiu.header.task_tag = slot;
+    req_upiu.sc.exp_data_transfer_len = cpu_to_be32(data_len);
+    memcpy(req_upiu.sc.cdb, cdb, UFS_CDB_SIZE);
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+    if (data_out_len) {
+        qtest_memread(ufs->dev.bus->qts, ufs->data_buffer_addr, data_out,
+                      data_out_len);
+    }
+}
+
+/**
+ * Initialize Ufs host controller and logical unit.
+ * After running this function, you can make a transfer request to the UFS.
+ */
+static void ufs_init(QUfs *ufs, QGuestAllocator *alloc)
+{
+    uint64_t end_time;
+    uint32_t nutrs, nutmrs;
+    uint32_t hcs, is, ucmdarg2, cap;
+    uint32_t hce = 0, ie = 0;
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
+    qpci_device_enable(&ufs->dev);
+
+    /* Start host controller initialization */
+    hce = FIELD_DP32(hce, HCE, HCE, 1);
+    ufs_wreg(ufs, A_HCE, hce);
+
+    /* Wait for device to reset */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        hce = FIELD_EX32(ufs_rreg(ufs, A_HCE), HCE, HCE);
+    } while (hce == 0 && g_get_monotonic_time() < end_time);
+    g_assert_cmpuint(hce, ==, 1);
+
+    /* Enable interrupt */
+    ie = FIELD_DP32(ie, IE, UCCE, 1);
+    ie = FIELD_DP32(ie, IE, UHESE, 1);
+    ie = FIELD_DP32(ie, IE, UHXSE, 1);
+    ie = FIELD_DP32(ie, IE, UPMSE, 1);
+    ufs_wreg(ufs, A_IE, ie);
+
+    /* Send DME_LINK_STARTUP uic command */
+    hcs = ufs_rreg(ufs, A_HCS);
+    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
+
+    ufs_wreg(ufs, A_UCMDARG1, 0);
+    ufs_wreg(ufs, A_UCMDARG2, 0);
+    ufs_wreg(ufs, A_UCMDARG3, 0);
+    ufs_wreg(ufs, A_UICCMD, UFS_UIC_CMD_DME_LINK_STARTUP);
+
+    is = ufs_rreg(ufs, A_IS);
+    g_assert_true(FIELD_EX32(is, IS, UCCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UCCS, 1));
+
+    ucmdarg2 = ufs_rreg(ufs, A_UCMDARG2);
+    g_assert_cmpuint(ucmdarg2, ==, 0);
+    is = ufs_rreg(ufs, A_IS);
+    g_assert_cmpuint(is, ==, 0);
+    hcs = ufs_rreg(ufs, A_HCS);
+    g_assert_true(FIELD_EX32(hcs, HCS, DP));
+    g_assert_true(FIELD_EX32(hcs, HCS, UTRLRDY));
+    g_assert_true(FIELD_EX32(hcs, HCS, UTMRLRDY));
+    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
+
+    /* Enable all interrupt functions */
+    ie = FIELD_DP32(ie, IE, UTRCE, 1);
+    ie = FIELD_DP32(ie, IE, UEE, 1);
+    ie = FIELD_DP32(ie, IE, UPMSE, 1);
+    ie = FIELD_DP32(ie, IE, UHXSE, 1);
+    ie = FIELD_DP32(ie, IE, UHESE, 1);
+    ie = FIELD_DP32(ie, IE, UTMRCE, 1);
+    ie = FIELD_DP32(ie, IE, UCCE, 1);
+    ie = FIELD_DP32(ie, IE, DFEE, 1);
+    ie = FIELD_DP32(ie, IE, HCFEE, 1);
+    ie = FIELD_DP32(ie, IE, SBFEE, 1);
+    ie = FIELD_DP32(ie, IE, CEFEE, 1);
+    ufs_wreg(ufs, A_IE, ie);
+    ufs_wreg(ufs, A_UTRIACR, 0);
+
+    /* Enable tranfer request and task management request */
+    cap = ufs_rreg(ufs, A_CAP);
+    nutrs = FIELD_EX32(cap, CAP, NUTRS) + 1;
+    nutmrs = FIELD_EX32(cap, CAP, NUTMRS) + 1;
+    ufs->cmd_desc_addr =
+        guest_alloc(alloc, nutrs * UTP_COMMAND_DESCRIPTOR_SIZE);
+    ufs->data_buffer_addr =
+        guest_alloc(alloc, MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    ufs->utrlba = guest_alloc(alloc, nutrs * sizeof(UtpTransferReqDesc));
+    ufs->utmrlba = guest_alloc(alloc, nutmrs * sizeof(UtpTaskReqDesc));
+
+    ufs_wreg(ufs, A_UTRLBA, ufs->utrlba & 0xffffffff);
+    ufs_wreg(ufs, A_UTRLBAU, ufs->utrlba >> 32);
+    ufs_wreg(ufs, A_UTMRLBA, ufs->utmrlba & 0xffffffff);
+    ufs_wreg(ufs, A_UTMRLBAU, ufs->utmrlba >> 32);
+    ufs_wreg(ufs, A_UTRLRSR, 1);
+    ufs_wreg(ufs, A_UTMRLRSR, 1);
+
+    /* Send nop out to test transfer request */
+    ufs_send_nop_out(ufs, 0, &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+
+    /* Set fDeviceInit flag via query request */
+    ufs_send_query(ufs, 0, UFS_UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST,
+                   UFS_UPIU_QUERY_OPCODE_SET_FLAG,
+                   UFS_QUERY_FLAG_IDN_FDEVICEINIT, 0, &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+
+    /* Wait for device to reset */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        ufs_send_query(ufs, 0, UFS_UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
+                       UFS_UPIU_QUERY_OPCODE_READ_FLAG,
+                       UFS_QUERY_FLAG_IDN_FDEVICEINIT, 0, &utrd, &rsp_upiu);
+    } while (be32_to_cpu(rsp_upiu.qr.value) != 0 &&
+             g_get_monotonic_time() < end_time);
+    g_assert_cmpuint(be32_to_cpu(rsp_upiu.qr.value), ==, 0);
+
+    ufs->enabled = true;
+}
+
+static void ufs_exit(QUfs *ufs, QGuestAllocator *alloc)
+{
+    if (ufs->enabled) {
+        guest_free(alloc, ufs->utrlba);
+        guest_free(alloc, ufs->utmrlba);
+        guest_free(alloc, ufs->cmd_desc_addr);
+        guest_free(alloc, ufs->data_buffer_addr);
+    }
+
+    qpci_iounmap(&ufs->dev, ufs->bar);
+}
+
+static void *ufs_get_driver(void *obj, const char *interface)
+{
+    QUfs *ufs = obj;
+
+    if (!g_strcmp0(interface, "pci-device")) {
+        return &ufs->dev;
+    }
+
+    fprintf(stderr, "%s not present in ufs\n", interface);
+    g_assert_not_reached();
+}
+
+static void *ufs_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
+{
+    QUfs *ufs = g_new0(QUfs, 1);
+    QPCIBus *bus = pci_bus;
+
+    qpci_device_init(&ufs->dev, bus, addr);
+    ufs->obj.get_driver = ufs_get_driver;
+
+    return &ufs->obj;
+}
+
+static void ufstest_reg_read(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+    uint32_t cap;
+
+    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
+    qpci_device_enable(&ufs->dev);
+
+    cap = ufs_rreg(ufs, A_CAP);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTRS), ==, 31);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTMRS), ==, 7);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, 64AS), ==, 1);
+
+    qpci_iounmap(&ufs->dev, ufs->bar);
+}
+
+static void ufstest_init(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+
+    uint8_t buf[4096] = { 0 };
+    const uint8_t report_luns_cdb[UFS_CDB_SIZE] = {
+        /* allocation length 4096 */
+        REPORT_LUNS, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,        0x00, 0x10, 0x00, 0x00, 0x00
+    };
+    const uint8_t test_unit_ready_cdb[UFS_CDB_SIZE] = {
+        TEST_UNIT_READY,
+    };
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs_init(ufs, alloc);
+
+    /* Check REPORT_LUNS */
+    ufs_send_scsi_command(ufs, 0, 0, report_luns_cdb, NULL, 0, buf, sizeof(buf),
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
+    /* LUN LIST LENGTH should be 8, in big endian */
+    g_assert_cmpuint(buf[3], ==, 8);
+    /* There is one logical unit whose lun is 0 */
+    g_assert_cmpuint(buf[9], ==, 0);
+
+    /* Check TEST_UNIT_READY */
+    ufs_send_scsi_command(ufs, 0, 0, test_unit_ready_cdb, NULL, 0, NULL, 0,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
+
+    ufs_exit(ufs, alloc);
+}
+
+static void ufstest_read_write(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+    uint8_t read_buf[4096] = { 0 };
+    uint8_t write_buf[4096] = { 0 };
+    const uint8_t read_capacity_cdb[UFS_CDB_SIZE] = {
+        /* allocation length 4096 */
+        SERVICE_ACTION_IN_16,
+        SAI_READ_CAPACITY_16,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x10,
+        0x00,
+        0x00,
+        0x00
+    };
+    const uint8_t read_cdb[UFS_CDB_SIZE] = {
+        /* READ(10) to LBA 0, transfer length 1 */
+        READ_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
+    };
+    const uint8_t write_cdb[UFS_CDB_SIZE] = {
+        /* WRITE(10) to LBA 0, transfer length 1 */
+        WRITE_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
+    };
+    uint32_t block_size;
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs_init(ufs, alloc);
+
+    /* Read capacity */
+    ufs_send_scsi_command(ufs, 0, 1, read_capacity_cdb, NULL, 0, read_buf,
+                          sizeof(read_buf), &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
+                     UFS_COMMAND_RESULT_SUCESS);
+    block_size = ldl_be_p(&read_buf[8]);
+    g_assert_cmpuint(block_size, ==, 4096);
+
+    /* Write data */
+    memset(write_buf, rand() % 255 + 1, block_size);
+    ufs_send_scsi_command(ufs, 0, 1, write_cdb, write_buf, block_size, NULL, 0,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
+                     UFS_COMMAND_RESULT_SUCESS);
+
+    /* Read data and verify */
+    ufs_send_scsi_command(ufs, 0, 1, read_cdb, NULL, 0, read_buf, block_size,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==,
+                     UFS_COMMAND_RESULT_SUCESS);
+    g_assert_cmpint(memcmp(read_buf, write_buf, block_size), ==, 0);
+
+    ufs_exit(ufs, alloc);
+}
+
+static void drive_destroy(void *path)
+{
+    unlink(path);
+    g_free(path);
+    qos_invalidate_command_line();
+}
+
+static char *drive_create(void)
+{
+    int fd, ret;
+    char *t_path;
+
+    /* Create a temporary raw image */
+    fd = g_file_open_tmp("qtest-ufs.XXXXXX", &t_path, NULL);
+    g_assert_cmpint(fd, >=, 0);
+    ret = ftruncate(fd, TEST_IMAGE_SIZE);
+    g_assert_cmpint(ret, ==, 0);
+    close(fd);
+
+    g_test_queue_destroy(drive_destroy, t_path);
+    return t_path;
+}
+
+static void *ufs_blk_test_setup(GString *cmd_line, void *arg)
+{
+    char *tmp_path = drive_create();
+
+    g_string_append_printf(cmd_line,
+                           " -blockdev file,filename=%s,node-name=drv1 "
+                           "-device ufs-lu,bus=ufs0,drive=drv1,lun=1 ",
+                           tmp_path);
+
+    return arg;
+}
+
+static void ufs_register_nodes(void)
+{
+    const char *arch;
+    QOSGraphEdgeOptions edge_opts = {
+        .before_cmd_line = "-blockdev null-co,node-name=drv0,read-zeroes=on",
+        .after_cmd_line = "-device ufs-lu,bus=ufs0,drive=drv0,lun=0",
+        .extra_device_opts = "addr=04.0,id=ufs0,nutrs=32,nutmrs=8"
+    };
+
+    QOSGraphTestOptions io_test_opts = {
+        .before = ufs_blk_test_setup,
+    };
+
+    add_qpci_address(&edge_opts, &(QPCIAddress){ .devfn = QPCI_DEVFN(4, 0) });
+
+    qos_node_create_driver("ufs", ufs_create);
+    qos_node_consumes("ufs", "pci-bus", &edge_opts);
+    qos_node_produces("ufs", "pci-device");
+
+    qos_add_test("reg-read", "ufs", ufstest_reg_read, NULL);
+
+    /*
+     * Check architecture
+     * TODO: Enable ufs io tests for ppc64
+     */
+    arch = qtest_get_arch();
+    if (!strcmp(arch, "ppc64")) {
+        g_test_message("Skipping ufs io tests for ppc64");
+        return;
+    }
+    qos_add_test("init", "ufs", ufstest_init, NULL);
+    qos_add_test("read-write", "ufs", ufstest_read_write, &io_test_opts);
+}
+
+libqos_init(ufs_register_nodes);
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qos_test_ss.add(
   'virtio-iommu-test.c',
   'vmxnet3-test.c',
   'igb-test.c',
+  'ufs-test.c',
 )
 
 if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL')
-- 
2.41.0