[Qemu-devel] [5524] Fix windows build after migration changes

[Anthony Liguori <anthony@codemonkey.ws>]

Revision: 5524
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5524
Author:   aliguori
Date:     2008-10-24 14:11:41 +0000 (Fri, 24 Oct 2008)

Log Message:
-----------
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 <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/configure
    trunk/migration-tcp.c
    trunk/vl.c

Modified: trunk/configure
===================================================================
--- trunk/configure	2008-10-24 13:12:52 UTC (rev 5523)
+++ trunk/configure	2008-10-24 14:11:41 UTC (rev 5524)
@@ -953,7 +953,7 @@
 
 if test "$mingw32" = "yes" ; then
   if test -z "$prefix" ; then
-      prefix="/c/Program Files/Qemu"
+      prefix="c:\\\\Program Files\\\\Qemu"
   fi
   mansuffix=""
   datasuffix=""

Modified: trunk/migration-tcp.c
===================================================================
--- trunk/migration-tcp.c	2008-10-24 13:12:52 UTC (rev 5523)
+++ trunk/migration-tcp.c	2008-10-24 14:11:41 UTC (rev 5524)
@@ -84,7 +84,7 @@
     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 @@
 	return NULL;
     }
 
-    fcntl(s->fd, F_SETFL, O_NONBLOCK);
+    socket_set_nonblock(s->fd);
 
     if (s->detach == 1) {
         dprintf("detaching from monitor\n");

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-10-24 13:12:52 UTC (rev 5523)
+++ trunk/vl.c	2008-10-24 14:11:41 UTC (rev 5524)
@@ -6224,9 +6224,8 @@
         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);
         }
     }
 }