Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
migration
/
unix.c
diff --git
a/qemu/migration/unix.c
b/qemu/migration/unix.c
index
b591813
..
d9aac36
100644
(file)
--- a/
qemu/migration/unix.c
+++ b/
qemu/migration/unix.c
@@
-13,7
+13,7
@@
* GNU GPL, version 2 or (at your option) any later version.
*/
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include
<string.h>
+#include
"qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
@@
-39,11
+39,11
@@
static void unix_wait_for_connect(int fd, Error *err, void *opaque)
if (fd < 0) {
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
if (fd < 0) {
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
- s->file = NULL;
+ s->
to_dst_
file = NULL;
migrate_fd_error(s);
} else {
DPRINTF("migrate connect success\n");
migrate_fd_error(s);
} else {
DPRINTF("migrate connect success\n");
- s->file = qemu_fopen_socket(fd, "wb");
+ s->
to_dst_
file = qemu_fopen_socket(fd, "wb");
migrate_fd_connect(s);
}
}
migrate_fd_connect(s);
}
}