Merge commit '8fde6546fbe5a63df584819b1279086030e410a9' into upstream-merge

* commit '8fde6546fbe5a63df584819b1279086030e410a9':
  Remove useless Win32 include files and unused function in net.c.
  tap-win32: Use correct headers.
  fix broken migration

Conflicts:
	net.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 0 insertions, 29 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),