From patchwork Fri Feb 22 16:36:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 222556 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 808532C0297 for ; Sat, 23 Feb 2013 03:38:49 +1100 (EST) Received: from localhost ([::1]:56357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8ve3-0005zS-Kc for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 11:38:47 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vd8-0005CU-VH for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8vd3-0006oC-Qv for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:50 -0500 Received: from mail-vb0-f43.google.com ([209.85.212.43]:42692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vd3-0006nn-IM for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:45 -0500 Received: by mail-vb0-f43.google.com with SMTP id fs19so506938vbb.16 for ; Fri, 22 Feb 2013 08:37:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=09S8yxpDYSa19Z/SfndbT3uKJluT0WaKRw1RVQvLU0c=; b=roYgYcvRmBvO/t19Ln3Wib0tej+ObxmM2gWNH7mUb3LFDkb+G/NsNdnblGNaoAbkc8 dLFwm7R71eQ4G6Q9/hZeTww4mI7EQCOmWqbIgyIMHbItzW9QjChiLVqikf5MBt4b4vhT tWiSfBWFOs+wEyDCbPsTbIj24wuEPJw7QI21WLuS2KbLsRHEwumPr6ruu+d6bUrwnSby fH1oSgF7tNKFrjIyxSsZO9nEcDswQiUzrrkILqIa72B4H22MyJRJohW5OPvo3w4o0dIG z5ZoRPve0g5rOJyja3HR5FLHXIcui718VGjOfuCrrcxTynqTnwPZCgvBAsKS7+O7d2cI lxcw== X-Received: by 10.52.23.238 with SMTP id p14mr2950544vdf.86.1361551063786; Fri, 22 Feb 2013 08:37:43 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id tp10sm4291733vec.1.2013.02.22.08.37.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Feb 2013 08:37:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2013 17:36:26 +0100 Message-Id: <1361551008-12430-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361551008-12430-1-git-send-email-pbonzini@redhat.com> References: <1361551008-12430-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.212.43 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 20/42] migration: reorder SaveVMHandlers members 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 groups together the callbacks that later will have similar locking rules. Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini --- include/migration/vmstate.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f27276c..6229569 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -32,13 +32,15 @@ typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef struct SaveVMHandlers { void (*set_params)(const MigrationParams *params, void * opaque); SaveStateHandler *save_state; + int (*save_live_setup)(QEMUFile *f, void *opaque); - int (*save_live_iterate)(QEMUFile *f, void *opaque); + void (*cancel)(void *opaque); int (*save_live_complete)(QEMUFile *f, void *opaque); + bool (*is_active)(void *opaque); + int (*save_live_iterate)(QEMUFile *f, void *opaque); uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size); - void (*cancel)(void *opaque); + LoadStateHandler *load_state; - bool (*is_active)(void *opaque); } SaveVMHandlers; int register_savevm(DeviceState *dev,