From patchwork Mon Aug 10 22:16:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 31109 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 2786FB7B69 for ; Tue, 11 Aug 2009 08:20:28 +1000 (EST) Received: from localhost ([127.0.0.1]:45426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MadE6-0005SV-65 for incoming@patchwork.ozlabs.org; Mon, 10 Aug 2009 18:20:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MadAY-0004I4-Sw for qemu-devel@nongnu.org; Mon, 10 Aug 2009 18:16:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MadAT-0004Cv-2H for qemu-devel@nongnu.org; Mon, 10 Aug 2009 18:16:41 -0400 Received: from [199.232.76.173] (port=48003 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MadAR-0004Cp-TD for qemu-devel@nongnu.org; Mon, 10 Aug 2009 18:16:35 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:42603) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MadAR-0007QT-Dm for qemu-devel@nongnu.org; Mon, 10 Aug 2009 18:16:35 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id n7AMEnFM027582 for ; Mon, 10 Aug 2009 16:14:49 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n7AMGT5v033326 for ; Mon, 10 Aug 2009 16:16:29 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n7AMGSJc016858 for ; Mon, 10 Aug 2009 16:16:29 -0600 Received: from localhost.localdomain (sig-9-76-207-133.mts.ibm.com [9.76.207.133]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n7AMGR1L016806; Mon, 10 Aug 2009 16:16:28 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 10 Aug 2009 17:16:26 -0500 Message-Id: <1249942586-12671-2-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1249942586-12671-1-git-send-email-aliguori@us.ibm.com> References: <1249942586-12671-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Paul Brook Subject: [Qemu-devel] [PATCH 2/2] Only build osdep 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 We no longer need hackery to work around kqemu Signed-off-by: Anthony Liguori --- Makefile | 8 ++++---- Makefile.target | 2 +- osdep.c | 3 --- tool-osdep.c | 4 ---- 4 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 tool-osdep.c diff --git a/Makefile b/Makefile index 2fe4a66..a8bb657 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o -block-obj-y += nbd.o block.o aio.o aes.o +block-obj-y += nbd.o block.o aio.o aes.o osdep.o block-obj-$(CONFIG_AIO) += posix-aio-compat.o block-nested-y += cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o @@ -170,11 +170,11 @@ libqemu_user.a: $(user-obj-y) qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") diff --git a/Makefile.target b/Makefile.target index b08526c..725b5c5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -143,7 +143,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ +obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly diff --git a/osdep.c b/osdep.c index baacce7..90cc95f 100644 --- a/osdep.c +++ b/osdep.c @@ -33,9 +33,6 @@ #include #endif -/* FIXME: This file should be target independent. However it has kqemu - hacks, so must be built for every target. */ - /* Needed early for CONFIG_BSD etc. */ #include "config-host.h" diff --git a/tool-osdep.c b/tool-osdep.c deleted file mode 100644 index 24e6edf..0000000 --- a/tool-osdep.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Hack to provide a version of osdep.o for qemu-img without conflicting with - the (kqemu) target specific osdep.o. */ -#include "osdep.c" -