diff options
author | Juan Quintela <quintela@redhat.com> | 2014-10-08 13:58:24 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2015-07-07 14:54:52 +0200 |
commit | 13d16814d2058f10461e6987c8216950389c1310 (patch) | |
tree | 48a3c7cff5bc7923b9d4b8d5eba54bcfe746aff8 /migration | |
parent | df4b1024526cae3479da3492d6371fd4a7324a03 (diff) | |
download | qemu-13d16814d2058f10461e6987c8216950389c1310.zip qemu-13d16814d2058f10461e6987c8216950389c1310.tar.gz qemu-13d16814d2058f10461e6987c8216950389c1310.tar.bz2 |
global_state: Make section optional
This section would be sent:
a- for all new machine types
b- for old machine types if section state is different form {running,paused}
that were the only giving us troubles.
So, in new qemus: it is alwasy there. In old qemus: they are only
there if it an error has happened, basically stoping on target.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r-- | migration/migration.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index 5e436f7..edb4f3e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -100,6 +100,7 @@ void migration_incoming_state_destroy(void) typedef struct { + bool optional; uint32_t size; uint8_t runstate[100]; } GlobalState; @@ -122,6 +123,33 @@ static char *global_state_get_runstate(void) return (char *)global_state.runstate; } +void global_state_set_optional(void) +{ + global_state.optional = true; +} + +static bool global_state_needed(void *opaque) +{ + GlobalState *s = opaque; + char *runstate = (char *)s->runstate; + + /* If it is not optional, it is mandatory */ + + if (s->optional == false) { + return true; + } + + /* If state is running or paused, it is not needed */ + + if (strcmp(runstate, "running") == 0 || + strcmp(runstate, "paused") == 0) { + return false; + } + + /* for any other state it is needed */ + return true; +} + static int global_state_post_load(void *opaque, int version_id) { GlobalState *s = opaque; @@ -161,6 +189,7 @@ static const VMStateDescription vmstate_globalstate = { .minimum_version_id = 1, .post_load = global_state_post_load, .pre_save = global_state_pre_save, + .needed = global_state_needed, .fields = (VMStateField[]) { VMSTATE_UINT32(size, GlobalState), VMSTATE_BUFFER(runstate, GlobalState), |