It is planned to no longer build qemu-traditional per default.

In order to be able to continue running tests with ioemu-stubdom run
configure with --enable-qemu-traditional.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 ts-xen-build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ts-xen-build b/ts-xen-build
index af0dd894..75fbfe0e 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -144,6 +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 = "--enable-qemu-traditional";
 
     my $configure_prefix = $r{cmdprefix_configure} // '';
     my $configure_suffix = $r{cmdsuffix_configure} // '';
@@ -157,8 +158,11 @@ sub build () {
                 if grep -q -- $ovmf_opt tools/configure ; then
                     ovmf=$ovmf_opt
                 fi
+                if grep -q -- $qemutrad_opt tools/configure ; then
+                    qemutrad=$qemutrad_opt
+                fi
 END
-               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf $configure_suffix @configure_args
+               $configure_prefix ./configure --sysconfdir=/etc \$xend \$ovmf \$qemutrad $configure_suffix @configure_args
 END
             fi
 END
-- 
2.26.2

Juergen Gross writes ("[PATCH] OSStest: explicitly enable building qemu-traditional"):
> It is planned to no longer build qemu-traditional per default.
> 
> In order to be able to continue running tests with ioemu-stubdom run
> configure with --enable-qemu-traditional.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

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

OOI, have you done any kind of test on this ?

I'm kind of inclined to just push it and let osstest's pre-production
self-test test it.

Ian.

On 19.10.21 15:04, Ian Jackson wrote:
> Juergen Gross writes ("[PATCH] OSStest: explicitly enable building qemu-traditional"):
>> It is planned to no longer build qemu-traditional per default.
>>
>> In order to be able to continue running tests with ioemu-stubdom run
>> configure with --enable-qemu-traditional.
>>
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Reviewed-by: Ian Jackson <iwj@xenproject.org>
> 
> OOI, have you done any kind of test on this ?

No, this was a pure "lets do things in a similar way as the other
options" approach.

> I'm kind of inclined to just push it and let osstest's pre-production
> self-test test it.

You are in a far better position than me to decide this. :-)


Juergen

Juergen Gross writes ("Re: [PATCH] OSStest: explicitly enable building qemu-traditional"):
> On 19.10.21 15:04, Ian Jackson wrote:
> > OOI, have you done any kind of test on this ?
> 
> No, this was a pure "lets do things in a similar way as the other
> options" approach.

Right.

> > I'm kind of inclined to just push it and let osstest's pre-production
> > self-test test it.
> 
> You are in a far better position than me to decide this. :-)

I decided to run a test first :-).

I think you and I should get an email about adhoc flight 165635 when
it's complete.  I think the build log ought to show it passing the new
argument.

Thanks,
Ian.

Juergen Gross writes ("Re: [PATCH] OSStest: explicitly enable building qemu-traditional"):
> On 19.10.21 15:04, Ian Jackson wrote:
> > OOI, have you done any kind of test on this ?
> 
> No, this was a pure "lets do things in a similar way as the other
> options" approach.
> 
> > I'm kind of inclined to just push it and let osstest's pre-production
> > self-test test it.
> 
> You are in a far better position than me to decide this. :-)

Well, I did a quick test to see that it DTRT on x86 and that looked
OK.  So I pushed it to pretest.  However, unfortunately, it breaks on
ARM:

http://logs.test-lab.xenproject.org/osstest/logs/165843/build-arm64/info.html

That one gets as far as actually trying to build qemu-xen-traditional,
and then fails like this:

Unsupported CPU = aarch64
make[2]: *** [Makefile:167: subdir-all-qemu-xen-traditional-dir] Error 1

I think this needs to be made conditional.  In the perl script,
$r{arch} contains osstest's idea of the architecture (which uses
Debian arch names).

Can you send a new patch which compares $r{arch} with 'i386' and
'amd64' ?

Thanks,
Ian.