From patchwork Wed Dec 23 19:15:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 7913901 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 846A99F350 for ; Wed, 23 Dec 2015 19:18:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0571205F9 for ; Wed, 23 Dec 2015 19:18:29 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94A82205E8 for ; Wed, 23 Dec 2015 19:18:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBosu-0008Tz-T8; Wed, 23 Dec 2015 19:15:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBost-0008To-3G for xen-devel@lists.xen.org; Wed, 23 Dec 2015 19:15:39 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 6B/FC-18633-AD2FA765; Wed, 23 Dec 2015 19:15:38 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1450898137!12517400!1 X-Originating-IP: [209.85.160.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32745 invoked from network); 23 Dec 2015 19:15:37 -0000 Received: from mail-yk0-f178.google.com (HELO mail-yk0-f178.google.com) (209.85.160.178) by server-12.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 23 Dec 2015 19:15:37 -0000 Received: by mail-yk0-f178.google.com with SMTP id x67so17762956ykd.2 for ; Wed, 23 Dec 2015 11:15:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ZdR4bU8V+QB+hu8MjcPC4UDJQbSGA408Sk5RauG0K9Q=; b=aMysx2wf0rKlnkgN2eIyIL5+iN38GeVJaMowC+P0aJXfnbgnh8bwGxq5ROt0PCxsfD fcaifBZDWX8MWdQcLf144RKgFy5gehf8fn7ozy78/vY99nxg+vL1LtDEXShPJcaZ8Yi2 eqNEY1oJEUrAF2hzgWVk349cM44oMXOvLHTt9YZOFtSG2j0iY+TSkrbl0FpE+XzDgWdX SxaMBciBZtMmbjvF4VX2FhSFxohwP8PQP6Ufj9xoKA5xauMfi48PVRtkn5PbWV1y95wU 25AE1Ifqb6RW9HUzXz4QInQad6uDZVOgM1sSk9RWsW+iJhAjtZNsk/xrwzKHAGq5r/J8 UbyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZdR4bU8V+QB+hu8MjcPC4UDJQbSGA408Sk5RauG0K9Q=; b=eZmdN+bIvudbGwbHsgTIjMBTmAYVk2d+bOXPPvDHBsPhWToP7PJGl4vbIiisPJef+j SyNSXMkKIZ4jiEeQh0PYEx4osSoL3kou0PlhRkUAZrPzEAhItOSjOez/fDGMbgFUo52N +aNFr5DdriiT8Utm3Bb0W3CRTlSo0cEhRmtQmOHWAqrHjnHOEehGbkz1rgfyVAAhEGGC wfw2/3k5vN4u03sjrnKcvkDf/0rvOAhqM5McLaBSGKwO6DdcGWpgF8yKDoWruRGB8r8P R0zzDk6iQdEC0KYYIl0h+UB1wkKGptUGZVoGCCrMabVCHBEtMI1NXeCY5faFrjW4Nrnz PeuA== X-Gm-Message-State: ALoCoQkNgYd0d+3azH4pOfOGDoUTbivXxCv7ZAbDLtBk3lx8OfINMspavS0W2Ywar1k2pNSbIMlXC1LSfNGiGD/oQEjWVHqWDg== X-Received: by 10.129.51.210 with SMTP id z201mr27957766ywz.202.1450898136693; Wed, 23 Dec 2015 11:15:36 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id z130sm37276295ywb.18.2015.12.23.11.15.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 11:15:36 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Wed, 23 Dec 2015 13:15:23 -0600 Message-Id: <1450898123-487-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Kevin Tian , Keir Fraser , George Dunlap , Andrew Cooper , Doug Goldstein , Jan Beulich , Feng Wu Subject: [Xen-devel] [PATCH] xen: remove dups in x86 and x86_64 variables X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the Xen build uses x86 and x86_64 variables as well as CONFIG_X86 and CONFIG_X86_64. This just removes the duplication. The CONFIG_ variables are now managed by Kconfig but existed previously so this duplication existed prior to the Kconfig migration. Signed-off-by: Doug Goldstein Acked-by: Andrew Cooper Acked-by: Feng Wu for the VT-d part. --- This patch should be purely mechanical. The build of this is identical on my machine except for build date/time. --- xen/Rules.mk | 2 +- xen/arch/x86/Makefile | 4 ++-- xen/arch/x86/Rules.mk | 4 ---- xen/arch/x86/efi/Makefile | 2 +- xen/arch/x86/mm/Makefile | 6 +++--- xen/arch/x86/mm/hap/Makefile | 2 +- xen/common/Makefile | 2 +- xen/drivers/acpi/Makefile | 6 +++--- xen/drivers/passthrough/Makefile | 8 ++++---- xen/drivers/passthrough/vtd/Makefile | 2 +- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 8839dca..f7ddc69 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -45,7 +45,7 @@ ALL_OBJS-y += $(BASEDIR)/common/built_in.o ALL_OBJS-y += $(BASEDIR)/drivers/built_in.o ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o -ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o +ALL_OBJS-$(CONFIG_X86) += $(BASEDIR)/crypto/built_in.o CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index d4e507a..6448a23 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -5,7 +5,7 @@ subdir-y += hvm subdir-y += mm subdir-y += oprofile -subdir-$(x86_64) += x86_64 +subdir-$(CONFIG_X86_64) += x86_64 obj-bin-y += alternative.init.o obj-y += apic.o @@ -67,7 +67,7 @@ obj-$(crash_debug) += gdbstub.o x86_emulate.o: x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h -efi-$(x86_64) := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \ +efi-$(CONFIG_X86_64) := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \ -O $(BASEDIR)/include/xen/compile.h ]; then \ echo '$(TARGET).efi'; fi) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 4ca69a1..b76a754 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -22,10 +22,6 @@ $(call as-insn-check,CFLAGS,CC,".equ \"x\"$$(comma)1", \ -U__OBJECT_LABEL__ -DHAVE_GAS_QUOTED_SYM \ '-D__OBJECT_LABEL__=$(subst $(BASEDIR)/,,$(CURDIR))/$$@') -x86 := y -x86_32 := n -x86_64 := y - shadow-paging ?= y bigmem ?= n diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index 1daa7ac..c6c2fa6 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -4,7 +4,7 @@ obj-y += stub.o create = test -e $(1) || touch -t 199901010000 $(1) -efi := $(filter y,$(x86_64)$(shell rm -f disabled)) +efi := $(filter y,$(CONFIG_X86_64)$(shell rm -f disabled)) efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y)) efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y)) efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o))) diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index aeccdfc..61b7428 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -6,9 +6,9 @@ obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o obj-y += altp2m.o obj-y += guest_walk_2.o obj-y += guest_walk_3.o -obj-$(x86_64) += guest_walk_4.o -obj-$(x86_64) += mem_paging.o -obj-$(x86_64) += mem_sharing.o +obj-$(CONFIG_X86_64) += guest_walk_4.o +obj-$(CONFIG_X86_64) += mem_paging.o +obj-$(CONFIG_X86_64) += mem_sharing.o guest_walk_%.o: guest_walk.c Makefile $(CC) $(CFLAGS) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ diff --git a/xen/arch/x86/mm/hap/Makefile b/xen/arch/x86/mm/hap/Makefile index 68f2bb5..14cb29d 100644 --- a/xen/arch/x86/mm/hap/Makefile +++ b/xen/arch/x86/mm/hap/Makefile @@ -1,7 +1,7 @@ obj-y += hap.o obj-y += guest_walk_2level.o obj-y += guest_walk_3level.o -obj-$(x86_64) += guest_walk_4level.o +obj-$(CONFIG_X86_64) += guest_walk_4level.o obj-y += nested_hap.o obj-y += nested_ept.o diff --git a/xen/common/Makefile b/xen/common/Makefile index 8ab15ba..a8132db 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -65,7 +65,7 @@ obj-$(xenoprof) += xenoprof.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o) -subdir-$(x86_64) += hvm +subdir-$(CONFIG_X86_64) += hvm subdir-$(coverage) += gcov diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index 3bb626e..d8a4299 100644 --- a/xen/drivers/acpi/Makefile +++ b/xen/drivers/acpi/Makefile @@ -1,11 +1,11 @@ subdir-y += tables subdir-y += utilities -subdir-$(x86) += apei +subdir-$(CONFIG_X86) += apei obj-bin-y += tables.init.o obj-$(HAS_NUMA) += numa.o obj-y += osl.o obj-y += pmstat.o -obj-$(x86) += hwregs.o -obj-$(x86) += reboot.o +obj-$(CONFIG_X86) += hwregs.o +obj-$(CONFIG_X86) += reboot.o diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index a6657c5..cf1b1f1 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -1,9 +1,9 @@ -subdir-$(x86) += vtd -subdir-$(x86) += amd -subdir-$(x86_64) += x86 +subdir-$(CONFIG_X86) += vtd +subdir-$(CONFIG_X86) += amd +subdir-$(CONFIG_X86_64) += x86 subdir-$(arm) += arm obj-y += iommu.o -obj-$(x86) += io.o +obj-$(CONFIG_X86) += io.o obj-$(CONFIG_HAS_PCI) += pci.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/vtd/Makefile b/xen/drivers/passthrough/vtd/Makefile index 56d0153..f302653 100644 --- a/xen/drivers/passthrough/vtd/Makefile +++ b/xen/drivers/passthrough/vtd/Makefile @@ -1,4 +1,4 @@ -subdir-$(x86) += x86 +subdir-$(CONFIG_X86) += x86 obj-y += iommu.o obj-y += dmar.o