| commit | 9887e4e27e04799c8a1328dae9d7d54b34fda825 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 14 Nov 2010 13:47:24 +0000 (14 15:47 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 14 Nov 2010 13:47:24 +0000 (14 15:47 +0200) | ||
| tree | 6c2eb1c57a8350a10b4e2b1bd51415f48a7a1b2b | treesnapshot (tar.gz zip) |
| parent | cfe2b2060a7e087871530602001c0b532c2693fe | commitdiff |
| parent | ca77089d2d8e73283bfc73f03d954504561e1ce8 | commitdiff |
Merge commit 'ca77089d2d8e73283bfc73f03d954504561e1ce8' into upstream-merge
* commit 'ca77089d2d8e73283bfc73f03d954504561e1ce8':
pci: consolidate pci_add_capability_at_offset() into pci_add_capability().
pci_bridge: introduce pci bridge library.
pci_bridge: clean up: remove pci_{register, unregister}_secondary_bus()
pci_bridge: rename PCIBridge::bus -> PCIBridge::sec_bus.
Conflicts:
hw/msix.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'ca77089d2d8e73283bfc73f03d954504561e1ce8':
pci: consolidate pci_add_capability_at_offset() into pci_add_capability().
pci_bridge: introduce pci bridge library.
pci_bridge: clean up: remove pci_{register, unregister}_secondary_bus()
pci_bridge: rename PCIBridge::bus -> PCIBridge::sec_bus.
Conflicts:
hw/msix.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>