motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 07:02:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix windows build after migration changes

Browse source 
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>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5524 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-10-24 14:11:41 +00:00
parent 00b229ac6a
commit 17e909738d
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -953,7 +953,7 @@ fi
if test "$mingw32" = "yes" ; then if test "$mingw32" = "yes" ; then
if test -z "$prefix" ; then if test -z "$prefix" ; then
prefix="/c/Program Files/Qemu" prefix="c:\\\\Program Files\\\\Qemu"
fi fi
mansuffix="" mansuffix=""
datasuffix="" datasuffix=""

4
migration-tcp.c
View file

@ -84,7 +84,7 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size)
ssize_t ret; ssize_t ret;
do { do {
ret = write(s->fd, data, size); ret = send(s->fd, data, size, 0);
} while (ret == -1 && errno == EINTR); } while (ret == -1 && errno == EINTR);
if (ret == -1) if (ret == -1)
@ -262,7 +262,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port,
return NULL; return NULL;
} }
fcntl(s->fd, F_SETFL, O_NONBLOCK); socket_set_nonblock(s->fd);
if (s->detach == 1) { if (s->detach == 1) {
dprintf("detaching from monitor\n"); dprintf("detaching from monitor\n");

5
vl.c
View file

@ -6224,9 +6224,8 @@ void qemu_announce_self(void)
len = announce_self_create(buf, nd_table[i].macaddr); len = announce_self_create(buf, nd_table[i].macaddr);
vlan = nd_table[i].vlan; vlan = nd_table[i].vlan;
for(vc = vlan->first_client; vc != NULL; vc = vc->next) { 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++)
for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++) vc->fd_read(vc->opaque, buf, len);
vc->fd_read(vc->opaque, buf, len);
} }
} }
} }