* [PULL v4 00/42] Block layer patches and object-add QAPIfication
@ 2021-03-18 9:48 Kevin Wolf
2021-03-18 19:55 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Kevin Wolf @ 2021-03-18 9:48 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, peter.maydell, qemu-devel
The following changes since commit 571d413b5da6bc6f1c2aaca8484717642255ddb0:
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20210316' into staging (2021-03-17 21:02:37 +0000)
are available in the Git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to ef11a2d8972147994492c36cd3d26677e831e4d7:
vl: allow passing JSON to -object (2021-03-18 10:45:01 +0100)
----------------------------------------------------------------
Block layer patches and object-add QAPIfication
- QAPIfy object-add and --object
- stream: Fail gracefully if permission is denied
- storage-daemon: Fix crash on quit when job is still running
- curl: Fix use after free
- char: Deprecate backend aliases, fix QMP query-chardev-backends
- Fix image creation option defaults that exist in both the format and
the protocol layer (e.g. 'cluster_size' in qcow2 and rbd; the qcow2
default was incorrectly applied to the rbd layer)
----------------------------------------------------------------
Kevin Wolf (35):
storage-daemon: Call job_cancel_sync_all() on shutdown
stream: Don't crash when node permission is denied
tests: Drop 'props' from object-add calls
qapi/qom: Drop deprecated 'props' from object-add
qapi/qom: Add ObjectOptions for iothread
qapi/qom: Add ObjectOptions for authz-*
qapi/qom: Add ObjectOptions for cryptodev-*
qapi/qom: Add ObjectOptions for dbus-vmstate
qapi/qom: Add ObjectOptions for memory-backend-*
qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened'
qapi/qom: Add ObjectOptions for throttle-group
qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded'
qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded'
qapi/qom: Add ObjectOptions for can-*
qapi/qom: Add ObjectOptions for colo-compare
qapi/qom: Add ObjectOptions for filter-*
qapi/qom: Add ObjectOptions for pr-manager-helper
qapi/qom: Add ObjectOptions for confidential-guest-support
qapi/qom: Add ObjectOptions for input-*
qapi/qom: Add ObjectOptions for x-remote-object
qapi/qom: QAPIfy object-add
qom: Make "object" QemuOptsList optional
qemu-storage-daemon: Implement --object with qmp_object_add()
qom: Remove user_creatable_add_dict()
qom: Factor out user_creatable_process_cmdline()
qemu-io: Use user_creatable_process_cmdline() for --object
qemu-nbd: Use user_creatable_process_cmdline() for --object
qom: Add user_creatable_add_from_str()
qemu-img: Use user_creatable_process_cmdline() for --object
hmp: QAPIfy object_add
qom: Add user_creatable_parse_str()
char: Skip CLI aliases in query-chardev-backends
char: Deprecate backend aliases 'tty' and 'parport'
char: Simplify chardev_name_foreach()
qom: Support JSON in HMP object_add and tools --object
Max Reitz (2):
curl: Store BDRVCURLState pointer in CURLSocket
curl: Disconnect sockets from CURLState
Paolo Bonzini (3):
tests: convert check-qom-proplist to keyval
qom: move user_creatable_add_opts logic to vl.c and QAPIfy it
vl: allow passing JSON to -object
Stefan Hajnoczi (1):
block/export: disable VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD for now
Stefano Garzarella (1):
block: remove format defaults from QemuOpts in bdrv_create_file()
qapi/authz.json | 61 +++-
qapi/block-core.json | 27 ++
qapi/common.json | 52 +++
qapi/crypto.json | 159 +++++++++
qapi/machine.json | 22 +-
qapi/net.json | 20 --
qapi/qom.json | 646 +++++++++++++++++++++++++++++++++-
qapi/ui.json | 13 +-
docs/system/deprecated.rst | 31 +-
docs/system/removed-features.rst | 5 +
docs/tools/qemu-img.rst | 2 +-
include/qom/object_interfaces.h | 98 ++----
block.c | 36 +-
block/curl.c | 50 +--
block/export/vhost-user-blk-server.c | 3 +-
block/stream.c | 15 +-
chardev/char.c | 19 +-
hw/block/xen-block.c | 16 +-
monitor/hmp-cmds.c | 17 +-
monitor/misc.c | 2 -
qemu-img.c | 251 +++----------
qemu-io.c | 33 +-
qemu-nbd.c | 34 +-
qom/object_interfaces.c | 172 ++++-----
qom/qom-qmp-cmds.c | 28 +-
softmmu/vl.c | 84 ++++-
storage-daemon/qemu-storage-daemon.c | 28 +-
tests/qtest/qmp-cmd-test.c | 16 +-
tests/qtest/test-netfilter.c | 54 ++-
tests/unit/check-qom-proplist.c | 77 ++--
tests/unit/test-char.c | 6 -
hmp-commands.hx | 2 +-
storage-daemon/qapi/qapi-schema.json | 1 +
tests/qemu-iotests/tests/qsd-jobs | 86 +++++
tests/qemu-iotests/tests/qsd-jobs.out | 32 ++
35 files changed, 1517 insertions(+), 681 deletions(-)
create mode 100755 tests/qemu-iotests/tests/qsd-jobs
create mode 100644 tests/qemu-iotests/tests/qsd-jobs.out
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PULL v4 00/42] Block layer patches and object-add QAPIfication
2021-03-18 9:48 [PULL v4 00/42] Block layer patches and object-add QAPIfication Kevin Wolf
@ 2021-03-18 19:55 ` Peter Maydell
2021-03-19 9:19 ` Kevin Wolf
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2021-03-18 19:55 UTC (permalink / raw)
To: Kevin Wolf; +Cc: QEMU Developers, Qemu-block
On Thu, 18 Mar 2021 at 09:48, Kevin Wolf <kwolf@redhat.com> wrote:
>
> The following changes since commit 571d413b5da6bc6f1c2aaca8484717642255ddb0:
>
> Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20210316' into staging (2021-03-17 21:02:37 +0000)
>
> are available in the Git repository at:
>
> git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to ef11a2d8972147994492c36cd3d26677e831e4d7:
>
> vl: allow passing JSON to -object (2021-03-18 10:45:01 +0100)
>
> ----------------------------------------------------------------
> Block layer patches and object-add QAPIfication
>
> - QAPIfy object-add and --object
> - stream: Fail gracefully if permission is denied
> - storage-daemon: Fix crash on quit when job is still running
> - curl: Fix use after free
> - char: Deprecate backend aliases, fix QMP query-chardev-backends
> - Fix image creation option defaults that exist in both the format and
> the protocol layer (e.g. 'cluster_size' in qcow2 and rbd; the qcow2
> default was incorrectly applied to the rbd layer)
>
Auto-merging docs/system/removed-features.rst
CONFLICT (content): Merge conflict in docs/system/removed-features.rst
Auto-merging docs/system/deprecated.rst
CONFLICT (content): Merge conflict in docs/system/deprecated.rst
I'm afraid your pullreq was racing with another one deprecating features :-(
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PULL v4 00/42] Block layer patches and object-add QAPIfication
2021-03-18 19:55 ` Peter Maydell
@ 2021-03-19 9:19 ` Kevin Wolf
0 siblings, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2021-03-19 9:19 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers, Qemu-block
Am 18.03.2021 um 20:55 hat Peter Maydell geschrieben:
> On Thu, 18 Mar 2021 at 09:48, Kevin Wolf <kwolf@redhat.com> wrote:
> >
> > The following changes since commit 571d413b5da6bc6f1c2aaca8484717642255ddb0:
> >
> > Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20210316' into staging (2021-03-17 21:02:37 +0000)
> >
> > are available in the Git repository at:
> >
> > git://repo.or.cz/qemu/kevin.git tags/for-upstream
> >
> > for you to fetch changes up to ef11a2d8972147994492c36cd3d26677e831e4d7:
> >
> > vl: allow passing JSON to -object (2021-03-18 10:45:01 +0100)
> >
> > ----------------------------------------------------------------
> > Block layer patches and object-add QAPIfication
> >
> > - QAPIfy object-add and --object
> > - stream: Fail gracefully if permission is denied
> > - storage-daemon: Fix crash on quit when job is still running
> > - curl: Fix use after free
> > - char: Deprecate backend aliases, fix QMP query-chardev-backends
> > - Fix image creation option defaults that exist in both the format and
> > the protocol layer (e.g. 'cluster_size' in qcow2 and rbd; the qcow2
> > default was incorrectly applied to the rbd layer)
> >
>
> Auto-merging docs/system/removed-features.rst
> CONFLICT (content): Merge conflict in docs/system/removed-features.rst
> Auto-merging docs/system/deprecated.rst
> CONFLICT (content): Merge conflict in docs/system/deprecated.rst
>
> I'm afraid your pullreq was racing with another one deprecating features :-(
I'm not sure that not resolving trivial merge conflicts on your side is
saving anyone's time. Well, v5 is coming.
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-19 9:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 9:48 [PULL v4 00/42] Block layer patches and object-add QAPIfication Kevin Wolf
2021-03-18 19:55 ` Peter Maydell
2021-03-19 9:19 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).