[PATCH] osstest: explicitly set either enable or disable qemu-traditional

Juergen Gross posted 1 patch 2 years, 6 months ago
Failed in applying to current master (apply log)
ts-xen-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] osstest: explicitly set either enable or disable qemu-traditional
Posted by Juergen Gross 2 years, 6 months ago
Instead of setting "--enable-qemu-traditional" or not, switch to
setting "--enable-qemu-traditional" or "--disable-qemu-traditional".

This avoids a latent bug in the disable case, as the availability
of the option is tested via grep, which will otherwise grep for
nothing.

Reported-by: Ian Jackson <iwj@xenproject.org>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
 ts-xen-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-xen-build b/ts-xen-build
index fdf55521..ccb2aba2 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -144,7 +144,7 @@ END
 sub build () {
     my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
     my $ovmf_opt= $r{enable_ovmf} =~ m/true/ ? "--enable-ovmf" : "--disable-ovmf";
-    my $qemutrad_opt = $r{arch} =~ m/amd64|i386/ ? "--enable-qemu-traditional" : "";
+    my $qemutrad_opt = $r{arch} =~ m/amd64|i386/ ? "--enable-qemu-traditional" : "--disable-qemu-traditional";
 
     my $configure_prefix = $r{cmdprefix_configure} // '';
     my $configure_suffix = $r{cmdsuffix_configure} // '';
-- 
2.26.2


Re: [PATCH] osstest: explicitly set either enable or disable qemu-traditional
Posted by Ian Jackson 2 years, 6 months ago
Juergen Gross writes ("[PATCH] osstest: explicitly set either enable or disable qemu-traditional"):
> Instead of setting "--enable-qemu-traditional" or not, switch to
> setting "--enable-qemu-traditional" or "--disable-qemu-traditional".
> 
> This avoids a latent bug in the disable case, as the availability
> of the option is tested via grep, which will otherwise grep for
> nothing.
...
> +    my $qemutrad_opt = $r{arch} =~ m/amd64|i386/ ? "--enable-qemu-traditional" : "--disable-qemu-traditional";

The effect of this is that we will now explicitly disable qemu trad on
non-x86 architectures (assuming configure supports it).  I think that
is fine.

Reviewed-by: Ian Jackson <iwj@xenproject.org>

For the avoidance of any doubt,

Release-Acked-by: Ian Jackson <iwj@xenproject.org>

too.  So I will push this now.

Thanks,
Ian.