From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LD87m-0002Dy-38 for qemu-devel@nongnu.org; Wed, 17 Dec 2008 20:56:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LD87k-0002Dm-MR for qemu-devel@nongnu.org; Wed, 17 Dec 2008 20:56:24 -0500 Received: from [199.232.76.173] (port=32895 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LD87k-0002Dj-Fx for qemu-devel@nongnu.org; Wed, 17 Dec 2008 20:56:24 -0500 Received: from savannah.gnu.org ([199.232.41.3]:45686 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LD87k-0007Be-7W for qemu-devel@nongnu.org; Wed, 17 Dec 2008 20:56:24 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LD87j-0002bi-NI for qemu-devel@nongnu.org; Thu, 18 Dec 2008 01:56:23 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LD87j-0002bd-CY for qemu-devel@nongnu.org; Thu, 18 Dec 2008 01:56:23 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Thu, 18 Dec 2008 01:56:23 +0000 Subject: [Qemu-devel] [6082] Fix the build for non-x86/ppc targets Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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