From patchwork Thu Apr 15 19:08:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 50283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A548FB7D0F for ; Fri, 16 Apr 2010 05:17:28 +1000 (EST) Received: from localhost ([127.0.0.1]:56295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2UWC-0005Aj-3C for incoming@patchwork.ozlabs.org; Thu, 15 Apr 2010 15:14:28 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:received:message-id :subject:from:to:content-type; bh=o9gmWvnPMwh0Po194rCDNbfdTZFjvDxexFIFbica0Vo=; b=iSCAzyWZvtdjf9rWZBSYi1uHlcxX1zeDtKwmWwWp/Eb0ce4xLyNd5pf0Xna5vDbmA4 5wUCGL+4c82MVCxNRqEDZy3QI4sSd8lX0o4MmrzoUEcHcC+1RFY0uKntFk3D5/GUF84I +QhWHdwvqGsYS1n8oHxCNBUvgyx2K4sJ6BwiI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=MsWdob36PD2EcdMCXHE2QyHxzYVdNfHs8ezqVJZVUTXgTRSHx/L6kGMl5bRS9CyoJQ ayDZ0He5WX9cq6fVRRo/xrkoY+KVWzHQ+CT3Vbx34kPYOadq93meFDx/QUhXMRH+3PVx xUN6iNGaBoOW7vTkCNrQuxVxiPtrYbbD3jSCA= MIME-Version: 1.0 Received: by 10.141.32.16 with HTTP; Thu, 15 Apr 2010 12:08:46 -0700 (PDT) Date: Thu, 15 Apr 2010 22:08:46 +0300 Received: by 10.141.2.21 with SMTP id e21mr907136rvi.193.1271358526627; Thu, 15 Apr 2010 12:08:46 -0700 (PDT) Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 2/3] Compile vl.c once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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