From patchwork Wed Oct 7 06:20:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 527151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 301BA140DA5 for ; Wed, 7 Oct 2015 17:23:19 +1100 (AEDT) Received: from localhost ([::1]:55447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji8D-0006ul-1D for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 02:23:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji5v-0002WC-TR for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zji5u-0000OQ-Mb for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:20:55 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:6529 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji5u-0000O7-B7 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:20:54 -0400 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t976KkkS031932; Wed, 7 Oct 2015 09:20:52 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 7 Oct 2015 09:20:41 +0300 Message-Id: <1444198846-5383-4-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444198846-5383-1-git-send-email-den@openvz.org> References: <5614531B.5080107@redhat.com> <1444198846-5383-1-git-send-email-den@openvz.org> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by relay.sw.ru id t976KkkS031932 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Denis V. Lunev" , Igor Redko , jsnow@redhat.com, qemu-devel@nongnu.org, annam@virtuozzo.com Subject: [Qemu-devel] [PATCH 3/8] migration: add new capability test-only 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 From: Igor Redko This patch declares a new migration capability that allows to distinguish between true migration and the test. An alternative is using a custom URI but in this case the following problems should be solved: 1/ QEMUFile abstraction hides the real transport type 2/ We must be ensured that VM will not be stopped due to “successful migration” Possible solutions: 1/ Using global variable analogous to s->enabled_capabilities[MIGRATION_CAPABILITY_TEST_ONLY] that will be initialized according to the migration type at the beginning of the migration process 2/ Additional hook, presence of implementation of which allows to decide whether the migration is true Signed-off-by: Igor Redko Reviewed-by: Anna Melekhova Signed-off-by: Denis V. Lunev --- include/migration/migration.h | 2 ++ migration/migration.c | 9 +++++++++ qapi-schema.json | 5 ++++- qmp-commands.hx | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index deb0d21..8611750 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -179,6 +179,8 @@ int migrate_compress_threads(void); int migrate_decompress_threads(void); bool migrate_use_events(void); +bool migrate_is_test(void); + void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); diff --git a/migration/migration.c b/migration/migration.c index b710a2d..e0cad54 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -954,6 +954,15 @@ int migrate_use_xbzrle(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE]; } +bool migrate_is_test(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_TEST_ONLY]; +} + int64_t migrate_xbzrle_cache_size(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index 8b0520c..38bf199 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -540,11 +540,14 @@ # @auto-converge: If enabled, QEMU will automatically throttle down the guest # to speed up convergence of RAM migration. (since 1.6) # +# @test-only: If enabled, QEMU instead of migrating will estimate migration +# time basing on given downtime and current dirty page rate +# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress', 'events'] } + 'compress', 'events', 'test-only'] } ## # @MigrationCapabilityStatus diff --git a/qmp-commands.hx b/qmp-commands.hx index d2ba800..741d088 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3456,6 +3456,7 @@ Enable/Disable migration capabilities - "auto-converge": throttle down guest to help convergence of migration - "zero-blocks": compress zero blocks during block migration - "events": generate events for each migration state change +- "test-only": don't send any data, instead estimate dirty page rate Arguments: