| commit | b8b9ff0a00f98f385d9414bbc239b1996bd649e2 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:49:49 +0000 (28 19:49 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:49:49 +0000 (28 19:49 +0300) | ||
| tree | 40afaf1a14d8e3d2af0d62851b14e830010ab1f1 | treesnapshot (tar.gz zip) |
| parent | ab64fe1078cd7ebde6a5d3be0105529f774f5e35 | commitdiff |
| parent | b8c0e7d7c4e9fe3ec00757053a33605eda1c5ac4 | commitdiff |
Merge commit 'b8c0e7d7c4e9fe3ec00757053a33605eda1c5ac4' into upstream-merge
* commit 'b8c0e7d7c4e9fe3ec00757053a33605eda1c5ac4':
Fix non-ACPI Timer Interrupt Routing - v3
pci.c: remove unnecessary #ifdef DEBUG_PCI.
replace bdrv_{get, put}_buffer with bdrv_{load, save}_vmstate
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b8c0e7d7c4e9fe3ec00757053a33605eda1c5ac4':
Fix non-ACPI Timer Interrupt Routing - v3
pci.c: remove unnecessary #ifdef DEBUG_PCI.
replace bdrv_{get, put}_buffer with bdrv_{load, save}_vmstate
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pci.c | diff1 | diff2 | blobhistory |