[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] d20577: block: remove format defaults from Qe
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] d20577: block: remove format defaults from QemuOpts in bdr... |
|
Date: |
Fri, 12 Mar 2021 09:53:05 -0800 |
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: d205774578a60d1976baae6c36c0c382be367427
https://github.com/qemu/qemu/commit/d205774578a60d1976baae6c36c0c382be367427
Author: Stefano Garzarella <sgarzare@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M block.c
Log Message:
-----------
block: remove format defaults from QemuOpts in bdrv_create_file()
QemuOpts is usually created merging the QemuOptsList of format
and protocol. So, when the format calls bdr_create_file(), the 'opts'
parameter contains a QemuOptsList with a combination of format and
protocol default values.
The format properly removes its options before calling
bdr_create_file(), but the default values remain in 'opts->list'.
So if the protocol has options with the same name (e.g. rbd has
'cluster_size' as qcow2), it will see the default values of the format,
since for overlapping options, the format wins.
To avoid this issue, lets convert QemuOpts to QDict, in this way we take
only the set options, and then convert it back to QemuOpts, using the
'create_opts' of the protocol. So the new QemuOpts, will contain only the
protocol defaults.
Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210308161232.248833-1-sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: f2826956a054c319bb05c2423cfc98ee7aeeb2ea
https://github.com/qemu/qemu/commit/f2826956a054c319bb05c2423cfc98ee7aeeb2ea
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M storage-daemon/qemu-storage-daemon.c
A tests/qemu-iotests/tests/qsd-jobs
A tests/qemu-iotests/tests/qsd-jobs.out
Log Message:
-----------
storage-daemon: Call job_cancel_sync_all() on shutdown
bdrv_close_all() asserts that no jobs are running any more, so we need
to cancel all jobs first to avoid failing the assertion.
Fixes: b55a3c8860b763b62b2cc2f4a6f55379977bbde5
Reported-by: Nini Gu <ngu@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210309121814.31078-1-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: a59f8bd8050a3d7b4e892850c2712f3786c3bc1a
https://github.com/qemu/qemu/commit/a59f8bd8050a3d7b4e892850c2712f3786c3bc1a
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M block/stream.c
M tests/qemu-iotests/tests/qsd-jobs
M tests/qemu-iotests/tests/qsd-jobs.out
Log Message:
-----------
stream: Don't crash when node permission is denied
The image streaming block job restricts shared permissions of the nodes
it accesses. This can obviously fail when other users already got these
permissions. &error_abort is therefore wrong and can crash. Handle these
errors gracefully and just fail starting the block job.
Reported-by: Nini Gu <ngu@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210309173451.45152-1-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 0d1834df042bcbe535ede4c31c630439e2d31eda
https://github.com/qemu/qemu/commit/0d1834df042bcbe535ede4c31c630439e2d31eda
Author: Max Reitz <mreitz@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M block/curl.c
Log Message:
-----------
curl: Store BDRVCURLState pointer in CURLSocket
A socket does not really belong to any specific state. We do not need
to store a pointer to "its" state in it, a pointer to the common
BDRVCURLState is sufficient.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210309130541.37540-2-mreitz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 69f24658c2f900ea5e002a1057ff3ffbf35d4bc3
https://github.com/qemu/qemu/commit/69f24658c2f900ea5e002a1057ff3ffbf35d4bc3
Author: Max Reitz <mreitz@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M block/curl.c
Log Message:
-----------
curl: Disconnect sockets from CURLState
When a curl transfer is finished, that does not mean that CURL lets go
of all the sockets it used for it. We therefore must not free a
CURLSocket object before CURL has invoked curl_sock_cb() to tell us to
remove it. Otherwise, we may get a use-after-free, as described in this
bug report: https://bugs.launchpad.net/qemu/+bug/1916501
(Reproducer from that report:
$ qemu-img convert -f qcow2 -O raw \
https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img \
out.img
)
(Alternatively, it might seem logical to force-drop all sockets that
have been used for a state when the respective transfer is done, kind of
like it is done now, but including unsetting the AIO handlers.
Unfortunately, doing so makes the driver just hang instead of crashing,
which seems to evidence that CURL still uses those sockets.)
Make the CURLSocket object independent of "its" CURLState by putting all
sockets into a hash table belonging to the BDRVCURLState instead of a
list that belongs to a CURLState. Do not touch any sockets in
curl_clean_state().
Testing, it seems like all sockets are indeed gone by the time the curl
BDS is closed, so it seems like there really was no point in freeing any
socket just because a transfer is done. libcurl does invoke
curl_sock_cb() with CURL_POLL_REMOVE for every socket it has.
Buglink: https://bugs.launchpad.net/qemu/+bug/1916501
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210309130541.37540-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 41b8409da54b4f747c7db663046aa0233fad1fd1
https://github.com/qemu/qemu/commit/41b8409da54b4f747c7db663046aa0233fad1fd1
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M block/export/vhost-user-blk-server.c
Log Message:
-----------
block/export: disable VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD for now
The vhost-user in-flight shmfd feature has not been tested with
qemu-storage-daemon's vhost-user-blk server. Disable this optional
feature for now because it requires MFD_ALLOW_SEALING, which is not
available in some CI environments.
If we need this feature in the future it can be re-enabled after
testing.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Cc: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210309094106.196911-2-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: ca7d7c7da07f7c7926654509f464a4bb42e336ce
https://github.com/qemu/qemu/commit/ca7d7c7da07f7c7926654509f464a4bb42e336ce
Author: Coiby Xu <coiby.xu@gmail.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M MAINTAINERS
M tests/qtest/libqos/meson.build
A tests/qtest/libqos/vhost-user-blk.c
A tests/qtest/libqos/vhost-user-blk.h
M tests/qtest/meson.build
A tests/qtest/vhost-user-blk-test.c
Log Message:
-----------
test: new qTest case to test the vhost-user-blk-server
This test case has the same tests as tests/virtio-blk-test.c except for
tests have block_resize. Since the vhost-user-blk export only serves one
client one time, two exports are started by qemu-storage-daemon for the
hotplug test.
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210309094106.196911-3-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 00be6e990c1c3aa10e5816e4a69deedcdfde48f3
https://github.com/qemu/qemu/commit/00be6e990c1c3aa10e5816e4a69deedcdfde48f3
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M tests/qtest/vhost-user-blk-test.c
Log Message:
-----------
tests/qtest: add multi-queue test case to vhost-user-blk-test
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210309094106.196911-4-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: f74dbc292963d47b055d9352d55f86f74b90ed94
https://github.com/qemu/qemu/commit/f74dbc292963d47b055d9352d55f86f74b90ed94
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M tests/qtest/vhost-user-blk-test.c
Log Message:
-----------
vhost-user-blk-test: test discard/write zeroes invalid inputs
Exercise input validation code paths in
block/export/vhost-user-blk-server.c.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210309094106.196911-5-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 3bb9d26e7b63cd8b2a9ba01c38591bf553df0cad
https://github.com/qemu/qemu/commit/3bb9d26e7b63cd8b2a9ba01c38591bf553df0cad
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M tests/qtest/qmp-cmd-test.c
M tests/qtest/test-netfilter.c
Log Message:
-----------
tests: Drop 'props' from object-add calls
The 'props' option has been deprecated in 5.0 in favour of a flattened
object-add command. Time to change our test cases to drop the deprecated
option.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 0883333c2f06d592be3be9726a87975b516dce32
https://github.com/qemu/qemu/commit/0883333c2f06d592be3be9726a87975b516dce32
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M docs/system/deprecated.rst
M docs/system/removed-features.rst
M qapi/qom.json
M qom/qom-qmp-cmds.c
Log Message:
-----------
qapi/qom: Drop deprecated 'props' from object-add
The option has been deprecated in QEMU 5.0, remove it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 6150fe932f9282c38af08b42795ead66c2f95a91
https://github.com/qemu/qemu/commit/6150fe932f9282c38af08b42795ead66c2f95a91
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for iothread
Add an ObjectOptions union that will eventually describe the options of
all user creatable object types. As unions can't exist without any
branches, also add the first object type.
This adds a QAPI schema for the properties of the iothread object.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 90f2aacec651345f2a831d5b326fa48ede2a8d33
https://github.com/qemu/qemu/commit/90f2aacec651345f2a831d5b326fa48ede2a8d33
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/authz.json
M qapi/qom.json
M storage-daemon/qapi/qapi-schema.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for authz-*
This adds a QAPI schema for the properties of the authz-* objects.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: d77345907dff46ed924b1e102f9f63cb8551547f
https://github.com/qemu/qemu/commit/d77345907dff46ed924b1e102f9f63cb8551547f
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for cryptodev-*
This adds a QAPI schema for the properties of the cryptodev-* objects.
These interfaces have some questionable aspects (cryptodev-backend is
really an abstract base class without function, and the queues option
only makes sense for cryptodev-vhost-user), but as the goal is to
represent the existing interface in QAPI, leave these things in place.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 971c9eb5e2c5b0a22d495a88f7e7bd9308f6404a
https://github.com/qemu/qemu/commit/971c9eb5e2c5b0a22d495a88f7e7bd9308f6404a
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for dbus-vmstate
This adds a QAPI schema for the properties of the dbus-vmstate object.
A list represented as a comma separated string is clearly not very
QAPI-like, but for now just describe the existing interface.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 5a61b89e26fb141b61011fd42fd5dd5a51475310
https://github.com/qemu/qemu/commit/5a61b89e26fb141b61011fd42fd5dd5a51475310
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/common.json
M qapi/machine.json
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for memory-backend-*
This adds a QAPI schema for the properties of the memory-backend-*
objects.
HostMemPolicy has to be moved to an include file that can be used by the
storage daemon, too, because ObjectOptions must be the same in all
binaries if we don't want to compile the whole code multiple times.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: febb7f5603ce9af1bdff69acc9e85bcb1e8c6ee6
https://github.com/qemu/qemu/commit/febb7f5603ce9af1bdff69acc9e85bcb1e8c6ee6
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M docs/system/deprecated.rst
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened'
This adds a QAPI schema for the properties of the rng-* objects.
The 'opened' property doesn't seem to make sense as an external
interface: It is automatically set to true in ucc->complete, and
explicitly setting it to true earlier just means that trying to set
additional options will result in an error. After the property has once
been set to true (i.e. when the object construction has completed), it
can never be reset to false. In other words, the 'opened' property is
useless. Mark it as deprecated in the schema from the start.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 808e8567c2b4415d14688fdfe4c3d0eacd4e842f
https://github.com/qemu/qemu/commit/808e8567c2b4415d14688fdfe4c3d0eacd4e842f
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/block-core.json
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for throttle-group
This adds a QAPI schema for the properties of the throttle-group object.
The only purpose of the x-* properties is to make the nested options in
'limits' available for a command line parser that doesn't support
structs. Any parser that will use the QAPI schema will supports structs,
though, so they will not be needed in the schema in the future.
To keep the conversion straightforward, add them to the schema anyway.
We can then remove the options and adjust documentation, test cases etc.
in a separate patch.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 87ff4986cba2e37cccfadee43693e56ea4aaf8b4
https://github.com/qemu/qemu/commit/87ff4986cba2e37cccfadee43693e56ea4aaf8b4
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M docs/system/deprecated.rst
M qapi/crypto.json
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded'
This adds a QAPI schema for the properties of the secret* objects.
The 'loaded' property doesn't seem to make sense as an external
interface: It is automatically set to true in ucc->complete, and
explicitly setting it to true earlier just means that additional options
will be silently ignored.
In other words, the 'loaded' property is useless. Mark it as deprecated
in the schema from the start.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 2e231e24679d33524386a17cf56010ee0582ab97
https://github.com/qemu/qemu/commit/2e231e24679d33524386a17cf56010ee0582ab97
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/crypto.json
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded'
This adds a QAPI schema for the properties of the tls-* objects.
The 'loaded' property doesn't seem to make sense as an external
interface: It is automatically set to true in ucc->complete, and
explicitly setting it to true earlier just means that additional options
will be silently ignored.
In other words, the 'loaded' property is useless. Mark it as deprecated
in the schema from the start.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 90ad62c3039a9c8ac8f2edfa5e56df6b71d27480
https://github.com/qemu/qemu/commit/90ad62c3039a9c8ac8f2edfa5e56df6b71d27480
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for can-*
This adds a QAPI schema for the properties of the can-* objects.
can-bus doesn't have any properties, so it only needs to be added to the
ObjectType enum without adding a new branch to ObjectOptions.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 042063095cf15ad3d93cc957c03e210fce9f080b
https://github.com/qemu/qemu/commit/042063095cf15ad3d93cc957c03e210fce9f080b
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for colo-compare
This adds a QAPI schema for the properties of the colo-compare object.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 501ccd06286fd86811e764017911729116edd34d
https://github.com/qemu/qemu/commit/501ccd06286fd86811e764017911729116edd34d
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/common.json
M qapi/net.json
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for filter-*
This adds a QAPI schema for the properties of the filter-* objects.
Some parts of the interface (in particular NetfilterProperties.position)
are very unusual for QAPI, but for now just describe the existing
interface.
net.json can't be included in qom.json because the storage daemon
doesn't have it. NetFilterDirection is still required in the new object
property definitions in qom.json, so move this enum to common.json.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 144aefe691815bdd875a57683dd7007b1fa64a1b
https://github.com/qemu/qemu/commit/144aefe691815bdd875a57683dd7007b1fa64a1b
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for pr-manager-helper
This adds a QAPI schema for the properties of the pr-manager-helper
object.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: ebce1b8a4c6ef2d8b6c36a402dbe2112b5878cf5
https://github.com/qemu/qemu/commit/ebce1b8a4c6ef2d8b6c36a402dbe2112b5878cf5
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for confidential-guest-support
This adds a QAPI schema for the properties of the objects implementing
the confidential-guest-support interface.
pef-guest and s390x-pv-guest don't have any properties, so they only
need to be added to the ObjectType enum without adding a new branch to
ObjectOptions.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 2372daa37e619693afc61755f5e4ac95fc11c259
https://github.com/qemu/qemu/commit/2372daa37e619693afc61755f5e4ac95fc11c259
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/common.json
M qapi/qom.json
M qapi/ui.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for input-*
This adds a QAPI schema for the properties of the input-* objects.
ui.json cannot be included in qom.json because the storage daemon can't
use it, so move GrabToggleKeys to common.json.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 94a48b0ca93ce12787400367494a44ee92c5e26a
https://github.com/qemu/qemu/commit/94a48b0ca93ce12787400367494a44ee92c5e26a
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qapi/qom.json
Log Message:
-----------
qapi/qom: Add ObjectOptions for x-remote-object
This adds a QAPI schema for the properties of the x-remote-object
object.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: c7c57bb9089f3a64626d639f1398de2bdbcfa7fc
https://github.com/qemu/qemu/commit/c7c57bb9089f3a64626d639f1398de2bdbcfa7fc
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M hw/block/xen-block.c
M include/qom/object_interfaces.h
M monitor/misc.c
M qapi/qom.json
M qom/qom-qmp-cmds.c
M storage-daemon/qemu-storage-daemon.c
Log Message:
-----------
qapi/qom: QAPIfy object-add
This converts object-add from 'gen': false to the ObjectOptions QAPI
type. As an immediate benefit, clients can now use QAPI schema
introspection for user creatable QOM objects.
It is also the first step towards making the QAPI schema the only
external interface for the creation of user creatable objects. Once all
other places (HMP and command lines of the system emulator and all
tools) go through QAPI, too, some object implementations can be
simplified because some checks (e.g. that mandatory options are set) are
already performed by QAPI, and in another step, QOM boilerplate code
could be generated from the schema.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 0b2cd5d3d93042e988f8da66f27842e71795bd03
https://github.com/qemu/qemu/commit/0b2cd5d3d93042e988f8da66f27842e71795bd03
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qom/object_interfaces.c
Log Message:
-----------
qom: Make "object" QemuOptsList optional
This code is going away anyway, but for a few more commits, we'll be in
a state where some binaries still use QemuOpts and others don't. If the
"object" QemuOptsList doesn't even exist, we don't have to remove (or
fail to remove, and therefore abort) a user creatable object from it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 8a4d699864d52ad40e01e8711ebf7b4f0a2b8c12
https://github.com/qemu/qemu/commit/8a4d699864d52ad40e01e8711ebf7b4f0a2b8c12
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M storage-daemon/qemu-storage-daemon.c
Log Message:
-----------
qemu-storage-daemon: Implement --object with qmp_object_add()
This QAPIfies --object and ensures that QMP and the command line option
behave the same.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 10dbce4ac0c345d0a19fee9fa121ed8717ad9820
https://github.com/qemu/qemu/commit/10dbce4ac0c345d0a19fee9fa121ed8717ad9820
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M include/qom/object_interfaces.h
M qom/object_interfaces.c
Log Message:
-----------
qom: Remove user_creatable_add_dict()
This function is now unused and can be removed.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: bd6e5711b5ce4ac00f82c51e4deee32d02cdd354
https://github.com/qemu/qemu/commit/bd6e5711b5ce4ac00f82c51e4deee32d02cdd354
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M include/qom/object_interfaces.h
M qom/object_interfaces.c
M qom/qom-qmp-cmds.c
M storage-daemon/qemu-storage-daemon.c
Log Message:
-----------
qom: Factor out user_creatable_process_cmdline()
The implementation for --object can be shared between
qemu-storage-daemon and other binaries, so move it into a function in
qom/object_interfaces.c that is accessible from everywhere.
This also requires moving the implementation of qmp_object_add() into a
new user_creatable_add_qapi(), because qom/qom-qmp-cmds.c is not linked
for tools.
user_creatable_print_help_from_qdict() can become static now.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: fcdb542980c6974a9237619faad8c2e740406df5
https://github.com/qemu/qemu/commit/fcdb542980c6974a9237619faad8c2e740406df5
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qemu-io.c
Log Message:
-----------
qemu-io: Use user_creatable_process_cmdline() for --object
This switches qemu-io from a QemuOpts-based parser for --object to
user_creatable_process_cmdline() which uses a keyval parser and enforces
the QAPI schema.
Apart from being a cleanup, this makes non-scalar properties accessible.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 7417ffe0cb2268ef27f8a3f2b8b0b0f1c47873a3
https://github.com/qemu/qemu/commit/7417ffe0cb2268ef27f8a3f2b8b0b0f1c47873a3
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M qemu-nbd.c
Log Message:
-----------
qemu-nbd: Use user_creatable_process_cmdline() for --object
This switches qemu-nbd from a QemuOpts-based parser for --object to
user_creatable_process_cmdline() which uses a keyval parser and enforces
the QAPI schema.
Apart from being a cleanup, this makes non-scalar properties accessible.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: ff2e53a85ca00d6ab8b746a2e88bbbd42b3aa947
https://github.com/qemu/qemu/commit/ff2e53a85ca00d6ab8b746a2e88bbbd42b3aa947
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M include/qom/object_interfaces.h
M qom/object_interfaces.c
Log Message:
-----------
qom: Add user_creatable_add_from_str()
This is a version of user_creatable_process_cmdline() with an Error
parameter that never calls exit() and is therefore usable in HMP.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 37c35c1ae546a1a6d820f0fb568db15d3210c6cb
https://github.com/qemu/qemu/commit/37c35c1ae546a1a6d820f0fb568db15d3210c6cb
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M docs/tools/qemu-img.rst
M qemu-img.c
Log Message:
-----------
qemu-img: Use user_creatable_process_cmdline() for --object
This switches qemu-img from a QemuOpts-based parser for --object to
user_creatable_process_cmdline() which uses a keyval parser and enforces
the QAPI schema.
Apart from being a cleanup, this makes non-scalar properties accessible.
As a side effect, fix wrong exit codes in the object parsing error path
of 'qemu-img compare'. This was broken in commit 334c43e2c3 because
&error_fatal exits with an exit code of 1, while it should have been 2.
Document that exit code 0 is also returned when just requested help was
printed instead of comparing images. This is preexisting behaviour that
isn't changed by this patch, though another instance of it is added with
'--object help'.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: 27d90650879d6f49608d4b7508f74f617ce0c339
https://github.com/qemu/qemu/commit/27d90650879d6f49608d4b7508f74f617ce0c339
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M hmp-commands.hx
M monitor/hmp-cmds.c
M qom/object_interfaces.c
Log Message:
-----------
hmp: QAPIfy object_add
This switches the HMP command object_add from a QemuOpts-based parser to
user_creatable_add_from_str() which uses a keyval parser and enforces
the QAPI schema.
Apart from being a cleanup, this makes non-scalar properties and help
accessible. In order for help to be printed to the monitor instead of
stdout, the printf() calls in the help functions are changed to
qemu_printf().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Commit: 9d954d429ac113f99feedc7abea285b744a86154
https://github.com/qemu/qemu/commit/9d954d429ac113f99feedc7abea285b744a86154
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M include/qom/object_interfaces.h
M qom/object_interfaces.c
Log Message:
-----------
qom: Add user_creatable_parse_str()
The system emulator has a more complicated way of handling command line
options in that it reorders options before it processes them. This means
that parsing object options and creating the object happen at two
different points. Split the parsing part into a separate function that
can be reused by the system emulator command line.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Commit: a7231fd8a6833574d6bc906fb7448dbd902cccff
https://github.com/qemu/qemu/commit/a7231fd8a6833574d6bc906fb7448dbd902cccff
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M chardev/char.c
Log Message:
-----------
char: Skip CLI aliases in query-chardev-backends
The aliases "tty" and "parport" are only valid on the command line, QMP
commands like chardev-add don't know them. query-chardev-backends should
describe QMP and therefore not include them in the list of available
backends.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210311164253.338723-2-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 3bca40f2115d0eed118d9a8a163eb664bc7e6f31
https://github.com/qemu/qemu/commit/3bca40f2115d0eed118d9a8a163eb664bc7e6f31
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M chardev/char.c
M docs/system/deprecated.rst
Log Message:
-----------
char: Deprecate backend aliases 'tty' and 'parport'
QAPI doesn't know the aliases 'tty' and 'parport' and there is no
reason to prefer them to the real names of the backends 'serial' and
'parallel'.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210311164253.338723-3-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 03aed242d8c0e19bd7500709d9ccf59010c7e5a8
https://github.com/qemu/qemu/commit/03aed242d8c0e19bd7500709d9ccf59010c7e5a8
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M chardev/char.c
Log Message:
-----------
char: Simplify chardev_name_foreach()
Both callers use callbacks that don't do anything when they are called
for CLI aliases. Instead of passing the cli_alias parameter, just don't
call the callbacks for aliases in the first place.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210311164253.338723-4-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 09b5d1ceadef41b69b41d2887f0b7780d01991db
https://github.com/qemu/qemu/commit/09b5d1ceadef41b69b41d2887f0b7780d01991db
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-03-12 (Fri, 12 Mar 2021)
Changed paths:
M MAINTAINERS
M block.c
M block/curl.c
M block/export/vhost-user-blk-server.c
M block/stream.c
M chardev/char.c
M docs/system/deprecated.rst
M docs/system/removed-features.rst
M docs/tools/qemu-img.rst
M hmp-commands.hx
M hw/block/xen-block.c
M include/qom/object_interfaces.h
M monitor/hmp-cmds.c
M monitor/misc.c
M qapi/authz.json
M qapi/block-core.json
M qapi/common.json
M qapi/crypto.json
M qapi/machine.json
M qapi/net.json
M qapi/qom.json
M qapi/ui.json
M qemu-img.c
M qemu-io.c
M qemu-nbd.c
M qom/object_interfaces.c
M qom/qom-qmp-cmds.c
M storage-daemon/qapi/qapi-schema.json
M storage-daemon/qemu-storage-daemon.c
A tests/qemu-iotests/tests/qsd-jobs
A tests/qemu-iotests/tests/qsd-jobs.out
M tests/qtest/libqos/meson.build
A tests/qtest/libqos/vhost-user-blk.c
A tests/qtest/libqos/vhost-user-blk.h
M tests/qtest/meson.build
M tests/qtest/qmp-cmd-test.c
M tests/qtest/test-netfilter.c
A tests/qtest/vhost-user-blk-test.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches and object-add QAPIfication
- QAPIfy object-add and --object for tools
- Add vhost-user-blk-test
- stream: Fail gracefully if permission is denied
- storage-daemon: Fix crash on quit when job is still running
- curl: Fix use after free
- 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)
# gpg: Signature made Fri 12 Mar 2021 11:27:59 GMT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream: (41 commits)
char: Simplify chardev_name_foreach()
char: Deprecate backend aliases 'tty' and 'parport'
char: Skip CLI aliases in query-chardev-backends
qom: Add user_creatable_parse_str()
hmp: QAPIfy object_add
qemu-img: Use user_creatable_process_cmdline() for --object
qom: Add user_creatable_add_from_str()
qemu-nbd: Use user_creatable_process_cmdline() for --object
qemu-io: Use user_creatable_process_cmdline() for --object
qom: Factor out user_creatable_process_cmdline()
qom: Remove user_creatable_add_dict()
qemu-storage-daemon: Implement --object with qmp_object_add()
qom: Make "object" QemuOptsList optional
qapi/qom: QAPIfy object-add
qapi/qom: Add ObjectOptions for x-remote-object
qapi/qom: Add ObjectOptions for input-*
qapi/qom: Add ObjectOptions for confidential-guest-support
qapi/qom: Add ObjectOptions for pr-manager-helper
qapi/qom: Add ObjectOptions for filter-*
qapi/qom: Add ObjectOptions for colo-compare
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/3f8d1885e48e...09b5d1ceadef
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] d20577: block: remove format defaults from QemuOpts in bdr...,
Peter Maydell <=