| commit | b5e71b9dd3e7bd15fa474756268a6646b23389d1 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:25:50 +0000 (26 15:25 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:25:50 +0000 (26 15:25 +0300) | ||
| tree | 830e9b53f926d4bfa8c2f8b7167d4b739f46f07e | treesnapshot (tar.gz zip) |
| parent | c20e3c50ac7012a7fc184df1da3f93bf22efc1e2 | commitdiff |
| parent | 6c6a58aee425338bf67ec8faffdcda56b0b82090 | commitdiff |
Merge commit '6c6a58aee425338bf67ec8faffdcda56b0b82090' into upstream-merge
* commit '6c6a58aee425338bf67ec8faffdcda56b0b82090':
Revert "PCI: Convert pci_device_hot_add() to QObject"
QMP: Add "Downstream extension of QMP" to spec
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '6c6a58aee425338bf67ec8faffdcda56b0b82090':
Revert "PCI: Convert pci_device_hot_add() to QObject"
QMP: Add "Downstream extension of QMP" to spec
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| qemu-monitor.hx | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |