| Message ID | 20211015144640.198044-1-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/15/21 7:46 AM, Kevin Wolf wrote: > The following changes since commit 4d1a525dfafe995a98bb486e702da09e31b68b9c: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2021-10-14 10:49:38 -0700) > > are available in the Git repository at: > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 5dacda5167560b3af8eadbce5814f60ba44b467e: > > vl: Enable JSON syntax for -device (2021-10-15 16:11:22 +0200) > > ---------------------------------------------------------------- > qdev: Add JSON -device > > - Add a JSON mode to the -device command line option > - net/vhost-{user,vdpa}: Fix device compatibility check > - Minor iotests fixes > > ---------------------------------------------------------------- > Damien Hedde (1): > softmmu/qdev-monitor: add error handling in qdev_set_id > > Kevin Wolf (14): > net: Introduce NetClientInfo.check_peer_type() > net/vhost-user: Fix device compatibility check > net/vhost-vdpa: Fix device compatibility check > qom: Reduce use of error_propagate() > iotests/245: Fix type for iothread property > iotests/051: Fix typo > qdev: Avoid using string visitor for properties > qdev: Make DeviceState.id independent of QemuOpts > qemu-option: Allow deleting opts during qemu_opts_foreach() > qdev: Add Error parameter to hide_device() callbacks > virtio-net: Store failover primary opts pointer locally > virtio-net: Avoid QemuOpts in failover_find_primary_device() > qdev: Base object creation on QDict rather than QemuOpts > vl: Enable JSON syntax for -device > > qapi/qdev.json | 15 ++++-- > include/hw/qdev-core.h | 16 ++++-- > include/hw/virtio/virtio-net.h | 2 + > include/monitor/qdev.h | 27 +++++++++- > include/net/net.h | 2 + > hw/arm/virt.c | 2 +- > hw/core/qdev-properties-system.c | 6 +++ > hw/core/qdev.c | 11 ++-- > hw/net/virtio-net.c | 85 +++++++++++++++--------------- > hw/pci-bridge/pci_expander_bridge.c | 2 +- > hw/ppc/e500.c | 2 +- > hw/vfio/pci.c | 4 +- > hw/xen/xen-legacy-backend.c | 3 +- > net/vhost-user.c | 41 +++++---------- > net/vhost-vdpa.c | 37 +++++-------- > qom/object.c | 7 ++- > qom/object_interfaces.c | 19 +++---- > softmmu/qdev-monitor.c | 100 +++++++++++++++++++++++------------- > softmmu/vl.c | 63 ++++++++++++++++++++--- > util/qemu-option.c | 4 +- > tests/qemu-iotests/051 | 2 +- > tests/qemu-iotests/051.pc.out | 4 +- > tests/qemu-iotests/245 | 4 +- > 23 files changed, 280 insertions(+), 178 deletions(-) Applied, thanks. r~
The following changes since commit 4d1a525dfafe995a98bb486e702da09e31b68b9c: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2021-10-14 10:49:38 -0700) are available in the Git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 5dacda5167560b3af8eadbce5814f60ba44b467e: vl: Enable JSON syntax for -device (2021-10-15 16:11:22 +0200) ---------------------------------------------------------------- qdev: Add JSON -device - Add a JSON mode to the -device command line option - net/vhost-{user,vdpa}: Fix device compatibility check - Minor iotests fixes ---------------------------------------------------------------- Damien Hedde (1): softmmu/qdev-monitor: add error handling in qdev_set_id Kevin Wolf (14): net: Introduce NetClientInfo.check_peer_type() net/vhost-user: Fix device compatibility check net/vhost-vdpa: Fix device compatibility check qom: Reduce use of error_propagate() iotests/245: Fix type for iothread property iotests/051: Fix typo qdev: Avoid using string visitor for properties qdev: Make DeviceState.id independent of QemuOpts qemu-option: Allow deleting opts during qemu_opts_foreach() qdev: Add Error parameter to hide_device() callbacks virtio-net: Store failover primary opts pointer locally virtio-net: Avoid QemuOpts in failover_find_primary_device() qdev: Base object creation on QDict rather than QemuOpts vl: Enable JSON syntax for -device qapi/qdev.json | 15 ++++-- include/hw/qdev-core.h | 16 ++++-- include/hw/virtio/virtio-net.h | 2 + include/monitor/qdev.h | 27 +++++++++- include/net/net.h | 2 + hw/arm/virt.c | 2 +- hw/core/qdev-properties-system.c | 6 +++ hw/core/qdev.c | 11 ++-- hw/net/virtio-net.c | 85 +++++++++++++++--------------- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/ppc/e500.c | 2 +- hw/vfio/pci.c | 4 +- hw/xen/xen-legacy-backend.c | 3 +- net/vhost-user.c | 41 +++++---------- net/vhost-vdpa.c | 37 +++++-------- qom/object.c | 7 ++- qom/object_interfaces.c | 19 +++---- softmmu/qdev-monitor.c | 100 +++++++++++++++++++++++------------- softmmu/vl.c | 63 ++++++++++++++++++++--- util/qemu-option.c | 4 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/051.pc.out | 4 +- tests/qemu-iotests/245 | 4 +- 23 files changed, 280 insertions(+), 178 deletions(-)