From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJAvO-0002ZS-C1 for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJAvN-0007Ya-Bq for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41080) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJAvN-0007Xz-2y for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:25 -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 0E7BA4E4D1 for ; Fri, 9 Jun 2017 03:49:24 +0000 (UTC) From: Peter Xu Date: Fri, 9 Jun 2017 11:49:00 +0800 Message-Id: <1496980142-8986-5-git-send-email-peterx@redhat.com> In-Reply-To: <1496980142-8986-1-git-send-email-peterx@redhat.com> References: <1496980142-8986-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/6] migration: move only_migratable to MigrationState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com One less global variable, and it does only matter with migration. We keep the old "--only-migratable" option, but also now we support: -global migration.only-migratable=true Currently still keep the old interface. Signed-off-by: Peter Xu --- include/migration/migration.h | 3 +++ include/sysemu/sysemu.h | 1 - migration/migration.c | 3 ++- migration/savevm.c | 2 +- vl.c | 9 +++++++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index d3ec719..27b07ed 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -168,6 +168,9 @@ struct MigrationState * during migration. */ bool store_global_state; + + /* Whether the VM is only allowing for migratable devices */ + bool only_migratable; }; void migrate_set_state(int *state, int old_state, int new_state); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 9841a52..b213696 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -15,7 +15,6 @@ /* vl.c */ extern const char *bios_name; -extern int only_migratable; extern const char *qemu_name; extern QemuUUID qemu_uuid; extern bool qemu_uuid_set; diff --git a/migration/migration.c b/migration/migration.c index 79d886c..dbec586 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1113,7 +1113,7 @@ static GSList *migration_blockers; int migrate_add_blocker(Error *reason, Error **errp) { - if (only_migratable) { + if (migrate_get_current()->only_migratable) { error_propagate(errp, error_copy(reason)); error_prepend(errp, "disallowing migration blocker " "(--only_migratable) for: "); @@ -2104,6 +2104,7 @@ void migrate_fd_connect(MigrationState *s) static Property migration_properties[] = { DEFINE_PROP_BOOL("store-global-state", MigrationState, store_global_state, true), + DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/migration/savevm.c b/migration/savevm.c index 9c320f5..f073027 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2321,7 +2321,7 @@ void vmstate_register_ram_global(MemoryRegion *mr) bool vmstate_check_only_migratable(const VMStateDescription *vmsd) { /* check needed if --only-migratable is specified */ - if (!only_migratable) { + if (!migrate_get_current()->only_migratable) { return true; } diff --git a/vl.c b/vl.c index be4dcf2..e842eef 100644 --- a/vl.c +++ b/vl.c @@ -188,7 +188,6 @@ bool boot_strict; uint8_t *boot_splash_filedata; size_t boot_splash_filedata_size; uint8_t qemu_extra_params_fw[2]; -int only_migratable; /* turn it off unless user states otherwise */ int icount_align_option; @@ -3937,7 +3936,13 @@ int main(int argc, char **argv, char **envp) incoming = optarg; break; case QEMU_OPTION_only_migratable: - only_migratable = 1; + /* + * TODO: we can remove this option one day, and we + * should all use: + * + * "-global migration.only-migratable=true" + */ + migrate_get_current()->only_migratable = true; break; case QEMU_OPTION_nodefaults: has_defaults = 0; -- 2.7.4