From nobody Wed Nov 5 09:01:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499706762765845.5486633920286; Mon, 10 Jul 2017 10:12:42 -0700 (PDT) Received: from localhost ([::1]:42174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUcEi-00064l-Dp for importer@patchew.org; Mon, 10 Jul 2017 13:12:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUcD1-0004su-Rq for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUcD0-0008Ni-M8 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dUcD0-0008MC-DP for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61AA6624A4 for ; Mon, 10 Jul 2017 17:10:53 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-116-231.ams2.redhat.com [10.36.116.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id F05E8627DF; Mon, 10 Jul 2017 17:10:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 61AA6624A4 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 61AA6624A4 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 18:10:37 +0100 Message-Id: <20170710171040.21021-7-dgilbert@redhat.com> In-Reply-To: <20170710171040.21021-1-dgilbert@redhat.com> References: <20170710171040.21021-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 10 Jul 2017 17:10:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup() 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: lvivier@redhat.com, peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Juan Quintela We need a cleanup for loads, so we rename here to be consistent. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert -- Rename htab_cleanup to htap_save_cleanup as dave suggestion Message-Id: <20170628095228.4661-3-quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert --- hw/ppc/spapr.c | 4 ++-- include/migration/register.h | 2 +- migration/block.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ba87be5d48..990772b633 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1945,7 +1945,7 @@ static int htab_load(QEMUFile *f, void *opaque, int v= ersion_id) return 0; } =20 -static void htab_cleanup(void *opaque) +static void htab_save_cleanup(void *opaque) { sPAPRMachineState *spapr =3D opaque; =20 @@ -1956,7 +1956,7 @@ static SaveVMHandlers savevm_htab_handlers =3D { .save_setup =3D htab_save_setup, .save_live_iterate =3D htab_save_iterate, .save_live_complete_precopy =3D htab_save_complete, - .cleanup =3D htab_cleanup, + .save_cleanup =3D htab_save_cleanup, .load_state =3D htab_load, }; =20 diff --git a/include/migration/register.h b/include/migration/register.h index f607769e83..938ea2bc3d 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -18,7 +18,7 @@ typedef struct SaveVMHandlers { /* This runs inside the iothread lock. */ SaveStateHandler *save_state; =20 - void (*cleanup)(void *opaque); + void (*save_cleanup)(void *opaque); int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque); int (*save_live_complete_precopy)(QEMUFile *f, void *opaque); =20 diff --git a/migration/block.c b/migration/block.c index 7a7e83a268..9171f60028 100644 --- a/migration/block.c +++ b/migration/block.c @@ -1013,7 +1013,7 @@ static SaveVMHandlers savevm_block_handlers =3D { .save_live_complete_precopy =3D block_save_complete, .save_live_pending =3D block_save_pending, .load_state =3D block_load, - .cleanup =3D block_migration_cleanup, + .save_cleanup =3D block_migration_cleanup, .is_active =3D block_is_active, }; =20 diff --git a/migration/ram.c b/migration/ram.c index 480248a00f..649f76cb52 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2629,7 +2629,7 @@ static SaveVMHandlers savevm_ram_handlers =3D { .save_live_complete_precopy =3D ram_save_complete, .save_live_pending =3D ram_save_pending, .load_state =3D ram_load, - .cleanup =3D ram_migration_cleanup, + .save_cleanup =3D ram_migration_cleanup, }; =20 void ram_mig_init(void) diff --git a/migration/savevm.c b/migration/savevm.c index 66f816040e..fee11c5d28 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1215,8 +1215,8 @@ void qemu_savevm_state_cleanup(void) =20 trace_savevm_state_cleanup(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { - if (se->ops && se->ops->cleanup) { - se->ops->cleanup(se->opaque); + if (se->ops && se->ops->save_cleanup) { + se->ops->save_cleanup(se->opaque); } } } --=20 2.13.0