Commit b9683160 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9db6ffc7 480bc11e

tests/boot-serial-test.c

+3 −2
Original line number Diff line number Diff line
@@ -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);