summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-22 14:43:48 +0200
committerAvi Kivity <avi@redhat.com>2009-11-22 14:43:48 +0200
commit540e70e8ed423f80e721104ce9b7eb53822dd14b (patch)
tree0cbde4aa02a86555c615d9aa2e949ce3ba07355b /Makefile.target
parentMerge commit '4f8589e11558f1151d95a4a3e9fce902f042df3d' into upstream-merge (diff)
parentpci: use range helper functions. (diff)
downloadqemu-kvm-540e70e8ed423f80e721104ce9b7eb53822dd14b.tar.gz
qemu-kvm-540e70e8ed423f80e721104ce9b7eb53822dd14b.tar.bz2
qemu-kvm-540e70e8ed423f80e721104ce9b7eb53822dd14b.zip
Merge commit '260c0cd3d985e51b15870ff47e17b7b930efbda1' into upstream-merge
* commit '260c0cd3d985e51b15870ff47e17b7b930efbda1': pci: use range helper functions. pci: add helper functions to check ranges overlap. pci: pcie host and mmcfg support. vmstate: introduce VMSTATE_BUFFER_UNSAFE_INFO. pci_host: change the signature of pci_data_{read, write}. pci: move pci host stuff from pci.c to pci_host.c pci: factor out the conversion logic from io port address into pci device. pci: make pci configuration transaction more accurate. pci: remove bus_num member from struct PCIBus. pci: 64bit bar support. Conflicts: hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index b99b85991..4fd5f9b78 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -166,7 +166,7 @@ endif #CONFIG_BSD_USER
# System emulator target
ifdef CONFIG_SOFTMMU
-obj-y = vl.o async.o monitor.o pci.o pci_host.o machine.o gdbstub.o
+obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o