| commit | cfe2b2060a7e087871530602001c0b532c2693fe | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 14 Nov 2010 13:18:50 +0000 (14 15:18 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 14 Nov 2010 13:23:14 +0000 (14 15:23 +0200) | ||
| tree | 24de0c09b88c0a992d8a8f6d7afeb4d4bc279c83 | treesnapshot (tar.gz zip) |
| parent | 420fe74769cc67baec6f3d962dc054e2972ca3ae | commitdiff |
| parent | 783753fd53fe513d37fbbfe6694c0c1ab9701fd1 | commitdiff |
Merge commit '783753fd53fe513d37fbbfe6694c0c1ab9701fd1' into upstream-merge
* commit '783753fd53fe513d37fbbfe6694c0c1ab9701fd1':
pci/bridge: split out pci bridge code into pci_bridge.c from pci.c
pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info.
Conflicts:
Makefile.objs
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '783753fd53fe513d37fbbfe6694c0c1ab9701fd1':
pci/bridge: split out pci bridge code into pci_bridge.c from pci.c
pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info.
Conflicts:
Makefile.objs
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.objs | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |
| hw/pci_bridge.c | diff2 | blobhistory |