From patchwork Tue Mar 13 08:33:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "He, Junyan" X-Patchwork-Id: 886238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4028sm1lyRz9s9y for ; Fri, 16 Mar 2018 00:42:36 +1100 (AEDT) Received: from localhost ([::1]:51669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewT9O-0001BD-2Y for incoming@patchwork.ozlabs.org; Thu, 15 Mar 2018 09:42:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewT4f-0005ZY-Pl for qemu-devel@nongnu.org; Thu, 15 Mar 2018 09:37:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewT4b-0004nQ-Nl for qemu-devel@nongnu.org; Thu, 15 Mar 2018 09:37:41 -0400 Received: from [112.64.68.174] (port=39097 helo=robinhe-hp.sh.intel.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ewT4b-0004lN-64 for qemu-devel@nongnu.org; Thu, 15 Mar 2018 09:37:37 -0400 Received: from robinhe-hp.sh.intel.com (localhost [127.0.0.1]) by robinhe-hp (8.15.2/8.15.2/Debian-3) with ESMTP id w2D8XxIX018968; Tue, 13 Mar 2018 16:33:59 +0800 Received: (from robinhe@localhost) by robinhe-hp.sh.intel.com (8.15.2/8.15.2/Submit) id w2D8XxZv018967; Tue, 13 Mar 2018 16:33:59 +0800 From: junyan.he@intel.com To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:33:51 +0800 Message-Id: <1520930033-18885-9-git-send-email-junyan.he@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520930033-18885-1-git-send-email-junyan.he@intel.com> References: <1520930033-18885-1-git-send-email-junyan.he@intel.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 112.64.68.174 Subject: [Qemu-devel] [PATCH 08/10] RFC: Add a section_id parameter to save_live_iterate call. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, famz@redhat.com, crosthwaite.peter@gmail.com, quintela@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, Junyan He , pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Junyan He We need to know the section_id when we do snapshot saving. Add a parameter to save_live_iterate function call. Signed-off-by: Junyan He --- hw/ppc/spapr.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- include/migration/register.h | 2 +- migration/block.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7e1c858..4cde4f4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1974,7 +1974,7 @@ static int htab_save_later_pass(QEMUFile *f, sPAPRMachineState *spapr, #define MAX_ITERATION_NS 5000000 /* 5 ms */ #define MAX_KVM_BUF_SIZE 2048 -static int htab_save_iterate(QEMUFile *f, void *opaque) +static int htab_save_iterate(QEMUFile *f, void *opaque, int section_id) { sPAPRMachineState *spapr = opaque; int fd; diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index adf07ef..18ece84 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -246,7 +246,7 @@ static int cmma_save(QEMUFile *f, void *opaque, int final) return ret; } -static int cmma_save_iterate(QEMUFile *f, void *opaque) +static int cmma_save_iterate(QEMUFile *f, void *opaque, int section_id) { return cmma_save(f, opaque, 0); } diff --git a/include/migration/register.h b/include/migration/register.h index f4f7bdc..7f7df2c 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -31,7 +31,7 @@ typedef struct SaveVMHandlers { * use data that is local to the migration thread or protected * by other locks. */ - int (*save_live_iterate)(QEMUFile *f, void *opaque); + int (*save_live_iterate)(QEMUFile *f, void *opaque, int section_id); /* This runs outside the iothread lock! */ int (*save_setup)(QEMUFile *f, void *opaque); diff --git a/migration/block.c b/migration/block.c index 1f03946..6d4c8a3 100644 --- a/migration/block.c +++ b/migration/block.c @@ -755,7 +755,7 @@ static int block_save_setup(QEMUFile *f, void *opaque) return ret; } -static int block_save_iterate(QEMUFile *f, void *opaque) +static int block_save_iterate(QEMUFile *f, void *opaque, int section_id) { int ret; int64_t last_ftell = qemu_ftell(f); diff --git a/migration/ram.c b/migration/ram.c index 3b6c077..d1db422 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2249,7 +2249,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) * @f: QEMUFile where to send the data * @opaque: RAMState pointer */ -static int ram_save_iterate(QEMUFile *f, void *opaque) +static int ram_save_iterate(QEMUFile *f, void *opaque, int section_id) { RAMState **temp = opaque; RAMState *rs = *temp; diff --git a/migration/savevm.c b/migration/savevm.c index 3a9b904..ce4133a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1072,7 +1072,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy) save_section_header(f, se, QEMU_VM_SECTION_PART); - ret = se->ops->save_live_iterate(f, se->opaque); + ret = se->ops->save_live_iterate(f, se->opaque, se->section_id); trace_savevm_section_end(se->idstr, se->section_id, ret); save_section_footer(f, se);