mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: move only_migratable to MigrationState

Browse Source 
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.

Hmm, now vl.c has no way to access migrate_get_current(). Export a
function for it to setup only_migratable.

Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1498536619-14548-7-git-send-email-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2017-06-27 12:10:15 +08:00 committed by Juan Quintela
parent 5272298c48
commit 3df663e575
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/misc.h
View File

@ -55,4 +55,6 @@ bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *); bool migration_has_failed(MigrationState *);
/* ...and after the device transmission */ /* ...and after the device transmission */
bool migration_in_postcopy_after_devices(MigrationState *); bool migration_in_postcopy_after_devices(MigrationState *);
void migration_only_migratable_set(void);
#endif #endif

1
include/sysemu/sysemu.h
View File

@ -15,7 +15,6 @@
/* vl.c */ /* vl.c */
extern const char *bios_name; extern const char *bios_name;
extern int only_migratable;
extern const char *qemu_name; extern const char *qemu_name;
extern QemuUUID qemu_uuid; extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set; extern bool qemu_uuid_set;

8
migration/migration.c
View File

@ -115,6 +115,11 @@ MigrationState *migrate_get_current(void)
return current_migration; return current_migration;
} }
void migration_only_migratable_set(void)
{
migrate_get_current()->only_migratable = true;
}
MigrationIncomingState *migration_incoming_get_current(void) MigrationIncomingState *migration_incoming_get_current(void)
{ {
static bool once; static bool once;
@ -986,7 +991,7 @@ static GSList *migration_blockers;
int migrate_add_blocker(Error *reason, Error **errp) int migrate_add_blocker(Error *reason, Error **errp)
{ {
if (only_migratable) { if (migrate_get_current()->only_migratable) {
error_propagate(errp, error_copy(reason)); error_propagate(errp, error_copy(reason));
error_prepend(errp, "disallowing migration blocker " error_prepend(errp, "disallowing migration blocker "
"(--only_migratable) for: "); "(--only_migratable) for: ");
@ -1979,6 +1984,7 @@ void migrate_fd_connect(MigrationState *s)
static Property migration_properties[] = { static Property migration_properties[] = {
DEFINE_PROP_BOOL("store-global-state", MigrationState, DEFINE_PROP_BOOL("store-global-state", MigrationState,
store_global_state, true), store_global_state, true),
DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, false),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

3
migration/migration.h
View File

@ -139,6 +139,9 @@ struct MigrationState
* during migration. * during migration.
*/ */
bool store_global_state; 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); void migrate_set_state(int *state, int old_state, int new_state);

2
migration/savevm.c
View File

@ -2336,7 +2336,7 @@ void vmstate_register_ram_global(MemoryRegion *mr)
bool vmstate_check_only_migratable(const VMStateDescription *vmsd) bool vmstate_check_only_migratable(const VMStateDescription *vmsd)
{ {
/* check needed if --only-migratable is specified */ /* check needed if --only-migratable is specified */
if (!only_migratable) { if (!migrate_get_current()->only_migratable) {
return true; return true;
} }

9
vl.c
View File

@ -188,7 +188,6 @@ bool boot_strict;
uint8_t *boot_splash_filedata; uint8_t *boot_splash_filedata;
size_t boot_splash_filedata_size; size_t boot_splash_filedata_size;
uint8_t qemu_extra_params_fw[2]; uint8_t qemu_extra_params_fw[2];
int only_migratable; /* turn it off unless user states otherwise */
int icount_align_option; int icount_align_option;
@ -3953,7 +3952,13 @@ int main(int argc, char **argv, char **envp)
incoming = optarg; incoming = optarg;
break; break;
case QEMU_OPTION_only_migratable: 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"
*/
migration_only_migratable_set();
break; break;
case QEMU_OPTION_nodefaults: case QEMU_OPTION_nodefaults:
has_defaults = 0; has_defaults = 0;