Fix windows build after migration changes

The live migration code broke the windows build.  As part of this
change, I've switched the BIOS path to C:\Program Files\Qemu instead of
/c/Program Files/Qemu.  The later is only valid when launching from MSYS
but the former is always valid.

Signed-off-by: Anthony Liguori <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5524 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/configure b/configure
index f14739be87be13b42b1bdf885ffdd1d0dafbde8d..aefa69bb2c5668a71376344414a9bebb3794bf64 100755 (executable)
--- a/configure
+++ b/configure
@@ -953,7 +953,7 @@ fi
 
 if test "$mingw32" = "yes" ; then
   if test -z "$prefix" ; then
-      prefix="/c/Program Files/Qemu"
+      prefix="c:\\\\Program Files\\\\Qemu"
   fi
   mansuffix=""
   datasuffix=""

diff --git a/migration-tcp.c b/migration-tcp.c
index df8080fe7d8fec540a7fad6bc713defb1cb69c7b..a011a53099ae45f9d6171a2d25117ca0bda6bbff 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -84,7 +84,7 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size)
     ssize_t ret;
 
     do {
-        ret = write(s->fd, data, size);
+        ret = send(s->fd, data, size, 0);
     } while (ret == -1 && errno == EINTR);
 
     if (ret == -1)
@@ -262,7 +262,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port,
        return NULL;
     }
 
-    fcntl(s->fd, F_SETFL, O_NONBLOCK);
+    socket_set_nonblock(s->fd);
 
     if (s->detach == 1) {
         dprintf("detaching from monitor\n");

diff --git a/vl.c b/vl.c
index c0e43ac030f30931b58d94a1ef46973b33d21ea7..74ae652e1e5373d2bcae6613f5794a0e7a3a036d 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -6224,9 +6224,8 @@ void qemu_announce_self(void)
         len = announce_self_create(buf, nd_table[i].macaddr);
         vlan = nd_table[i].vlan;
         for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
-            if (vc->fd_read == tap_receive)  /* send only if tap */
-                for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++)
-                    vc->fd_read(vc->opaque, buf, len);
+            for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++)
+                vc->fd_read(vc->opaque, buf, len);
         }
     }
 }