]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a85d1c 0c9dfe4)
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)
commit8592d5259a2be71fdca45fc0db62a5ad10abe9f5
tree93d7c1b91928d5fb4cbcc5c2f2238f74f5ec72e5tree
parent7a85d1cf1cf9b2b9379c35f1b672d1661e2d8132commit | diff
parent0c9dfe460d0c239cc0dc78d6223118cb63261b45commit | diff
Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging

* 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
hw/qdev-monitor.c diff1 | diff2 | blob | history
Qemu copy for testing