diff options
| author | Peter Maydell | 2017-08-14 10:48:44 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-14 10:48:44 +0200 |
| commit | b968316069abd00feb7a3bc9f4e32ed6c227ea65 (patch) | |
| tree | aa90b33ff5558b140f0a16f055a5a604d594a58e /include | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | boot-serial-test: fallback to kvm accelerator (diff) | |
| download | qemu-b968316069abd00feb7a3bc9f4e32ed6c227ea65.tar.gz qemu-b968316069abd00feb7a3bc9f4e32ed6c227ea65.tar.xz qemu-b968316069abd00feb7a3bc9f4e32ed6c227ea65.zip | |
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>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions