From patchwork Tue Aug 7 15:51:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 175674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 26A982C00A6 for ; Wed, 8 Aug 2012 01:52:29 +1000 (EST) Received: from localhost ([::1]:59360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym55-0001Om-8b for incoming@patchwork.ozlabs.org; Tue, 07 Aug 2012 11:52:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym4s-0001Gt-3c for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sym4q-0005Hz-Kl for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:13 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:61874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym4q-0005Hp-F2 for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:12 -0400 Received: by ggna5 with SMTP id a5so457709ggn.4 for ; Tue, 07 Aug 2012 08:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=qNTRq65qfvoZBFGNm9EIduSG2SenfmONniF7Kq9CD0Q=; b=EaM21WXr7s3GlCQu3NJYrV9fjw/6z4hSIepilnUIG09gc+/mIBoE57K9tO6fsSv04+ 9Ts+9TsHGyzqvP9gxrTZ2VACpPmUoGr9WcehNLWzx3BLIr7E7gMZhSOKKPFYUQNrT5UB dGCtcjtGV47Ya4SPK+ixUaPUWt/AY+pjE1yvwAEoh6oN/B+lqqbYoJK5YK6FP8e6UjZ0 vPwJB4bY/o86JfYWfdayQhVRyQDzqTUlk6edGX2tX8jICV+4Ga0Quawv0RQgh6x8NRsv Mq83L8XOecasdGAImI/bw8X9IG+XJMdXYeVFLg0oOYGDilfROhn9s9UcLjQpvNuBmsS6 1hnQ== Received: by 10.66.83.8 with SMTP id m8mr27015064pay.48.1344354731258; Tue, 07 Aug 2012 08:52:11 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id op10sm7982776pbc.75.2012.08.07.08.52.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 08:52:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 7 Aug 2012 17:51:44 +0200 Message-Id: <1344354707-27315-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> References: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 3/6] migration: move qemu_fclose to process_incoming_migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch starts moving all tasks coming after process_incoming_migration to process_incoming_migration itself. Signed-off-by: Paolo Bonzini --- migration-exec.c | 1 - migration-fd.c | 1 - migration-tcp.c | 1 - migration-unix.c | 1 - migration.c | 6 +++++- 5 file modificati, 5 inserzioni(+), 5 rimozioni(-) diff --git a/migration-exec.c b/migration-exec.c index 061131a..84796be 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -99,7 +99,6 @@ static void exec_accept_incoming_migration(void *opaque) qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); process_incoming_migration(f); - qemu_fclose(f); } int exec_start_incoming_migration(const char *command) diff --git a/migration-fd.c b/migration-fd.c index 87705c0..21ad196 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -105,7 +105,6 @@ static void fd_accept_incoming_migration(void *opaque) qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); process_incoming_migration(f); - qemu_fclose(f); } int fd_start_incoming_migration(const char *infd) diff --git a/migration-tcp.c b/migration-tcp.c index 62a6891..62c9309 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -136,7 +136,6 @@ static void tcp_accept_incoming_migration(void *opaque) } process_incoming_migration(f); - qemu_fclose(f); return; out: diff --git a/migration-unix.c b/migration-unix.c index 57aca11..d8d5dfa 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -146,7 +146,6 @@ static void unix_accept_incoming_migration(void *opaque) } process_incoming_migration(f); - qemu_fclose(f); return; out: diff --git a/migration.c b/migration.c index 8db1b43..a27ceb3 100644 --- a/migration.c +++ b/migration.c @@ -84,7 +84,11 @@ int qemu_start_incoming_migration(const char *uri, Error **errp) void process_incoming_migration(QEMUFile *f) { - if (qemu_loadvm_state(f) < 0) { + int ret; + + ret = qemu_loadvm_state(f); + qemu_fclose(f); + if (ret < 0) { fprintf(stderr, "load of migration failed\n"); exit(0); }