diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 09:48:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 09:48:44 +0100 |
| commit | b968316069abd00feb7a3bc9f4e32ed6c227ea65 (patch) | |
| tree | aa90b33ff5558b140f0a16f055a5a604d594a58e | |
| parent | 9db6ffc76676731a25a5538ab71e8ca6ac234f80 (diff) | |
| parent | 480bc11e61693796debd3a9566be0ca1795bb7b7 (diff) | |
| download | qemu-b968316069abd00feb7a3bc9f4e32ed6c227ea65.tar.gz | |
Merge remote-tracking branch 'remotes/cohuck/tags/boot-serial-no-tcg-20170811' into staging
Fix the boot-serial test to work with the new --disable-tcg.
# gpg: Signature made Fri 11 Aug 2017 14:55:15 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/boot-serial-no-tcg-20170811:
boot-serial-test: fallback to kvm accelerator
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/boot-serial-test.c | 5 |
1 files 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); |