summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net.c29
-rw-r--r--tap-win32.c8
-rw-r--r--vl.c4
3 files changed, 4 insertions, 37 deletions
diff --git a/net.c b/net.c
index c7702f857..192921604 100644
--- a/net.c
+++ b/net.c
@@ -101,15 +101,6 @@
#include <libvdeplug.h>
#endif
-#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
-
// FIXME: #include "qemu-kvm.h"
#include "qemu-common.h"
#include "net.h"
@@ -280,26 +271,6 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)
return 0;
}
-#if !defined(_WIN32) && 0
-static int parse_unix_path(struct sockaddr_un *uaddr, const char *str)
-{
- const char *p;
- int len;
-
- len = MIN(108, strlen(str));
- p = strchr(str, ',');
- if (p)
- len = MIN(len, p - str);
-
- memset(uaddr, 0, sizeof(*uaddr));
-
- uaddr->sun_family = AF_UNIX;
- memcpy(uaddr->sun_path, str, len);
-
- return 0;
-}
-#endif
-
void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6])
{
snprintf(vc->info_str, sizeof(vc->info_str),
diff --git a/tap-win32.c b/tap-win32.c
index 44f96e537..2c02ce301 100644
--- a/tap-win32.c
+++ b/tap-win32.c
@@ -30,13 +30,7 @@
#include "sysemu.h"
#include <stdio.h>
#include <windows.h>
-
-/* NOTE: PCIBus is redefined in winddk.h */
-#define PCIBus _PCIBus
-#include <ddk/ntapi.h>
-#include <ddk/winddk.h>
-#include <ddk/ntddk.h>
-#undef PCIBus
+#include <winioctl.h>
//=============
// TAP IOCTLs
diff --git a/vl.c b/vl.c
index c9dae784e..50de511ad 100644
--- a/vl.c
+++ b/vl.c
@@ -6209,8 +6209,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();