From patchwork Mon Aug 29 14:55:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 112079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AB67FB6F85 for ; Tue, 30 Aug 2011 00:56:01 +1000 (EST) Received: from localhost ([::1]:57825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy3Fn-0006DN-9c for incoming@patchwork.ozlabs.org; Mon, 29 Aug 2011 10:55:59 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy3Fg-0006Cy-Js for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:55:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qy3Ff-0001eM-8M for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:55:52 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:48421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy3Fe-0001eC-Sw for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:55:50 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7TEVeJY007571 for ; Mon, 29 Aug 2011 10:31:40 -0400 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7TEthkZ823380 for ; Mon, 29 Aug 2011 10:55:43 -0400 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7TF1TFf029900 for ; Mon, 29 Aug 2011 09:01:29 -0600 Received: from titi.austin.rr.com (dyn9050021173.mts.ibm.com [9.50.21.173] (may be forged)) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p7TF1Pur029742; Mon, 29 Aug 2011 09:01:26 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 29 Aug 2011 09:55:36 -0500 Message-Id: <1314629736-13023-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.146 Cc: Blue Swirl , Anthony Liguori Subject: [Qemu-devel] [PATCH] Rename qemu -> qemu-system-i386 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This has been discussed before in the past. The special casing really makes no sense anymore. This seems like a good change to make for 1.0. Signed-off-by: Anthony Liguori Acked-by: Juan Quintela --- Makefile | 5 ++--- Makefile.target | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8606849..51ecdb5 100644 --- a/Makefile +++ b/Makefile @@ -365,9 +365,8 @@ tar: rm -rf /tmp/$(FILE) SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ - $(patsubst %-softmmu,qemu-system-%, \ - $(SYSTEM_TARGETS))) +SYSTEM_PROGS=$(patsubst %-softmmu,qemu-system-%, \ + $(SYSTEM_TARGETS)) USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ diff --git a/Makefile.target b/Makefile.target index 07af4d4..29287ed 100644 --- a/Makefile.target +++ b/Makefile.target @@ -27,12 +27,8 @@ ifdef CONFIG_USER_ONLY QEMU_PROG=qemu-$(TARGET_ARCH2) else # system emulator name -ifeq ($(TARGET_ARCH), i386) -QEMU_PROG=qemu$(EXESUF) -else QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF) endif -endif PROGS=$(QEMU_PROG) STPFILES=