From 817b9ed5eb300dbb434d752da416441028539a96 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 22 Feb 2013 17:36:36 +0100 Subject: migration: merge qemu_popen_cmd with qemu_popen There is no reason for outgoing exec migration to do popen manually anymore (the reason used to be that we needed the FILE* to make it non-blocking). Use qemu_popen_cmd. Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- migration-exec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'migration-exec.c') diff --git a/migration-exec.c b/migration-exec.c index a051a6e668..5dc73139a4 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -59,19 +59,17 @@ static int exec_close(MigrationState *s) void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) { - FILE *f; - - f = popen(command, "w"); + QEMUFile *f; + f = qemu_popen_cmd(command, "w"); if (f == NULL) { error_setg_errno(errp, errno, "failed to popen the migration target"); return; } - s->fd = fileno(f); + s->opaque = f; + s->fd = qemu_get_fd(f); assert(s->fd != -1); - s->opaque = qemu_popen(f, "w"); - s->close = exec_close; s->get_error = file_errno; s->write = file_write; -- cgit v1.2.1