From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 2 Mar 2015 13:20:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5de090464f1ec5360c4f30faa01d8a9f8826cd58;p=sdk%2Femulator%2Fqemu.git

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>
---

5de090464f1ec5360c4f30faa01d8a9f8826cd58
diff --cc hw/mips/mips_r4k.c
index 3e90e27,1698f2d..52564be
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@@ -282,13 -274,16 +282,9 @@@ void mips_r4k_init(MachineState *machin
  
      rtc_init(isa_bus, 2000, NULL);
  
 -    /* Register 64 KB of ISA IO space at 0x14000000 */
 -    memory_region_init_alias(isa, NULL, "isa_mmio",
 -                             get_system_io(), 0, 0x00010000);
 -    memory_region_add_subregion(get_system_memory(), 0x14000000, isa);
 -
 -    isa_mem_base = 0x10000000;
 -
      pit = pit_init(isa_bus, 0x40, 0, NULL);
  
-     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
-         if (serial_hds[i]) {
-             serial_isa_init(isa_bus, i, serial_hds[i]);
-         }
-     }
+     serial_hds_isa_init(isa_bus, MAX_SERIAL_PORTS);
  
      isa_vga_init(isa_bus);