From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 16 Feb 2017 14:23:55 +0000 (+0000)
Subject: Generate $(env)_{arch,guest} mappings automatically
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca80bb12005efed8dfc1eb90ba12c54af60363a1;p=people%2Fandrewcoop%2Fxen-test-framework.git

Generate $(env)_{arch,guest} mappings automatically

Rather than opencoding them.  Drop the defcfg-$(env) mapping entirely and
reimplement its user in terms of $(env)_guest.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/build/common.mk b/build/common.mk
index c26a7cd..8c1a55f 100644
--- a/build/common.mk
+++ b/build/common.mk
@@ -7,12 +7,13 @@ HVM_ENVIRONMENTS   := $(filter hvm%,$(ALL_ENVIRONMENTS))
 32BIT_ENVIRONMENTS := $(filter pv32% hvm32%,$(ALL_ENVIRONMENTS))
 64BIT_ENVIRONMENTS := $(filter pv64% hvm64%,$(ALL_ENVIRONMENTS))
 
-pv64_arch     := x86_64
-pv32pae_arch  := x86_32
-hvm64_arch    := x86_64
-hvm32pae_arch := x86_32
-hvm32pse_arch := x86_32
-hvm32_arch    := x86_32
+# $(env)_guest => pv or hvm mapping
+$(foreach env,$(PV_ENVIRONMENTS),$(eval $(env)_guest := pv))
+$(foreach env,$(HVM_ENVIRONMENTS),$(eval $(env)_guest := hvm))
+
+# $(env)_arch => x86_32/64 mapping
+$(foreach env,$(32BIT_ENVIRONMENTS),$(eval $(env)_arch := x86_32))
+$(foreach env,$(64BIT_ENVIRONMENTS),$(eval $(env)_arch := x86_64))
 
 COMMON_FLAGS := -pipe -I$(ROOT)/include -I$(ROOT)/arch/x86/include -MMD -MP
 
@@ -39,13 +40,6 @@ head-hvm32    := $(ROOT)/arch/x86/boot/head_hvm32.o
 defcfg-pv    := $(ROOT)/config/default-pv.cfg.in
 defcfg-hvm   := $(ROOT)/config/default-hvm.cfg.in
 
-defcfg-pv64     := $(defcfg-pv)
-defcfg-pv32pae  := $(defcfg-pv)
-defcfg-hvm64    := $(defcfg-hvm)
-defcfg-hvm32pae := $(defcfg-hvm)
-defcfg-hvm32pse := $(defcfg-hvm)
-defcfg-hvm32    := $(defcfg-hvm)
-
 obj-perarch :=
 obj-perenv  :=
 include $(ROOT)/build/files.mk
diff --git a/build/gen.mk b/build/gen.mk
index 9a1c6b9..8d7a6bf 100644
--- a/build/gen.mk
+++ b/build/gen.mk
@@ -56,7 +56,7 @@ test-$(1)-$(NAME): $$(DEPS-$(1)) $$(link-$(1))
 	rm -f $$@.tmp
 endif
 
-cfg-$(1) ?= $(defcfg-$(1))
+cfg-$(1) ?= $(defcfg-$($(1)_guest))
 
 cfg-default-deps := $(ROOT)/build/mkcfg.py $$(cfg-$(1)) $(TEST-EXTRA-CFG) FORCE