diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-12 10:39:42 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-12 10:39:42 +0100 |
commit | 6e3bd769916e643d371882da1bda5fbd453d3c3b (patch) | |
tree | f2a85dfb923745e924236714b4632c2a978de86d /tests/Makefile.include | |
parent | a48f7644f812f451e1f5fef044a530c6dfa99a15 (diff) | |
parent | 0f5319ea25fb0a05827d512859b7c7d23371ac5d (diff) | |
download | qemu-6e3bd769916e643d371882da1bda5fbd453d3c3b.zip |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2018-06-11
* Fix -daemonize hang caused by --preconfig code
# gpg: Signature made Mon 11 Jun 2018 18:32:52 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
cli: Don't run early event loop if no --preconfig was specified
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
0 files changed, 0 insertions, 0 deletions