remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 2152f6ae53a7b707a9e11b4cb28a9e9a78d2c840..a8acbcb28f4374fb24a1fd1d773a525d9f031381 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -108,11 +108,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include <malloc.h>
-#include <sys/timeb.h>
 #include <mmsystem.h>
-#define getopt_long_only getopt_long
-#define memalign(align, size) malloc(size)
 #endif
 
 #ifdef CONFIG_SDL
@@ -5755,7 +5751,10 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
+#ifndef _WIN32
+    /* Win32 doesn't support line-buffering and requires size >= 2 */
     setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
 
     init_timers();
     if (init_timer_alarm() < 0) {
@@ -6087,8 +6086,10 @@ int main(int argc, char **argv, char **envp)
     if (loadvm)
         do_loadvm(cur_mon, loadvm);
 
-    if (incoming)
+    if (incoming) {
+        autostart = 0;
         qemu_start_incoming_migration(incoming);
+    }
 
     if (autostart)
         vm_start();