]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 2 Mar 2015 13:20:43 +0000 (13:20 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 2 Mar 2015 13:20:43 +0000 (13:20 +0000)
commit5de090464f1ec5360c4f30faa01d8a9f8826cd58
tree6ab14c4d57029b50bf6ec08b4b881bfad0625217
parent2dffe5516e74215fadf2e0f5ee401db4d5a86f7a
parent4bc6a3e54e06c47b8e23bfa3d873fa2f42dfec02
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

QOM infrastructure fixes and device conversions

* Assertion fix for device_add with non-device types
* Documentation fix
* qdev_init() error reporting cleanups

# gpg: Signature made Tue Feb 24 13:56:33 2015 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  parallel: parallel_hds_isa_init() shouldn't fail
  parallel: Factor out common parallel_hds_isa_init()
  serial: serial_hds_isa_init() shouldn't fail
  serial: Factor out common serial_hds_isa_init()
  etsec: Replace qdev_init() by qdev_init_nofail()
  leon3: Replace unchecked qdev_init() by qdev_init_nofail()
  ide/isa: Replace unchecked qdev_init() by qdev_init_nofail()
  qdev: Improve qdev_init_nofail()'s error reporting
  qom: Fix typo, 'my_class_init' -> 'derived_class_init'
  qdev: Avoid type assertion in qdev_build_hotpluggable_device_list()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/core/qdev.c
hw/i386/pc.c
hw/mips/mips_r4k.c
hw/sparc64/sun4u.c
include/hw/i386/pc.h