From patchwork Fri Mar 29 14:12:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 232422 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 4BDBA2C00C9 for ; Sat, 30 Mar 2013 01:13:25 +1100 (EST) Received: from localhost ([::1]:48882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa3X-0002Ey-BF for incoming@patchwork.ozlabs.org; Fri, 29 Mar 2013 10:13:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa2z-0002Cc-9N for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULa2y-0003YH-0n for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa2x-0003YC-Na for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:47 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2TEClMe013565 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 10:12:47 -0400 Received: from localhost.localdomain.com (vpn1-6-110.ams2.redhat.com [10.36.6.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2TECc3T031878; Fri, 29 Mar 2013 10:12:45 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2013 15:12:30 +0100 Message-Id: <00094f70bb9dcc5e680e721f0758fdb590e45d81.1364565637.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v4 03/11] savevm: add error parameter to qemu_savevm_state_begin() 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 Signed-off-by: Pavel Hrdina Reviewed-by: Eric Blake --- include/sysemu/sysemu.h | 3 ++- migration.c | 2 +- savevm.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6578782..2f35a05 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -74,7 +74,8 @@ void qemu_announce_self(void); bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params); + const MigrationParams *params, + Error **errp); int qemu_savevm_state_iterate(QEMUFile *f); void qemu_savevm_state_complete(QEMUFile *f); void qemu_savevm_state_cancel(void); diff --git a/migration.c b/migration.c index 7fb2147..d517dd6 100644 --- a/migration.c +++ b/migration.c @@ -505,7 +505,7 @@ static void *migration_thread(void *opaque) bool old_vm_running = false; DPRINTF("beginning savevm\n"); - qemu_savevm_state_begin(s->file, &s->params); + qemu_savevm_state_begin(s->file, &s->params, NULL); while (s->state == MIG_STATE_ACTIVE) { int64_t current_time; diff --git a/savevm.c b/savevm.c index dc1f4a4..56da096 100644 --- a/savevm.c +++ b/savevm.c @@ -1731,7 +1731,8 @@ bool qemu_savevm_state_blocked(Error **errp) } void qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params) + const MigrationParams *params, + Error **errp) { SaveStateEntry *se; int ret; @@ -1921,7 +1922,7 @@ static int qemu_savevm_state(QEMUFile *f) } qemu_mutex_unlock_iothread(); - qemu_savevm_state_begin(f, ¶ms); + qemu_savevm_state_begin(f, ¶ms, NULL); qemu_mutex_lock_iothread(); while (qemu_file_get_error(f) == 0) {