Merge commit 'd549db5a732ef2ec145b84c5008a7585cf17cf67' into upstream-merge

* commit 'd549db5a732ef2ec145b84c5008a7585cf17cf67': (27 commits)
  unlock iothread mutex before running kvm ioctl
  TARGET_I386 is always defined if TARGET_X86_64 is defined
  slirp: fix !CONFIG_SLIRP compilation
  ide: BMDMAState don't need a pci_dev field anymore
  ide: cmd646 ->unit has just the value that we want
  ide: cmd646 we can get the pci device with container_of
  ide: 'secondary' field is only used by cmd646
  ide: PCIIDEState type field is not needed anymore
  ide: split cmd646 and piix from pci.c
  ide: export needed ide-pci functions for split
  ide: create ide/pci.h for common ide pci definitions
  ide: remove uselsess casts from void *
  ide: Remove duplicated definitions
  ide: Remove cast in pci_register_bar
  ide: change cast to DO_UPCAST
  Fix bswap in comment
  Move dependency generation falgs out of configure
  configure: clean up temporary dependency files
  winwave: pause/restore playing upon seeing VOICE_DISABLE/ENABLE
  winwave: close event handle and delete wait object after closing HWAVEOUT
  ...

Conflicts:
	vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/Makefile.target b/Makefile.target
index a083b2ee0..c21a24a27 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -204,7 +204,7 @@ obj-y += rtl8139.o
 obj-y += e1000.o
 
 # Hardware support
-obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o
+obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
 obj-i386-y += pckbd.o $(sound-obj-y) dma.o
 obj-i386-y += vga.o vga-pci.o vga-isa.o
 obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
@@ -227,6 +227,7 @@ obj-ia64-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
 
 # shared objects
 obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o
+obj-ppc-y += ide/cmd646.o
 obj-ppc-y += vga.o vga-pci.o $(sound-obj-y) dma.o openpic.o
 obj-ppc-y += cirrus_vga.o
 # PREP target
@@ -250,7 +251,7 @@ obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
 obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
 obj-mips-y += vga-pci.o vga-isa.o vga-isa-mm.o
 obj-mips-y += g364fb.o jazz_led.o dp8393x.o
-obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o
+obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
 obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
 obj-mips-y += piix4.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y)
 obj-mips-y += mipsnet.o ne2000-isa.o
@@ -283,7 +284,7 @@ obj-cris-y += pflash_cfi02.o
 
 ifeq ($(TARGET_ARCH), sparc64)
 obj-sparc-y = sun4u.o pckbd.o apb_pci.o
-obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o
+obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o
 obj-sparc-y += vga.o vga-pci.o
 obj-sparc-y += fdc.o mc146818rtc.o serial.o
 obj-sparc-y += cirrus_vga.o parallel.o