[PATCH] Update xl.cfg files for Xen 4.10 support

[PATCH] Update xl.cfg files for Xen 4.10 support

[Andrew Cooper]

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>
---
CC: Wei Liu <wei.liu2@citrix.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
 config/default-hvm.cfg.in | 5 ++++-
 config/default-pv.cfg.in  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
index 0de2546..c410eff 100644
--- 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 daedf49..921e52a 100644
--- 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@@"
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] Update xl.cfg files for Xen 4.10 support

[Roger Pau Monné]

On Fri, Oct 06, 2017 at 12:46:31PM +0000, Andrew Cooper wrote:
> 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>
> ---
> CC: Wei Liu <wei.liu2@citrix.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> ---
>  config/default-hvm.cfg.in | 5 ++++-
>  config/default-pv.cfg.in  | 5 ++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
> index 0de2546..c410eff 100644
> --- 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

Since this examples are only for >= Xen 4.10, does it really make
sense to keep the builder option here?

Do we expect people to mix and match example configuration files?

Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] Update xl.cfg files for Xen 4.10 support

[Andrew Cooper]

On 06/10/17 14:10, Roger Pau Monné wrote:
> On Fri, Oct 06, 2017 at 12:46:31PM +0000, Andrew Cooper wrote:
>> 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>
>> ---
>> CC: Wei Liu <wei.liu2@citrix.com>
>> CC: Roger Pau Monné <roger.pau@citrix.com>
>> ---
>>  config/default-hvm.cfg.in | 5 ++++-
>>  config/default-pv.cfg.in  | 5 ++++-
>>  2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
>> index 0de2546..c410eff 100644
>> --- 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
> Since this examples are only for >= Xen 4.10, does it really make
> sense to keep the builder option here?
>
> Do we expect people to mix and match example configuration files?

There is only one version of XTF.  It doesn't branch for different
versions of Xen, so needs to support them all.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] Update xl.cfg files for Xen 4.10 support

[Roger Pau Monné]

On Fri, Oct 06, 2017 at 01:15:11PM +0000, Andrew Cooper wrote:
> On 06/10/17 14:10, Roger Pau Monné wrote:
> > On Fri, Oct 06, 2017 at 12:46:31PM +0000, Andrew Cooper wrote:
> >> 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>
> >> ---
> >> CC: Wei Liu <wei.liu2@citrix.com>
> >> CC: Roger Pau Monné <roger.pau@citrix.com>
> >> ---
> >>  config/default-hvm.cfg.in | 5 ++++-
> >>  config/default-pv.cfg.in  | 5 ++++-
> >>  2 files changed, 8 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
> >> index 0de2546..c410eff 100644
> >> --- 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
> > Since this examples are only for >= Xen 4.10, does it really make
> > sense to keep the builder option here?
> >
> > Do we expect people to mix and match example configuration files?
> 
> There is only one version of XTF.  It doesn't branch for different
> versions of Xen, so needs to support them all.

Oh, I was confused and thought this was a patch to the xl.cfg example
files in xen.get, sorry.

Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] Update xl.cfg files for Xen 4.10 support

[Wei Liu]

On Fri, Oct 06, 2017 at 01:46:31PM +0100, Andrew Cooper wrote:
> 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: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel