Introduce 'hap' and 'shadow' variations

Used for HVM-based tests pertaining to pagetable behaviour, which want running
both against both paging modes.

Modify the invlpg tests to run in both shadow and hap paging modes.

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

diff --git a/config/hap.cfg.in b/config/hap.cfg.in
new file mode 100644 (file)
index 0000000..e027e6a
--- /dev/null
+++ b/config/hap.cfg.in
@@ -0,0 +1 @@
+hap=1

diff --git a/config/shadow.cfg.in b/config/shadow.cfg.in
new file mode 100644 (file)
index 0000000..211661a
--- /dev/null
+++ b/config/shadow.cfg.in
@@ -0,0 +1 @@
+hap=0

diff --git a/tests/invlpg/Makefile b/tests/invlpg/Makefile
index 7e0316ef33260fb5257e90cd357e9f5beba3a173..fb67956b5889a9136a3218f5f130d46b244be7bf 100644 (file)
--- a/tests/invlpg/Makefile
+++ b/tests/invlpg/Makefile
@@ -4,6 +4,8 @@ NAME      := invlpg
 CATEGORY  := functional
 TEST-ENVS := hvm32 hvm32pae hvm64
 
+VARY-CFG  := hap shadow
+
 obj-perenv += main.o
 
 include $(ROOT)/build/gen.mk

diff --git a/tests/invlpg/main.c b/tests/invlpg/main.c
index 860589fe1ece77e45bdc55afcfb4b27adc56d1ee..11955bd7ae99017775c08f58eca69d7773821e0f 100644 (file)
--- a/tests/invlpg/main.c
+++ b/tests/invlpg/main.c
@@ -78,9 +78,6 @@
  * crashes the domain if it finds an invlpg instruction while in hap mode,
  * which is unhelpful when trying to test behaviour.
  *
- * @todo Come up with some sensible way of running this test in both shadow
- * and hap mode.
- *
  * @see tests/invlpg/main.c
  */
 #include <xtf.h>