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>
---
v1->v2: switch around kvm and tcg
Added Paolo on cc:; I can still take this through the s390x tree, though.
---
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..78303b14ce 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=kvm:tcg "
+ "-chardev file,id=serial0,path=%s"
" -no-shutdown -serial chardev:serial0 %s",
test->machine, tmpname, test->extra);
--
2.13.4
On Fri, Aug 11, 2017 at 03:18:01PM +0200, 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> > --- > > v1->v2: switch around kvm and tcg > > Added Paolo on cc:; I can still take this through the s390x tree, though. > > --- > 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..78303b14ce 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=kvm:tcg " > + "-chardev file,id=serial0,path=%s" > " -no-shutdown -serial chardev:serial0 %s", > test->machine, tmpname, test->extra); Total nit-pick - the first line has a trailing ' ', while the second line has no leading or trailing ' ', and the third line has a leading ' '. The inconsistency bugs me - suggest using trailing ' ' in both lines. No need to repost for that though, fine if it is touched up for the PULL, so Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Fri, 11 Aug 2017 14:29:53 +0100 "Daniel P. Berrange" <berrange@redhat.com> wrote: > On Fri, Aug 11, 2017 at 03:18:01PM +0200, 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> > > --- > > > > v1->v2: switch around kvm and tcg > > > > Added Paolo on cc:; I can still take this through the s390x tree, though. > > > > --- > > 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..78303b14ce 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=kvm:tcg " > > + "-chardev file,id=serial0,path=%s" > > " -no-shutdown -serial chardev:serial0 %s", > > test->machine, tmpname, test->extra); > > Total nit-pick - the first line has a trailing ' ', while the second > line has no leading or trailing ' ', and the third line has a leading > ' '. The inconsistency bugs me - suggest using trailing ' ' in both > lines. Yes, I prefer trailing ' ' as well, just did not want to touch more lines than necessary. > No need to repost for that though, fine if it is touched up > for the PULL, so > > Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Thanks!
On 11/08/2017 15:34, Cornelia Huck wrote: > On Fri, 11 Aug 2017 14:29:53 +0100 > "Daniel P. Berrange" <berrange@redhat.com> wrote: > >> On Fri, Aug 11, 2017 at 03:18:01PM +0200, 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> >>> --- >>> >>> v1->v2: switch around kvm and tcg >>> >>> Added Paolo on cc:; I can still take this through the s390x tree, though. >>> >>> --- >>> 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..78303b14ce 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=kvm:tcg " >>> + "-chardev file,id=serial0,path=%s" >>> " -no-shutdown -serial chardev:serial0 %s", >>> test->machine, tmpname, test->extra); >> >> Total nit-pick - the first line has a trailing ' ', while the second >> line has no leading or trailing ' ', and the third line has a leading >> ' '. The inconsistency bugs me - suggest using trailing ' ' in both >> lines. > > Yes, I prefer trailing ' ' as well, just did not want to touch more > lines than necessary. Go ahead and fix it + send the pull request yourself. Paolo
On 11.08.2017 15:18, 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> > --- > > v1->v2: switch around kvm and tcg > > Added Paolo on cc:; I can still take this through the s390x tree, though. > > --- > 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..78303b14ce 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=kvm:tcg " > + "-chardev file,id=serial0,path=%s" > " -no-shutdown -serial chardev:serial0 %s", > test->machine, tmpname, test->extra); Reviewed-by: Thomas Huth <thuth@redhat.com>
© 2016 - 2024 Red Hat, Inc.