Currently, at least x86_64 and s390x support building with --disable-tcg.
Instead of forcing tcg (which causes the test to fail on such builds),
allow to use kvm as well.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---

Not sure who should merge this. I can add it to the s390 tree if nobody
else takes it.

---
 tests/boot-serial-test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 11f48b049c..38664a0594 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -78,7 +78,8 @@ static void test_machine(const void *data)
     fd = mkstemp(tmpname);
     g_assert(fd != -1);
 
-    args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s"
+    args = g_strdup_printf("-M %s,accel=tcg:kvm "
+                           "-chardev file,id=serial0,path=%s"
                            " -no-shutdown -serial chardev:serial0 %s",
                            test->machine, tmpname, test->extra);
 
-- 
2.13.4

On 11.08.2017 13:47, Cornelia Huck wrote:
> Currently, at least x86_64 and s390x support building with --disable-tcg.
> Instead of forcing tcg (which causes the test to fail on such builds),
> allow to use kvm as well.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> 
> Not sure who should merge this. I can add it to the s390 tree if nobody
> else takes it.

Maybe CC: Paolo for "Character devices"? But sure, if nobody else takes
it, it should be fine in the s390 tree, too.

> ---
>  tests/boot-serial-test.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index 11f48b049c..38664a0594 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -78,7 +78,8 @@ static void test_machine(const void *data)
>      fd = mkstemp(tmpname);
>      g_assert(fd != -1);
>  
> -    args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s"
> +    args = g_strdup_printf("-M %s,accel=tcg:kvm "
> +                           "-chardev file,id=serial0,path=%s"
>                             " -no-shutdown -serial chardev:serial0 %s",
>                             test->machine, tmpname, test->extra);

I think I'd prefer "kvm:tcg" here to speed up the test if possible.

The reason for only using "tcg" in the past was that there was an
annoying warning message "kvm accelerator not found" or so when also
specifying kvm here, but that has been fixed just recently, so "kvm:tcg"
should be fine now here, too.

 Thomas

On Fri, 11 Aug 2017 13:56:37 +0200
Thomas Huth <thuth@redhat.com> wrote:

> On 11.08.2017 13:47, Cornelia Huck wrote:

> > diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> > index 11f48b049c..38664a0594 100644
> > --- a/tests/boot-serial-test.c
> > +++ b/tests/boot-serial-test.c
> > @@ -78,7 +78,8 @@ static void test_machine(const void *data)
> >      fd = mkstemp(tmpname);
> >      g_assert(fd != -1);
> >  
> > -    args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s"
> > +    args = g_strdup_printf("-M %s,accel=tcg:kvm "
> > +                           "-chardev file,id=serial0,path=%s"
> >                             " -no-shutdown -serial chardev:serial0 %s",
> >                             test->machine, tmpname, test->extra);  
> 
> I think I'd prefer "kvm:tcg" here to speed up the test if possible.

Sure, can turn that around.

> 
> The reason for only using "tcg" in the past was that there was an
> annoying warning message "kvm accelerator not found" or so when also
> specifying kvm here, but that has been fixed just recently, so "kvm:tcg"
> should be fine now here, too.

Yup, it's best to try both (especially as we can't rely on tcg being
available anymore).