Merge commit '6173d56bdcb53389c54e803873e6bf8f87836a4f' into stable-0.12-merge

* commit '6173d56bdcb53389c54e803873e6bf8f87836a4f': (27 commits)
  Update version and change for 0.12.3 release
  qcow2: Fix access after end of array
  ide save/restore pio/atapi cmd transfer fields and io buffer
  net: Monitor command set_link finds only VLAN clients, fix
  net: info network shows only VLAN clients, fix
  net: net_check_clients() checks only VLAN clients, fix
  net: Fix bogus "Warning: vlan 0 with no nics" with -device
  net: net_check_clients() runs too early to see -device, fix
  net: Remove unused net_client_uninit()
  don't dereference NULL after failed strdup
  virtio-net: fix network stall under load
  json: fix PRId64 on Win32
  fix inet_parse typo
  iothread: fix vcpu stop with smp tcg
  segfault due to buffer overrun in usb-serial
  qcow2: Fix signedness bugs
  Do not ignore error, if open file failed (-serial /dev/tty)
  pc-bios: update to newer version of (stable) seabios
  kvm: Fix eflags corruption in kvm mode
  target-mips: fix ROTR and DROTR by zero
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

	modified:   net/slirp.c

1 files changed, 5 insertions, 2 deletions

diff --git a/vl.c b/vl.c
index c9d46de0c..59f8084fa 100644
--- a/vl.c
+++ b/vl.c
@@ -4094,14 +4094,15 @@ static void tcg_cpu_exec(void)
     for (; next_cpu != NULL; next_cpu = next_cpu->next_cpu) {
         CPUState *env = cur_cpu = next_cpu;
 
-        if (!vm_running)
-            break;
         if (timer_alarm_pending) {
             timer_alarm_pending = 0;
             break;
         }
         if (cpu_can_run(env))
             ret = qemu_cpu_exec(env);
+        else if (env->stop)
+            break;
+
         if (ret == EXCP_DEBUG) {
             gdb_set_stop_cpu(env);
             debug_requested = 1;
@@ -6081,6 +6082,8 @@ int main(int argc, char **argv, char **envp)
     if (qemu_opts_foreach(&qemu_device_opts, device_init_func, NULL, 1) != 0)
         exit(1);
 
+    net_check_clients();
+
     if (!display_state)
         dumb_display_init();
     /* just use the first displaystate for the moment */