Commit 17e90973 authored by aliguori's avatar aliguori

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: default avatarAnthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5524 c046a42c-6fe2-441c-8c8c-71466251a162
parent 00b229ac
......@@ -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=""
......
......@@ -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");
......
......@@ -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);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment