| commit | a3b371477e3cbcf8bafe7b08ea1b5982e17d74cb | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:04:37 +0000 (25 18:04 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:04:37 +0000 (25 18:04 +0300) | ||
| tree | 5da30075e2aaaa37f769eb62eefcdea92bf06ba7 | treesnapshot (tar.gz zip) |
| parent | 42f0a928d221a0d6b2a43a0f564f7fed2310ff60 | commitdiff |
| parent | 1f5f6638c063514f193ca447d49fa95f8a574a69 | commitdiff |
Merge commit '1f5f6638c063514f193ca447d49fa95f8a574a69' into upstream-merge
* commit '1f5f6638c063514f193ca447d49fa95f8a574a69':
Make first argument of monitor command pci_add work
Conflicts:
hw/pci-hotplug.c
Device assignment hotplug disabled due to upstream API change.
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '1f5f6638c063514f193ca447d49fa95f8a574a69':
Make first argument of monitor command pci_add work
Conflicts:
hw/pci-hotplug.c
Device assignment hotplug disabled due to upstream API change.
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/device-assignment.c | diff1 | blobhistory | |
| hw/device-assignment.h | diff1 | blobhistory | |
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |