| commit | 70d927565e74df25cfbf249a9b798463b1518930 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:19:56 +0000 (16 17:19 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:19:56 +0000 (16 17:19 +0300) | ||
| tree | c87161a9b8ee89e91e3c4cab7dbc8863575b0a92 | treesnapshot (tar.gz zip) |
| parent | 2a6f52dec60dac3c3a94baf02b3d6e0a76318ade | commitdiff |
| parent | 87c30546ef34f9eb6740d884c8b73e2cdd259e35 | commitdiff |
Merge commit '87c30546ef34f9eb6740d884c8b73e2cdd259e35' into upstream-merge
* commit '87c30546ef34f9eb6740d884c8b73e2cdd259e35':
pci hotplug: add argument to pci hot plug callback.
acpi_piix4: qdevfy.
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '87c30546ef34f9eb6740d884c8b73e2cdd259e35':
pci hotplug: add argument to pci hot plug callback.
acpi_piix4: qdevfy.
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/acpi_piix4.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |