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)

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

tests/qemu-iotests: Update tests to recent desugarized -accel option

Vladimir Sementsov-Ogievskiy (1):

qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap

block.c | 47 +++++----

block/Makefile.objs | 1 +

block/backup-top.c | 4 +-

block/blkdebug.c | 93 ++++++++++++++++-

block/filter-compress.c | 168 +++++++++++++++++++++++++++++++

block/qcow2-bitmap.c | 41 ++++----

block/qcow2.c | 102 ++++++++++++++-----

block/throttle-groups.c | 4 +-

include/block/block.h | 1 +

qapi/block-core.json | 24 ++++-

tests/qemu-iotests/007 | 5 +-

tests/qemu-iotests/014 | 2 +

tests/qemu-iotests/015 | 5 +-

tests/qemu-iotests/019 | 6 +-

tests/qemu-iotests/020 | 6 +-

tests/qemu-iotests/024 | 10 +-

tests/qemu-iotests/026 | 5 +-

tests/qemu-iotests/028 | 2 +-

tests/qemu-iotests/029 | 7 +-

tests/qemu-iotests/031 | 9 +-

tests/qemu-iotests/031.out | 36 +++----

tests/qemu-iotests/036 | 15 +--

tests/qemu-iotests/036.out | 66 ++----------

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 ++++-

131 files changed, 1139 insertions(+), 552 deletions(-)

create mode 100644 block/filter-compress.c

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

--- 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

--- 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);

}

}