Update xl.cfg files for Xen 4.10 support

From 4.10 onwards, the configuration file should use type= in preference to
builder/loader.  Leave the older options for legacy compatability.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
index 0de2546384ce4cdec92a82b4113de362e4f6c24c..c410effb750e57459040ec4ffa4ff07fcd0087bc 100644 (file)
--- a/config/default-hvm.cfg.in
+++ b/config/default-hvm.cfg.in
@@ -1,5 +1,8 @@
 name="test-@@ENV@@-@@NAME@@@@VARIATION@@"
-builder="hvm"
+
+type="hvm"
+builder="hvm" # Legacy for before Xen 4.10
+
 memory=128
 firmware_override="@@XTFDIR@@/tests/@@NAME@@/test-@@ENV@@-@@NAME@@"
 

diff --git a/config/default-pv.cfg.in b/config/default-pv.cfg.in
index daedf4903edbadc7a54c37a47157579ee69c7b17..921e52ab2cd9dd705c71d0bc1f07688e881b9b41 100644 (file)
--- a/config/default-pv.cfg.in
+++ b/config/default-pv.cfg.in
@@ -1,4 +1,7 @@
 name="test-@@ENV@@-@@NAME@@@@VARIATION@@"
-loader="generic"
+
+type="pv"
+loader="generic" # Legacy for before Xen 4.10
+
 memory=128
 kernel="@@XTFDIR@@/tests/@@NAME@@/test-@@ENV@@-@@NAME@@"