From: Markus Armbruster <armbru@redhat.com>

Section "Block QAPI, monitor, command line" is about the external

interfaces we provide for block devices. It covers the relevant QAPI

schema parts, monitor and command line code, more or less.

The section's files are also covered by section "Block layer core",

except for the QAPI schema files.

I haven't acted as maintainer in this area for a long time. Make it

official: add the QAPI schema files to section "Block layer core", and

delete section "Block QAPI, monitor, command line".

Cc: Kevin Wolf <kwolf@redhat.com>

Cc: Hanna Reitz <hreitz@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Message-Id: <20221020120541.80757-1-armbru@redhat.com>

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

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

---

MAINTAINERS | 12 ++----------

1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS

index XXXXXXX..XXXXXXX 100644

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ S: Supported

F: block*

F: block/

F: hw/block/

+F: qapi/block*.json

+F: qapi/transaction.json

F: include/block/

F: qemu-img*

F: docs/tools/qemu-img.rst

@@ -XXX,XX +XXX,XX @@ F: include/qemu/co-shared-resource.h

T: git https://gitlab.com/jsnow/qemu.git jobs

T: git https://gitlab.com/vsementsov/qemu.git block

-Block QAPI, monitor, command line

-M: Markus Armbruster <armbru@redhat.com>

-S: Supported

-F: blockdev.c

-F: blockdev-hmp-cmds.c

-F: block/qapi.c

-F: qapi/block*.json

-F: qapi/transaction.json

-T: git https://repo.or.cz/qemu/armbru.git block-next

-

Compute Express Link

M: Ben Widawsky <ben.widawsky@intel.com>

M: Jonathan Cameron <jonathan.cameron@huawei.com>

--

2.37.3

From: Bin Meng <bin.meng@windriver.com>

The temporary file has been created and is ready for use. Checking

return value of close() does not seem useful. The file descriptor

is almost certainly closed; see close(2) under "Dealing with error

returns from close()".

Let's simply ignore close() failure here.

Suggested-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Message-Id: <20221010040432.3380478-1-bin.meng@windriver.com>

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

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

---

block.c | 5 +----

1 file changed, 1 insertion(+), 4 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int get_tmp_filename(char *filename, int size)

if (fd < 0) {

return -errno;

}

- if (close(fd) != 0) {

- unlink(filename);

- return -errno;

- }

+ close(fd);

return 0;

#endif

}

--

2.37.3

From: Hervé Poussineau <hpoussin@reactos.org>

'reserved1' field in bootsector is used to mark volume dirty, or need to verify.

Allow writes to bootsector which only changes the 'reserved1' field.

This fixes I/O errors on Windows guests.

Resolves: https://bugs.launchpad.net/qemu/+bug/1889421

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Message-Id: <20221010175511.3414357-2-hpoussin@reactos.org>

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

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

---

block/vvfat.c | 26 +++++++++++++++++++++++++-

1 file changed, 25 insertions(+), 1 deletion(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vvfat.c

+++ b/block/vvfat.c

@@ -XXX,XX +XXX,XX @@ DLOG(checkpoint());

vvfat_close_current_file(s);

+ if (sector_num == s->offset_to_bootsector && nb_sectors == 1) {

+ /*

+ * Write on bootsector. Allow only changing the reserved1 field,

+ * used to mark volume dirtiness

+ */

+ unsigned char *bootsector = s->first_sectors

+ + s->offset_to_bootsector * 0x200;

+ /*

+ * LATER TODO: if FAT32, this is wrong (see init_directories(),

+ * which always creates a FAT16 bootsector)

+ */

+ const int reserved1_offset = offsetof(bootsector_t, u.fat16.reserved1);

+

+ for (i = 0; i < 0x200; i++) {

+ if (i != reserved1_offset && bootsector[i] != buf[i]) {

+ fprintf(stderr, "Tried to write to protected bootsector\n");

+ return -1;

+ }

+ }

+

+ /* Update bootsector with the only updatable byte, and return success */

+ bootsector[reserved1_offset] = buf[reserved1_offset];

+ return 0;

+ }

+

/*

* Some sanity checks:

* - do not allow writing to the boot sector

*/

-

if (sector_num < s->offset_to_fat)

return -1;

--

2.37.3

From: Hervé Poussineau <hpoussin@reactos.org>

In R/W mode, files with spaces were never created on host side.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1176

Fixes: c79e243ed67683d6d06692bd7040f7394da178b0

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

Message-Id: <20221010175511.3414357-3-hpoussin@reactos.org>

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

---

block/vvfat.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vvfat.c

+++ b/block/vvfat.c

@@ -XXX,XX +XXX,XX @@ static bool valid_filename(const unsigned char *name)

(c >= 'A' && c <= 'Z') ||

(c >= 'a' && c <= 'z') ||

c > 127 ||

- strchr("$%'-_@~`!(){}^#&.+,;=[]", c) != NULL))

+ strchr(" $%'-_@~`!(){}^#&.+,;=[]", c) != NULL))

{

return false;

}

--

2.37.3

From: Sam Li <faithilikerun@gmail.com>

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1193

The commit "Use io_uring_register_ring_fd() to skip fd operations" broke

when booting a guest with iothread and io_uring. That is because the

io_uring_register_ring_fd() call is made from the main thread instead of

IOThread where io_uring_submit() is called. It can not be guaranteed

to register the ring fd in the correct thread or unregister the same ring

fd if the IOThread is disabled. This optimization is not critical so we

will revert previous commit.

This reverts commit e2848bc574fe2715c694bf8fe9a1ba7f78a1125a

and 77e3f038af1764983087e3551a0fde9951952c4d.

Cc: qemu-stable@nongnu.org

Signed-off-by: Sam Li <faithilikerun@gmail.com>

Message-Id: <20220924144815.5591-1-faithilikerun@gmail.com>

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Tested-by: Dario Faggioli <dfaggioli@suse.com>

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

---

block/io_uring.c | 13 +------------

meson.build | 1 -

2 files changed, 1 insertion(+), 13 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block/io_uring.c

+++ b/block/io_uring.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include <liburing.h>

#include "block/aio.h"

-#include "qemu/error-report.h"

#include "qemu/queue.h"

#include "block/block.h"

#include "block/raw-aio.h"

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "trace.h"

-

/* io_uring ring size */

#define MAX_ENTRIES 128

@@ -XXX,XX +XXX,XX @@ LuringState *luring_init(Error **errp)

}

ioq_init(&s->io_q);

-#ifdef CONFIG_LIBURING_REGISTER_RING_FD

- if (io_uring_register_ring_fd(&s->ring) < 0) {

- /*

- * Only warn about this error: we will fallback to the non-optimized

- * io_uring operations.

- */

- warn_report("failed to register linux io_uring ring file descriptor");

- }

-#endif

-

return s;

+

}

void luring_cleanup(LuringState *s)

diff --git a/meson.build b/meson.build

index XXXXXXX..XXXXXXX 100644

--- a/meson.build

+++ b/meson.build

@@ -XXX,XX +XXX,XX @@ config_host_data.set('CONFIG_LIBNFS', libnfs.found())

config_host_data.set('CONFIG_LIBSSH', libssh.found())

config_host_data.set('CONFIG_LINUX_AIO', libaio.found())

config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())

-config_host_data.set('CONFIG_LIBURING_REGISTER_RING_FD', cc.has_function('io_uring_register_ring_fd', prefix: '#include <liburing.h>', dependencies:linux_io_uring))

config_host_data.set('CONFIG_LIBPMEM', libpmem.found())

config_host_data.set('CONFIG_NUMA', numa.found())

config_host_data.set('CONFIG_OPENGL', opengl.found())

--

2.37.3

From: Li Feng <fengli@smartx.com>

If the os is not installed and doesn't have the virtio guest driver,

the vhost dev isn't started, so the dev->vdev is NULL.

Reproduce: mount a Win 2019 iso, go into the install ui, then resize

the virtio-blk device, qemu crash.

Signed-off-by: Li Feng <fengli@smartx.com>

Message-Id: <20220919121816.3252223-1-fengli@smartx.com>

Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>

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

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

---

hw/block/vhost-user-blk.c | 4 ++++

1 file changed, 4 insertions(+)

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/block/vhost-user-blk.c

+++ b/hw/block/vhost-user-blk.c

@@ -XXX,XX +XXX,XX @@ static int vhost_user_blk_handle_config_change(struct vhost_dev *dev)

VHostUserBlk *s = VHOST_USER_BLK(dev->vdev);

Error *local_err = NULL;

+ if (!dev->started) {

+ return 0;

+ }

+

ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,

vdev->config_len, &local_err);

if (ret < 0) {

--

2.37.3

From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Unfortunately not all filters use .file child as filtered child. Two

exclusions are mirror_top and commit_top. Happily they both are private

filters. Bad thing is that this inconsistency is observable through qmp

commands query-block / query-named-block-nodes. So, could we just

change mirror_top and commit_top to use file child as all other filter

driver is an open question. Probably, we could do that with some kind

of deprecation period, but how to warn users during it?

For now, let's just add a field so we can distinguish them in generic

code, it will be used in further commits.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

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

Message-Id: <20220726201134.924743-2-vsementsov@yandex-team.ru>

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

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

---

include/block/block_int-common.h | 13 +++++++++++++

block/commit.c | 1 +

block/mirror.c | 1 +

3 files changed, 15 insertions(+)

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int-common.h

+++ b/include/block/block_int-common.h

@@ -XXX,XX +XXX,XX @@ struct BlockDriver {

* (And this filtered child must then be bs->file or bs->backing.)

*/

bool is_filter;

+ /*

+ * Only make sense for filter drivers, for others must be false.

+ * If true, filtered child is bs->backing. Otherwise it's bs->file.

+ * Only two internal filters use bs->backing as filtered child and has this

+ * field set to true: mirror_top and commit_top.

+ *

+ * Never create any more such filters!

+ *

+ * TODO: imagine how to deprecate this behavior and make all filters work

+ * similarly using bs->file as filtered child.

+ */

+ bool filtered_child_is_backing;

+

/*

* Set to true if the BlockDriver is a format driver. Format nodes

* generally do not expect their children to be other format nodes

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

index XXXXXXX..XXXXXXX 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_commit_top = {

.bdrv_child_perm = bdrv_commit_top_child_perm,

.is_filter = true,

+ .filtered_child_is_backing = true,

};

void commit_start(const char *job_id, BlockDriverState *bs,

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

index XXXXXXX..XXXXXXX 100644

--- a/block/mirror.c

+++ b/block/mirror.c

@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_mirror_top = {

.bdrv_child_perm = bdrv_mirror_top_child_perm,

.is_filter = true,

+ .filtered_child_is_backing = true,

};

static BlockJob *mirror_start_job(

--

2.37.3

From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Almost all drivers call bdrv_open_child() similarly. Let's create a

helper for this.

The only not updated drivers that call bdrv_open_child() to set

bs->file are raw-format and snapshot-access:

raw-format sometimes want to have filtered child but

don't set drv->is_filter to true.

snapshot-access wants only DATA | PRIMARY

Possibly we should implement drv->is_filter_func() handler, to consider

raw-format as filter when it works as filter.. But it's another story.

Note also, that we decrease assignments to bs->file in code: it helps

us restrict modifying this field in further commit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

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

Message-Id: <20220726201134.924743-3-vsementsov@yandex-team.ru>

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

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

---

include/block/block-global-state.h | 3 +++

block.c | 21 +++++++++++++++++++++

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

block/blklogwrites.c | 7 ++-----

block/blkreplay.c | 7 ++-----

block/blkverify.c | 9 +++------

block/bochs.c | 7 +++----

block/cloop.c | 7 +++----

block/copy-before-write.c | 9 ++++-----

block/copy-on-read.c | 9 ++++-----

block/crypto.c | 11 ++++++-----

block/dmg.c | 7 +++----

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

block/parallels.c | 7 +++----

block/preallocate.c | 9 ++++-----

block/qcow.c | 6 ++----

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

block/qed.c | 8 ++++----

block/replication.c | 8 +++-----

block/throttle.c | 8 +++-----

block/vdi.c | 7 +++----

block/vhdx.c | 7 +++----

block/vmdk.c | 7 +++----

block/vpc.c | 7 +++----

24 files changed, 95 insertions(+), 101 deletions(-)

diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block-global-state.h

+++ b/include/block/block-global-state.h

@@ -XXX,XX +XXX,XX @@ BdrvChild *bdrv_open_child(const char *filename,

const BdrvChildClass *child_class,

BdrvChildRole child_role,

bool allow_none, Error **errp);

+int bdrv_open_file_child(const char *filename,

+ QDict *options, const char *bdref_key,

+ BlockDriverState *parent, Error **errp);

BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp);

int bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd,

Error **errp);

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ BdrvChild *bdrv_open_child(const char *filename,

errp);

}

+/*

+ * Wrapper on bdrv_open_child() for most popular case: open primary child of bs.

+ */

+int bdrv_open_file_child(const char *filename,

+ QDict *options, const char *bdref_key,

+ BlockDriverState *parent, Error **errp)

+{

+ BdrvChildRole role;

+

+ /* commit_top and mirror_top don't use this function */

+ assert(!parent->drv->filtered_child_is_backing);

+

+ role = parent->drv->is_filter ?

+ (BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY) : BDRV_CHILD_IMAGE;

+

+ parent->file = bdrv_open_child(filename, options, bdref_key, parent,

+ &child_of_bds, role, false, errp);

+

+ return parent->file ? 0 : -EINVAL;

+}

+

/*

* TODO Future callers may need to specify parent/child_class in order for

* option inheritance to work. Existing callers use it for the root node.

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 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,

}

/* Open the image file */

- bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",

- bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- ret = -EINVAL;

+ ret = bdrv_open_file_child(qemu_opt_get(opts, "x-image"), options, "image",

+ bs, errp);

+ if (ret < 0) {

goto out;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/blklogwrites.c

+++ b/block/blklogwrites.c

@@ -XXX,XX +XXX,XX @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags,

}

/* Open the file */

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, false,

- errp);

- if (!bs->file) {

- ret = -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

goto fail;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/blkreplay.c

+++ b/block/blkreplay.c

@@ -XXX,XX +XXX,XX @@ static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags,

int ret;

/* Open the image file */

- bs->file = bdrv_open_child(NULL, options, "image", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- ret = -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "image", bs, errp);

+ if (ret < 0) {

goto fail;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/blkverify.c

+++ b/block/blkverify.c

@@ -XXX,XX +XXX,XX @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,

}

/* Open the raw file */

- bs->file = bdrv_open_child(qemu_opt_get(opts, "x-raw"), options, "raw",

- bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- ret = -EINVAL;

+ ret = bdrv_open_file_child(qemu_opt_get(opts, "x-raw"), options, "raw",

+ bs, errp);

+ if (ret < 0) {

goto fail;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/bochs.c

+++ b/block/bochs.c

@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,

return ret;

}

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

ret = bdrv_pread(bs->file, 0, sizeof(bochs), &bochs, 0);

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

index XXXXXXX..XXXXXXX 100644

--- a/block/cloop.c

+++ b/block/cloop.c

@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,

return ret;

}

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

/* read header */

diff --git a/block/copy-before-write.c b/block/copy-before-write.c

index XXXXXXX..XXXXXXX 100644

--- a/block/copy-before-write.c

+++ b/block/copy-before-write.c

@@ -XXX,XX +XXX,XX @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,

int64_t cluster_size;

g_autoptr(BlockdevOptions) full_opts = NULL;

BlockdevOptionsCbw *opts;

+ int ret;

full_opts = cbw_parse_options(options, errp);

if (!full_opts) {

@@ -XXX,XX +XXX,XX @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,

assert(full_opts->driver == BLOCKDEV_DRIVER_COPY_BEFORE_WRITE);

opts = &full_opts->u.copy_before_write;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

s->target = bdrv_open_child(NULL, options, "target", bs, &child_of_bds,

diff --git a/block/copy-on-read.c b/block/copy-on-read.c

index XXXXXXX..XXXXXXX 100644

--- a/block/copy-on-read.c

+++ b/block/copy-on-read.c

@@ -XXX,XX +XXX,XX @@ static int cor_open(BlockDriverState *bs, QDict *options, int flags,

BDRVStateCOR *state = bs->opaque;

/* Find a bottom node name, if any */

const char *bottom_node = qdict_get_try_str(options, "bottom");

+ int ret;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

bs->supported_read_flags = BDRV_REQ_PREFETCH;

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

index XXXXXXX..XXXXXXX 100644

--- a/block/crypto.c

+++ b/block/crypto.c

@@ -XXX,XX +XXX,XX @@ static int block_crypto_open_generic(QCryptoBlockFormat format,

{

BlockCrypto *crypto = bs->opaque;

QemuOpts *opts = NULL;

- int ret = -EINVAL;

+ int ret;

QCryptoBlockOpenOptions *open_opts = NULL;

unsigned int cflags = 0;

QDict *cryptoopts = NULL;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

bs->supported_write_flags = BDRV_REQ_FUA &

@@ -XXX,XX +XXX,XX @@ static int block_crypto_open_generic(QCryptoBlockFormat format,

opts = qemu_opts_create(opts_spec, NULL, 0, &error_abort);

if (!qemu_opts_absorb_qdict(opts, options, errp)) {

+ ret = -EINVAL;

goto cleanup;

}

@@ -XXX,XX +XXX,XX @@ static int block_crypto_open_generic(QCryptoBlockFormat format,

open_opts = block_crypto_open_opts_init(cryptoopts, errp);

if (!open_opts) {

+ ret = -EINVAL;

goto cleanup;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/dmg.c

+++ b/block/dmg.c

@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,

return ret;

}

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

block_module_load_one("dmg-bz2");

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

index XXXXXXX..XXXXXXX 100644

--- a/block/filter-compress.c

+++ b/block/filter-compress.c

@@ -XXX,XX +XXX,XX @@

static int compress_open(BlockDriverState *bs, QDict *options, int flags,

Error **errp)

{

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ int ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) {

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

index XXXXXXX..XXXXXXX 100644

--- a/block/parallels.c

+++ b/block/parallels.c

@@ -XXX,XX +XXX,XX @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,

Error *local_err = NULL;

char *buf;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

ret = bdrv_pread(bs->file, 0, sizeof(ph), &ph, 0);

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

index XXXXXXX..XXXXXXX 100644

--- a/block/preallocate.c

+++ b/block/preallocate.c

@@ -XXX,XX +XXX,XX @@ static int preallocate_open(BlockDriverState *bs, QDict *options, int flags,

Error **errp)

{

BDRVPreallocateState *s = bs->opaque;

+ int ret;

/*

* s->data_end and friends should be initialized on permission update.

@@ -XXX,XX +XXX,XX @@ static int preallocate_open(BlockDriverState *bs, QDict *options, int flags,

*/

s->file_end = s->zero_start = s->data_end = -EINVAL;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

if (!preallocate_absorb_opts(&s->opts, options, bs->file->bs, errp)) {

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow.c

+++ b/block/qcow.c

@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,

qdict_extract_subqdict(options, &encryptopts, "encrypt.");

encryptfmt = qdict_get_try_str(encryptopts, "format");

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- ret = -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

goto fail;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,

.errp = errp,

.ret = -EINPROGRESS

};

+ int ret;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

/* Initialise locks */

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qed.c

+++ b/block/qed.c

@@ -XXX,XX +XXX,XX @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags,

.errp = errp,

.ret = -EINPROGRESS

};

+ int ret;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

bdrv_qed_init_state(bs);

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

index XXXXXXX..XXXXXXX 100644

--- a/block/replication.c

+++ b/block/replication.c

@@ -XXX,XX +XXX,XX @@ static int replication_open(BlockDriverState *bs, QDict *options,

const char *mode;

const char *top_id;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

ret = -EINVAL;

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

index XXXXXXX..XXXXXXX 100644

--- a/block/throttle.c

+++ b/block/throttle.c

@@ -XXX,XX +XXX,XX @@ static int throttle_open(BlockDriverState *bs, QDict *options,

char *group;

int ret;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

- false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

bs->supported_write_flags = bs->file->bs->supported_write_flags |

BDRV_REQ_WRITE_UNCHANGED;

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vdi.c

+++ b/block/vdi.c

@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,

int ret;

QemuUUID uuid_link, uuid_parent;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

logout("\n");

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,

uint64_t signature;

Error *local_err = NULL;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

s->bat = NULL;

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vmdk.c

+++ b/block/vmdk.c

@@ -XXX,XX +XXX,XX @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags,

BDRVVmdkState *s = bs->opaque;

uint32_t magic;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

buf = vmdk_read_desc(bs->file, 0, errp);

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vpc.c

+++ b/block/vpc.c

@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,

int ret;

int64_t bs_size;

- bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

- BDRV_CHILD_IMAGE, false, errp);

- if (!bs->file) {

- return -EINVAL;

+ ret = bdrv_open_file_child(NULL, options, "file", bs, errp);

+ if (ret < 0) {

+ return ret;

}

opts = qemu_opts_create(&vpc_runtime_opts, NULL, 0, &error_abort);