Commit 6f991980 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge commit '1dd3a74d' into HEAD 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parents a8a826a3 1dd3a74d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ F: hw/omap* 
PCI

M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

F: hw/pci/*

F: hw/pci*

F: hw/piix*

Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o 


common-obj-y += audio/

common-obj-y += hw/

extra-obj-y += hw/



common-obj-y += ui/

common-obj-y += bt-host.o bt-vhci.o

arch_init.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "arch_init.h"

#include "audio/audio.h"

#include "hw/pc.h"

#include "hw/pci.h"

#include "hw/pci/pci.h"

#include "hw/audiodev.h"

#include "kvm.h"

#include "migration.h"

hw/Makefile.objs

+4 −9
Original line number Diff line number Diff line 
common-obj-y = usb/ ide/

common-obj-y = usb/ ide/ pci/

common-obj-y += loader.o

common-obj-$(CONFIG_VIRTIO) += virtio-console.o

common-obj-$(CONFIG_VIRTIO) += virtio-rng.o

common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

common-obj-y += fw_cfg.o

common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o

common-obj-$(CONFIG_PCI) += msix.o msi.o

common-obj-$(CONFIG_PCI) += shpc.o

common-obj-$(CONFIG_PCI) += slotid_cap.o

common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o

common-obj-$(CONFIG_PCI) += pci_bridge_dev.o

common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o

common-obj-$(CONFIG_PCI) += i82801b11.o

common-obj-y += watchdog.o
@@ -41,6 +37,8 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o 
common-obj-y += fifo.o

common-obj-y += pam.o



extra-obj-y += pci/



# PPC devices

common-obj-$(CONFIG_PREP_PCI) += prep_pci.o

common-obj-$(CONFIG_I82378) += i82378.o
@@ -102,8 +100,6 @@ common-obj-$(CONFIG_XGMAC) += xgmac.o 
# PCI watchdog devices

common-obj-$(CONFIG_PCI) += wdt_i6300esb.o



common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o



# PCI network cards

common-obj-$(CONFIG_NE2000_PCI) += ne2000.o

common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
@@ -199,7 +195,6 @@ obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o 
obj-$(CONFIG_SOFTMMU) += vhost_net.o

obj-$(CONFIG_VHOST_NET) += vhost.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/

obj-$(CONFIG_NO_PCI) += pci-stub.o

obj-$(CONFIG_VGA) += vga.o

obj-$(CONFIG_SOFTMMU) += device-hotplug.o

obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o

hw/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "hw.h"

#include "audiodev.h"

#include "audio/audio.h"

#include "pci.h"

#include "pci/pci.h"

#include "dma.h"



enum {