]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Jun 2018 09:39:42 +0000 (10:39 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Jun 2018 09:39:42 +0000 (10:39 +0100)
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>

Trivial merge