From nobody Wed Nov 5 09:21:25 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 1499707029845322.42028885704053; Mon, 10 Jul 2017 10:17:09 -0700 (PDT) Received: from localhost ([::1]:42202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUcJ1-0001ka-EM for importer@patchew.org; Mon, 10 Jul 2017 13:17:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUcD0-0004rb-8s for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUcCy-0008Le-U6 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dUcCy-0008L5-K9 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 13:10:52 -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 AE53C8A003 for ; Mon, 10 Jul 2017 17:10:51 +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 A098E5D6A6; Mon, 10 Jul 2017 17:10:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AE53C8A003 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AE53C8A003 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 18:10:36 +0100 Message-Id: <20170710171040.21021-6-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.26]); Mon, 10 Jul 2017 17:10:51 +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 5/9] migration: Rename save_live_setup() to save_setup() 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 are going to use it now for more than save live regions. Once there rename qemu_savevm_state_begin() to qemu_savevm_state_setup(). Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Message-Id: <20170628095228.4661-2-quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert --- hw/ppc/spapr.c | 2 +- include/migration/register.h | 2 +- migration/block.c | 2 +- migration/colo.c | 2 +- migration/migration.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 12 ++++++------ migration/savevm.h | 2 +- migration/trace-events | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0ee9fac50b..ba87be5d48 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1953,7 +1953,7 @@ static void htab_cleanup(void *opaque) } =20 static SaveVMHandlers savevm_htab_handlers =3D { - .save_live_setup =3D htab_save_setup, + .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, diff --git a/include/migration/register.h b/include/migration/register.h index d9498d95eb..f607769e83 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -33,7 +33,7 @@ typedef struct SaveVMHandlers { int (*save_live_iterate)(QEMUFile *f, void *opaque); =20 /* This runs outside the iothread lock! */ - int (*save_live_setup)(QEMUFile *f, void *opaque); + int (*save_setup)(QEMUFile *f, void *opaque); void (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t threshold_size, uint64_t *non_postcopiable_pending, diff --git a/migration/block.c b/migration/block.c index 86c0b96cd1..7a7e83a268 100644 --- a/migration/block.c +++ b/migration/block.c @@ -1008,7 +1008,7 @@ static bool block_is_active(void *opaque) } =20 static SaveVMHandlers savevm_block_handlers =3D { - .save_live_setup =3D block_save_setup, + .save_setup =3D block_save_setup, .save_live_iterate =3D block_save_iterate, .save_live_complete_precopy =3D block_save_complete, .save_live_pending =3D block_save_pending, diff --git a/migration/colo.c b/migration/colo.c index c4ba4c328b..ef35f00c9a 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -350,7 +350,7 @@ static int colo_do_checkpoint_transaction(MigrationStat= e *s, /* Disable block migration */ migrate_set_block_enabled(false, &local_err); qemu_savevm_state_header(fb); - qemu_savevm_state_begin(fb); + qemu_savevm_state_setup(fb); qemu_mutex_lock_iothread(); qemu_savevm_state_complete_precopy(fb, false, false); qemu_mutex_unlock_iothread(); diff --git a/migration/migration.c b/migration/migration.c index 31d46d1343..beea01ce63 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1835,7 +1835,7 @@ static void *migration_thread(void *opaque) qemu_savevm_send_postcopy_advise(s->to_dst_file); } =20 - qemu_savevm_state_begin(s->to_dst_file); + qemu_savevm_state_setup(s->to_dst_file); =20 s->setup_time =3D qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, diff --git a/migration/ram.c b/migration/ram.c index 0baa1e0d56..480248a00f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2623,7 +2623,7 @@ static int ram_load(QEMUFile *f, void *opaque, int ve= rsion_id) } =20 static SaveVMHandlers savevm_ram_handlers =3D { - .save_live_setup =3D ram_save_setup, + .save_setup =3D ram_save_setup, .save_live_iterate =3D ram_save_iterate, .save_live_complete_postcopy =3D ram_save_complete, .save_live_complete_precopy =3D ram_save_complete, diff --git a/migration/savevm.c b/migration/savevm.c index be3f885119..66f816040e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -596,7 +596,7 @@ int register_savevm_live(DeviceState *dev, se->opaque =3D opaque; se->vmsd =3D NULL; /* if this is a live_savem then set is_ram */ - if (ops->save_live_setup !=3D NULL) { + if (ops->save_setup !=3D NULL) { se->is_ram =3D 1; } =20 @@ -955,14 +955,14 @@ void qemu_savevm_state_header(QEMUFile *f) } } =20 -void qemu_savevm_state_begin(QEMUFile *f) +void qemu_savevm_state_setup(QEMUFile *f) { SaveStateEntry *se; int ret; =20 - trace_savevm_state_begin(); + trace_savevm_state_setup(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { - if (!se->ops || !se->ops->save_live_setup) { + if (!se->ops || !se->ops->save_setup) { continue; } if (se->ops && se->ops->is_active) { @@ -972,7 +972,7 @@ void qemu_savevm_state_begin(QEMUFile *f) } save_section_header(f, se, QEMU_VM_SECTION_START); =20 - ret =3D se->ops->save_live_setup(f, se->opaque); + ret =3D se->ops->save_setup(f, se->opaque); save_section_footer(f, se); if (ret < 0) { qemu_file_set_error(f, ret); @@ -1241,7 +1241,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **err= p) =20 qemu_mutex_unlock_iothread(); qemu_savevm_state_header(f); - qemu_savevm_state_begin(f); + qemu_savevm_state_setup(f); qemu_mutex_lock_iothread(); =20 while (qemu_file_get_error(f) =3D=3D 0) { diff --git a/migration/savevm.h b/migration/savevm.h index 5a2ed1161d..6babc6221a 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -30,7 +30,7 @@ #define QEMU_VM_SECTION_FOOTER 0x7e =20 bool qemu_savevm_state_blocked(Error **errp); -void qemu_savevm_state_begin(QEMUFile *f); +void qemu_savevm_state_setup(QEMUFile *f); void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy); void qemu_savevm_state_cleanup(void); diff --git a/migration/trace-events b/migration/trace-events index 38345be9c3..9669e94ddc 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -32,7 +32,7 @@ savevm_send_open_return_path(void) "" savevm_send_ping(uint32_t val) "%x" savevm_send_postcopy_listen(void) "" savevm_send_postcopy_run(void) "" -savevm_state_begin(void) "" +savevm_state_setup(void) "" savevm_state_header(void) "" savevm_state_iterate(void) "" savevm_state_cleanup(void) "" --=20 2.13.0