[PULL for-2.10 0/1] bugfix for boot-serial-test and no tcg

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PULL for-2.10 0/1] bugfix for boot-serial-test and no tcg

Cornelia Huck-2
The following changes since commit 473a321122fd3c2c327a5a5d01a9a41f26f1734c:

  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-08-10 17:50:55 +0100)

are available in the git repository at:

  git://github.com/cohuck/qemu tags/boot-serial-no-tcg-20170811

for you to fetch changes up to 480bc11e61693796debd3a9566be0ca1795bb7b7:

  boot-serial-test: fallback to kvm accelerator (2017-08-11 15:44:05 +0200)

----------------------------------------------------------------
Fix the boot-serial test to work with the new --disable-tcg.

----------------------------------------------------------------

Cornelia Huck (1):
  boot-serial-test: fallback to kvm accelerator

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

--
2.13.4


Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PULL for-2.10 1/1] boot-serial-test: fallback to kvm accelerator

Cornelia Huck-2
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.

Reviewed-by: Daniel P. Berrange <[hidden email]>
Reviewed-by: Thomas Huth <[hidden email]>
Signed-off-by: Cornelia Huck <[hidden email]>
---
 tests/boot-serial-test.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 11f48b049c..a8ca877168 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -78,8 +78,9 @@ 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"
-                           " -no-shutdown -serial chardev:serial0 %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);
 
     qtest_start(args);
--
2.13.4


Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PULL for-2.10 0/1] bugfix for boot-serial-test and no tcg

Peter Maydell-5
In reply to this post by Cornelia Huck-2
On 11 August 2017 at 15:06, Cornelia Huck <[hidden email]> wrote:

> The following changes since commit 473a321122fd3c2c327a5a5d01a9a41f26f1734c:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-08-10 17:50:55 +0100)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/boot-serial-no-tcg-20170811
>
> for you to fetch changes up to 480bc11e61693796debd3a9566be0ca1795bb7b7:
>
>   boot-serial-test: fallback to kvm accelerator (2017-08-11 15:44:05 +0200)
>
> ----------------------------------------------------------------
> Fix the boot-serial test to work with the new --disable-tcg.
>
> ----------------------------------------------------------------
>
> Cornelia Huck (1):
>   boot-serial-test: fallback to kvm accelerator
>
>  tests/boot-serial-test.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

-- PMM

Loading...