[Qemu-devel] [6082] Fix the build for non-x86/ppc targets

[Anthony Liguori]

Revision: 6082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6082
Author:   aliguori
Date:     2008-12-18 01:56:22 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Fix the build for non-x86/ppc targets

Since pci.c creates network devices, anything that links against pci.c
(everything) has to link against all network devices.  Since virtio-net 
also requires virtio, we might as well link every target against all of 
the virtio devices.

This suggests that the pci.c network device creation function needs some 
refactoring.

Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/Makefile.target

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target       2008-12-17 23:28:44 UTC (rev 6081)
+++ trunk/Makefile.target       2008-12-18 01:56:22 UTC (rev 6082)
@@ -557,6 +557,9 @@
 ifndef CONFIG_USER_ONLY
 
 OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o
+# virtio has to be here due to weird dependency between PCI and virtio-net.
+# need to fix this properly
+OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
 OBJS+=fw_cfg.o
 ifdef CONFIG_KVM
 OBJS+=kvm.o kvm-all.o
@@ -636,8 +639,6 @@
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
-# virtio support
-OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
@@ -663,8 +664,6 @@
 ifdef CONFIG_KVM
 OBJS+= kvm_ppc.o
 endif
-# virtio support
-OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
 endif
 ifeq ($(TARGET_BASE_ARCH), mips)
 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o