openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Machine queue, 2018-06-11 

* Fix -daemonize hang caused by --preconfig code
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJbHrJEAAoJECgHk2+YTcWmw5gQAJiXvqRv7ZVNc+Xec8Ndx5UR
 ahYZ4rK+Hw9g0prIZCQyeX6KvQaggIZgA/D4k1sC4YDARboxduGyD7GmNFcx2liF
 KCWxOhnOffOU8GVd3TMCTuh7iVGB0gSMZFsKWwi7bKSFKFHkO1dpQ0bp1eDeolaL
 sBYU2OVOV18NyXYghDEhZ09w2I/76ivRJi0SGNwa5/pZa0K7/7ZC0LTs6PdqPHYR
 Zka28y+P61s9S3n7/txhouTXurjaYRMtmBAtYIMmLck9VkMTVKYj9oE43g6q5uEA
 lSD9/jgoc6p8Cqj7iWwApT8MhmuxfXIMfbWD1tzIk73vY0DSgAIBdJ23qUwSLgXH
 Db3kOyOo1Gan+kk9w8GZR2QCRXq144MPxJmLdcmpTGZJ6jS47msZuCvYV1skpI+u
 0ktI6SxkTG5HUTMwIbIzEJIWOOeCldG2lQbtXR5gL+ZQGW57thPMb74z7BccurKV
 eaUOEWzptbnVMpVgRG2hX75+LFD4KRL8YWICFAj/stCkLCfyrwoccLpsuhZA/vZq
 1c80k5eMMtjXkFtCjV3/eKxFWCM5xu6i28Se/vYylBReZHjZDNA7ysnNkeb8lcgp
 ljk+4iIKX2SgNpr1ljdQ5PVfk3HjVbhDJrjPX06+ML4V3TkkEpCg6nUFmZO33sIv
 p0pBo76uSFQ9n7h60wue
 =SISo
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-06-12 10:39:42 +01:00
parent a48f7644f8 0f5319ea25
commit 6e3bd76991
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vl.c
View File

@ -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)