]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Jan 2020 09:44:03 +0000 (09:44 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Jan 2020 09:44:04 +0000 (09:44 +0000)
* Register qdev properties as class properties (Marc-AndrĂ©)
* Cleanups (Philippe)
* virtio-scsi fix (Pan Nengyuan)
* Tweak Skylake-v3 model id (Kashyap)
* x86 UCODE_REV support and nested live migration fix (myself)
* Advisory mode for pvpanic (Zhenwei)

# gpg: Signature made Fri 24 Jan 2020 20:16:23 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (58 commits)
  build-sys: clean up flags included in the linker command line
  target/i386: Add the 'model-id' for Skylake -v3 CPU models
  qdev: use object_property_help()
  qapi/qmp: add ObjectPropertyInfo.default-value
  qom: introduce object_property_help()
  qom: simplify qmp_device_list_properties()
  vl: print default value in object help
  qdev: register properties as class properties
  qdev: move instance properties to class properties
  qdev: rename DeviceClass.props
  qdev: set properties with device_class_set_props()
  object: return self in object_ref()
  object: release all props
  object: add object_class_property_add_link()
  object: express const link with link property
  object: add direct link flag
  object: rename link "child" to "target"
  object: check strong flag with &
  object: do not free class properties
  object: add object_property_set_default
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
12 files changed:
1  2 
Makefile
Makefile.objs
configure
hw/9pfs/virtio-9p-device.c
hw/acpi/generic_event_device.c
hw/char/exynos4210_uart.c
hw/dma/pl330.c
hw/pci-host/q35.c
hw/virtio/vhost-vsock.c
target/arm/cpu.c
target/arm/kvm64.c
vl.c

diff --cc Makefile
Simple merge
diff --cc Makefile.objs
Simple merge
diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc hw/dma/pl330.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc vl.c
Simple merge