projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a85d1c
0c9dfe4
)
Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 14 May 2012 15:15:52 +0000
(10:15 -0500)
committer
Anthony 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
hw/qdev-monitor.c
Simple merge