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 | |
| parent | a48f7644f812f451e1f5fef044a530c6dfa99a15 (diff) | |
| parent | 0f5319ea25fb0a05827d512859b7c7d23371ac5d (diff) | |
| download | focaccia-qemu-6e3bd769916e643d371882da1bda5fbd453d3c3b.tar.gz focaccia-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 '')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c index 06031715ac..6e34fb348d 100644 --- a/vl.c +++ b/vl.c @@ -1841,7 +1841,7 @@ static void main_loop(void) #ifdef CONFIG_PROFILER int64_t ti; #endif - do { + while (!main_loop_should_exit()) { #ifdef CONFIG_PROFILER ti = profile_getclock(); #endif @@ -1849,7 +1849,7 @@ static void main_loop(void) #ifdef CONFIG_PROFILER dev_time += profile_getclock() - ti; #endif - } while (!main_loop_should_exit()); + } } static void version(void) |