OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZjbdDAAoJEN7Pa5PG8C+vEMYQAIPiwbs/poNslv250aWpRAsv
 B6S6koeJfKp7GNSKPAW/bPl/CzLviGfTy/4lwYKhMlEgChRBo/35fii9RpFKKBUq
 KP01G3lpIx99TaUODXwfnTSzXfuLu9psglgf2APzObrjYWJiQROPsvCn1gLMveVA
 NU4f1HWy9dIaNk4kMf9YABaMnkHo9v517R6eIhw6F5L1jhKYlH6MqySDTQmBjGcB
 tS4pjhdRdrSWbsD8nyzaLYGtXDURvXC8kT8K1AVbj3Qix+CXiSksexBNQPri02x6
 jJM0Sj4lhfnNrCiFx6QRphdcFpS9qmajh9qL9QUx95SZDlpYzaO8HD991aEv9qU0
 rLQ2G+pEQy9tqwjiqupmMgKznC9+jk8ZkuIuJ+LHA9B+vS/7C5sGb0IoiTTbBGls
 d08U6ZCDu5hidnyVFtjy1u15lW9+0UAd0jGtKSpIY3E1PRp1s3PK0s1wpB1m5Tqr
 H92qI2KqJjgAFus3U2jAh0QLA9lQDfIqBybqqNRN1lzihUP8cEhlg+HC66zQLc3U
 pbr2msAvhs4v5xQEqE1ZdcTi6xAY7PuEHKsbLt7JplRp6JjFpOv1AdIRLYSzTzPZ
 dp61ELcwObKBO5Yp2Rh6xu5smtcWoqKKAGgzrwZi0bm3egp2iuwgweVX8OgTI+Sz
 r2tIuVSYhzYkBKq55FMd
 =VWm0
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-08-14 09:48:44 +01:00
commit b968316069
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/boot-serial-test.c
View File

@ -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);