The following changes since commit 42f6c9179be4401974dd3a75ee72defd16b5092d:

Merge tag 'pull-ppc-20211112' of https://github.com/legoater/qemu into staging (2021-11-12 12:28:25 +0100)

https://gitlab.com/hreitz/qemu.git tags/pull-block-2021-11-16

for you to fetch changes up to 5dbd0ce115c7720268e653fe928bb6a0c1314a80:

file-posix: Fix alignment after reopen changing O_DIRECT (2021-11-16 11:30:29 +0100)

Block patches for 6.2.0-rc1:

- Fixes to image streaming job and block layer reconfiguration to make

iotest 030 pass again

- docs: Deprecate incorrectly typed device_add arguments

- file-posix: Fix alignment after reopen changing O_DIRECT

- Note that because I had to modify Kevin's pull request, I did not want

to merge it partially (with a merge commit), but instead decided to

apply all patches from the pull request mails (including their message

IDs)

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

Hanna Reitz (10):

stream: Traverse graph after modification

block: Manipulate children list in .attach/.detach

block: Unite remove_empty_child and child_free

block: Drop detached child from ignore list

block: Pass BdrvChild ** to replace_child_noperm

block: Restructure remove_file_or_backing_child()

transactions: Invoke clean() after everything else

block: Let replace_child_tran keep indirect pointer

block: Let replace_child_noperm free children

iotests/030: Unthrottle parallel jobs in reverse

Kevin Wolf (2):

docs: Deprecate incorrectly typed device_add arguments

file-posix: Fix alignment after reopen changing O_DIRECT

Stefan Hajnoczi (1):

softmmu/qdev-monitor: fix use-after-free in qdev_set_id()

docs/about/deprecated.rst | 14 +++

include/qemu/transactions.h | 3 +

block.c | 233 +++++++++++++++++++++++++++---------

block/file-posix.c | 20 +++-

block/stream.c | 7 +-

softmmu/qdev-monitor.c | 2 +-

util/transactions.c | 8 +-

tests/qemu-iotests/030 | 11 +-

tests/qemu-iotests/142 | 29 +++++

tests/qemu-iotests/142.out | 18 +++

10 files changed, 279 insertions(+), 66 deletions(-)

2.33.1

Now that bdrv_remove_empty_child() no longer removes the child from the

parent's children list but only checks that it is not in such a list, it

is only a wrapper around bdrv_child_free() that checks that the child is

empty and unused. That should apply to all children that we free, so

put those checks into bdrv_child_free() and drop

bdrv_remove_empty_child().

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

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

Message-Id: <20211111120829.81329-4-hreitz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Message-Id: <20211115145409.176785-4-kwolf@redhat.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

block.c | 26 +++++++++++++-------------

1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/block.c b/block.c

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ static void bdrv_replace_child_noperm(BdrvChild *child,

-static void bdrv_child_free(void *opaque)

- BdrvChild *c = opaque;

- g_free(c->name);

- g_free(c);

-static void bdrv_remove_empty_child(BdrvChild *child)

+/**

+ * Free the given @child.

+ *

+ * The child must be empty (i.e. `child->bs == NULL`) and it must be

+ * unused (i.e. not in a children list).

+ */

+static void bdrv_child_free(BdrvChild *child)

assert(!child->bs);

assert(!child->next.le_prev); /* not in children list */

- bdrv_child_free(child);

+ g_free(child->name);

+ g_free(child);

typedef struct BdrvAttachChildCommonState {

@@ -XXX,XX +XXX,XX @@ static void bdrv_attach_child_common_abort(void *opaque)

}

bdrv_unref(bs);

- bdrv_remove_empty_child(child);

+ bdrv_child_free(child);

*s->child = NULL;

}

@@ -XXX,XX +XXX,XX @@ static int bdrv_attach_child_common(BlockDriverState *child_bs,

if (ret < 0) {

error_propagate(errp, local_err);

- bdrv_remove_empty_child(new_child);

+ bdrv_child_free(new_child);

return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static void bdrv_detach_child(BdrvChild *child)

BlockDriverState *old_bs = child->bs;

bdrv_replace_child_noperm(child, NULL);

- bdrv_remove_empty_child(child);

+ bdrv_child_free(child);

if (old_bs) {

/*

2.33.1

bdrv_replace_child_noperm() modifies BdrvChild.bs, and can potentially

set it to NULL. That is dangerous, because BDS parents generally assume

that their children's .bs pointer is never NULL. We therefore want to

let bdrv_replace_child_noperm() set the corresponding BdrvChild pointer

to NULL, too.

This patch lays the foundation for it by passing a BdrvChild ** pointer

to bdrv_replace_child_noperm() so that it can later use it to NULL the

BdrvChild pointer immediately after setting BdrvChild.bs to NULL.

(We will still need to undertake some intermediate steps, though.)

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211111120829.81329-6-hreitz@redhat.com>

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Message-Id: <20211115145409.176785-6-kwolf@redhat.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

block.c | 23 ++++++++++++-----------

1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/block.c b/block.c

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ static BlockDriverState *bdrv_open_inherit(const char *filename,

static bool bdrv_recurse_has_child(BlockDriverState *bs,

BlockDriverState *child);

-static void bdrv_replace_child_noperm(BdrvChild *child,

+static void bdrv_replace_child_noperm(BdrvChild **child,

BlockDriverState *new_bs);

static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,

BdrvChild *child,

@@ -XXX,XX +XXX,XX @@ static void bdrv_replace_child_abort(void *opaque)

BlockDriverState *new_bs = s->child->bs;

/* old_bs reference is transparently moved from @s to @s->child */

- bdrv_replace_child_noperm(s->child, s->old_bs);

+ bdrv_replace_child_noperm(&s->child, s->old_bs);

bdrv_unref(new_bs);

@@ -XXX,XX +XXX,XX @@ static void bdrv_replace_child_tran(BdrvChild *child, BlockDriverState *new_bs,

if (new_bs) {

bdrv_ref(new_bs);

}

- bdrv_replace_child_noperm(child, new_bs);

+ bdrv_replace_child_noperm(&child, new_bs);

/* old_bs reference is transparently moved from @child to @s */

@@ -XXX,XX +XXX,XX @@ uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)

return permissions[qapi_perm];

-static void bdrv_replace_child_noperm(BdrvChild *child,

+static void bdrv_replace_child_noperm(BdrvChild **childp,

BlockDriverState *new_bs)

+ BdrvChild *child = *childp;

BlockDriverState *old_bs = child->bs;

int new_bs_quiesce_counter;

int drain_saldo;

@@ -XXX,XX +XXX,XX @@ static void bdrv_attach_child_common_abort(void *opaque)

BdrvChild *child = *s->child;

BlockDriverState *bs = child->bs;

- bdrv_replace_child_noperm(child, NULL);

+ bdrv_replace_child_noperm(s->child, NULL);

if (bdrv_get_aio_context(bs) != s->old_child_ctx) {

bdrv_try_set_aio_context(bs, s->old_child_ctx, &error_abort);

@@ -XXX,XX +XXX,XX @@ static int bdrv_attach_child_common(BlockDriverState *child_bs,

bdrv_ref(child_bs);

- bdrv_replace_child_noperm(new_child, child_bs);

+ bdrv_replace_child_noperm(&new_child, child_bs);

*child = new_child;

@@ -XXX,XX +XXX,XX @@ static int bdrv_attach_child_noperm(BlockDriverState *parent_bs,

return 0;

-static void bdrv_detach_child(BdrvChild *child)

+static void bdrv_detach_child(BdrvChild **childp)

- BlockDriverState *old_bs = child->bs;

+ BlockDriverState *old_bs = (*childp)->bs;

- bdrv_replace_child_noperm(child, NULL);

- bdrv_child_free(child);

+ bdrv_replace_child_noperm(childp, NULL);

+ bdrv_child_free(*childp);

if (old_bs) {

/*

@@ -XXX,XX +XXX,XX @@ void bdrv_root_unref_child(BdrvChild *child)

BlockDriverState *child_bs;

child_bs = child->bs;

- bdrv_detach_child(child);

+ bdrv_detach_child(&child);

bdrv_unref(child_bs);

2.33.1