| commit | 9c983fd3ccee2783df4b9a0f5f8298f9a5dc862f | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 09:14:00 +0000 (30 12:14 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 09:14:00 +0000 (30 12:14 +0300) | ||
| tree | 83c41887c368cf3cf46cd5fb74e87393425190b4 | treesnapshot (tar.gz zip) |
| parent | 7aba6619cd9c92544cdcab0fbeef2c72ed81d557 | commitdiff |
| parent | 6f4cbd3950b10ceec95fcda3946839be2e009027 | commitdiff |
Merge commit '6f4cbd3950b10ceec95fcda3946839be2e009027' into upstream-merge
* commit '6f4cbd3950b10ceec95fcda3946839be2e009027':
qemu/pci: add routines to manage PCI capabilities
qemu/pci: helper routines for pci access
Conflicts:
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '6f4cbd3950b10ceec95fcda3946839be2e009027':
qemu/pci: add routines to manage PCI capabilities
qemu/pci: helper routines for pci access
Conflicts:
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |