From nobody Sun Feb 8 19:59:45 2026 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.zoho.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 1486480091367925.2447393525198; Tue, 7 Feb 2017 07:08:11 -0800 (PST) Received: from localhost ([::1]:54653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cb7NJ-0001xP-0I for importer@patchew.org; Tue, 07 Feb 2017 10:08:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cb7L9-0000Vx-Ed for qemu-devel@nongnu.org; Tue, 07 Feb 2017 10:05:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cb7L3-00077v-Dk for qemu-devel@nongnu.org; Tue, 07 Feb 2017 10:05:55 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:12785 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cb7L3-00072f-1P; Tue, 07 Feb 2017 10:05:49 -0500 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v17F5ekw013037; Tue, 7 Feb 2017 18:05:42 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Tue, 7 Feb 2017 18:05:24 +0300 Message-Id: <1486479940-163258-2-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486479940-163258-1-git-send-email-vsementsov@virtuozzo.com> References: <1486479940-163258-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 01/17] migration: add has_postcopy savevm handler 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, peter.maydell@linaro.org, vsementsov@virtuozzo.com, famz@redhat.com, lirans@il.ibm.com, quintela@redhat.com, jsnow@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, dgilbert@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" Now postcopy-able states are recognized by not NULL save_live_complete_postcopy handler. But when we have several different postcopy-able states, it is not convenient. Ram postcopy may be disabled, while some other postcopy enabled, in this case Ram state should behave as it is not postcopy-able. This patch add separate has_postcopy handler to specify behaviour of savevm state. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Juan Quintela --- include/migration/vmstate.h | 1 + migration/ram.c | 6 ++++++ migration/savevm.c | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 3bbe3ed..1eadcf0 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -46,6 +46,7 @@ typedef struct SaveVMHandlers { =20 /* This runs both outside and inside the iothread lock. */ bool (*is_active)(void *opaque); + bool (*has_postcopy)(void *opaque); =20 /* This runs outside the iothread lock in the migration case, and * within the lock in the savevm case. The callback had better only diff --git a/migration/ram.c b/migration/ram.c index ef8fadf..c688866 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2589,10 +2589,16 @@ static int ram_load(QEMUFile *f, void *opaque, int = version_id) return ret; } =20 +static bool ram_has_postcopy(void *opaque) +{ + return migrate_postcopy_ram(); +} + static SaveVMHandlers savevm_ram_handlers =3D { .save_live_setup =3D ram_save_setup, .save_live_iterate =3D ram_save_iterate, .save_live_complete_postcopy =3D ram_save_complete, + .has_postcopy =3D ram_has_postcopy, .save_live_complete_precopy =3D ram_save_complete, .save_live_pending =3D ram_save_pending, .load_state =3D ram_load, diff --git a/migration/savevm.c b/migration/savevm.c index 204012e..5235833 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1018,7 +1018,8 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postc= opy) * call that's already run, it might get confused if we call * iterate afterwards. */ - if (postcopy && !se->ops->save_live_complete_postcopy) { + if (postcopy && + !(se->ops->has_postcopy && se->ops->has_postcopy(se->opaque)))= { continue; } if (qemu_file_rate_limit(f)) { @@ -1106,7 +1107,8 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f, = bool iterable_only) =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || - (in_postcopy && se->ops->save_live_complete_postcopy) || + (in_postcopy && se->ops->has_postcopy && + se->ops->has_postcopy(se->opaque)) || (in_postcopy && !iterable_only) || !se->ops->save_live_complete_precopy) { continue; --=20 1.8.3.1