]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:15:52 +0000 (10:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:15:52 +0000 (10:15 -0500)
* afaerber-or/qom-1.1:
  mips_fulong2e: Don't register "cpu" VMState twice
  pc: Add back PCI.rombar compat property
  qdev: Fix adding of ptr properties
  qdev: Use object_property_print() in info qtree
  target-i386: Defer MCE init
  qom: Documentation addition for object_class_by_name()
  target-mips: Remove commented-out function declaration

1  2 
hw/qdev-monitor.c

Simple merge