gwj / at91sam9263 · Commits

Commit 17e909738da65d315d462839a05628580b96f8c1

Authored by aliguori
1 parent 00b229ac

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>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5524 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 5 additions and 6 deletions
configure
  View file @17e9097
@@ -953,7 +953,7 @@ fi @@ -953,7 +953,7 @@ fi
953 953
954 if test "$mingw32" = "yes" ; then 954 if test "$mingw32" = "yes" ; then
955 if test -z "$prefix" ; then 955 if test -z "$prefix" ; then
956 - prefix="/c/Program Files/Qemu" 956 + prefix="c:\\\\Program Files\\\\Qemu"
957 fi 957 fi
958 mansuffix="" 958 mansuffix=""
959 datasuffix="" 959 datasuffix=""
migration-tcp.c
  View file @17e9097
@@ -84,7 +84,7 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size) @@ -84,7 +84,7 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size)
84 ssize_t ret; 84 ssize_t ret;
85 85
86 do { 86 do {
87 - ret = write(s->fd, data, size); 87 + ret = send(s->fd, data, size, 0);
88 } while (ret == -1 && errno == EINTR); 88 } while (ret == -1 && errno == EINTR);
89 89
90 if (ret == -1) 90 if (ret == -1)
@@ -262,7 +262,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port, @@ -262,7 +262,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port,
262 return NULL; 262 return NULL;
263 } 263 }
264 264
265 - fcntl(s->fd, F_SETFL, O_NONBLOCK); 265 + socket_set_nonblock(s->fd);
266 266
267 if (s->detach == 1) { 267 if (s->detach == 1) {
268 dprintf("detaching from monitor\n"); 268 dprintf("detaching from monitor\n");
@@ -6224,9 +6224,8 @@ void qemu_announce_self(void) @@ -6224,9 +6224,8 @@ void qemu_announce_self(void)
6224 len = announce_self_create(buf, nd_table[i].macaddr); 6224 len = announce_self_create(buf, nd_table[i].macaddr);
6225 vlan = nd_table[i].vlan; 6225 vlan = nd_table[i].vlan;
6226 for(vc = vlan->first_client; vc != NULL; vc = vc->next) { 6226 for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
6227 - if (vc->fd_read == tap_receive) /* send only if tap */  
6228 - for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++)  
6229 - vc->fd_read(vc->opaque, buf, len); 6227 + for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++)
  6228 + vc->fd_read(vc->opaque, buf, len);
6230 } 6229 }
6231 } 6230 }
6232 } 6231 }