From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2URY-00043g-85 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 15:09:40 -0400 Received: from [140.186.70.92] (port=33830 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2URC-0003uI-Qx for qemu-devel@nongnu.org; Thu, 15 Apr 2010 15:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2UQh-0005rO-2q for qemu-devel@nongnu.org; Thu, 15 Apr 2010 15:09:18 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:37823) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2UQg-0005gx-Tp for qemu-devel@nongnu.org; Thu, 15 Apr 2010 15:08:47 -0400 Received: by mail-pv0-f173.google.com with SMTP id 12so1059096pvd.4 for ; Thu, 15 Apr 2010 12:08:46 -0700 (PDT) MIME-Version: 1.0 Date: Thu, 15 Apr 2010 22:08:46 +0300 Message-ID: From: Blue Swirl Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH 2/3] Compile vl.c once List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Since kvm.h can be used in files compiled once, we can partially revert b33612d03540fda7fa67485f1c20395beb7a2bf0. Signed-off-by: Blue Swirl --- Makefile.objs | 2 +- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ab1af88..c0fe5e2 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -128,7 +128,7 @@ user-obj-y += cutils.o cache-utils.o # libhw hw-obj-y = -hw-obj-y += loader.o +hw-obj-y += vl.o loader.o hw-obj-y += virtio.o virtio-console.o hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o hw-obj-y += watchdog.o diff --git a/Makefile.target b/Makefile.target index 34ceed6..3bd4b86 100644 --- a/Makefile.target +++ b/Makefile.target @@ -162,7 +162,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.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-serial-bus.o -- 1.6.2.4