Commit 6e3bd769 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a48f7644 0f5319ea

vl.c

+2 −2
Original line number Diff line number Diff line
@@ -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)