From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 14 Aug 2017 08:48:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/boot-serial-no-tcg-20170811' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b968316069abd00feb7a3bc9f4e32ed6c227ea65;p=qemu.git

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>
---

b968316069abd00feb7a3bc9f4e32ed6c227ea65