X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=blobdiff_plain;f=migration-unix.c;h=651fc5b707d7441b7094ec31b69e44581219107a;hp=11917f4f2a0389ed73dab5a412cfd2b0c936fa8b;hb=HEAD;hpb=f8bbc1286337a8506162b5785babe6f2a7de2476 diff --git a/migration-unix.c b/migration-unix.c index 11917f4f2..651fc5b70 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "qemu/sockets.h" +#include "qemu/main-loop.h" #include "migration/migration.h" #include "migration/qemu-file.h" #include "block/block.h" @@ -29,35 +30,23 @@ do { } while (0) #endif -static int unix_errno(MigrationState *s) -{ - return errno; -} - -static int unix_write(MigrationState *s, const void * buf, size_t size) -{ - return write(s->fd, buf, size); -} - static void unix_wait_for_connect(int fd, void *opaque) { MigrationState *s = opaque; if (fd < 0) { DPRINTF("migrate connect error\n"); - s->migration_file = NULL; + s->file = NULL; migrate_fd_error(s); } else { DPRINTF("migrate connect success\n"); - s->migration_file = qemu_fopen_socket(fd, "wb"); + s->file = qemu_fopen_socket(fd, "wb"); migrate_fd_connect(s); } } void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) { - s->get_error = unix_errno; - s->write = unix_write; unix_nonblocking_connect(path, unix_wait_for_connect, s, errp); }