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

migration: create savevm_state

Browse Source 
This way, we will put savevm global state here, instead of lots of variables.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela
2015-05-13 13:37:04 +02:00
parent e45a1ebfc6
commit 0163a2e025
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
migration/savevm.c
View File

@@ -239,10 +239,15 @@ typedef struct SaveStateEntry {
int is_ram; int is_ram;
} SaveStateEntry; } SaveStateEntry;
typedef struct SaveState {
QTAILQ_HEAD(, SaveStateEntry) handlers;
int global_section_id;
} SaveState;
static QTAILQ_HEAD(savevm_handlers, SaveStateEntry) savevm_handlers = static SaveState savevm_state = {
QTAILQ_HEAD_INITIALIZER(savevm_handlers); .handlers = QTAILQ_HEAD_INITIALIZER(savevm_state.handlers),
static int global_section_id; .global_section_id = 0,
};
static void dump_vmstate_vmsd(FILE *out_file, static void dump_vmstate_vmsd(FILE *out_file,
const VMStateDescription *vmsd, int indent, const VMStateDescription *vmsd, int indent,
@@ -387,7 +392,7 @@ static int calculate_new_instance_id(const char *idstr)
SaveStateEntry *se; SaveStateEntry *se;
int instance_id = 0; int instance_id = 0;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (strcmp(idstr, se->idstr) == 0 if (strcmp(idstr, se->idstr) == 0
&& instance_id <= se->instance_id) { && instance_id <= se->instance_id) {
instance_id = se->instance_id + 1; instance_id = se->instance_id + 1;
@@ -401,7 +406,7 @@ static int calculate_compat_instance_id(const char *idstr)
SaveStateEntry *se; SaveStateEntry *se;
int instance_id = 0; int instance_id = 0;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->compat) { if (!se->compat) {
continue; continue;
} }
@@ -429,7 +434,7 @@ int register_savevm_live(DeviceState *dev,
se = g_malloc0(sizeof(SaveStateEntry)); se = g_malloc0(sizeof(SaveStateEntry));
se->version_id = version_id; se->version_id = version_id;
se->section_id = global_section_id++; se->section_id = savevm_state.global_section_id++;
se->ops = ops; se->ops = ops;
se->opaque = opaque; se->opaque = opaque;
se->vmsd = NULL; se->vmsd = NULL;
@@ -461,7 +466,7 @@ int register_savevm_live(DeviceState *dev,
} }
assert(!se->compat || se->instance_id == 0); assert(!se->compat || se->instance_id == 0);
/* add at the end of list */ /* add at the end of list */
QTAILQ_INSERT_TAIL(&savevm_handlers, se, entry); QTAILQ_INSERT_TAIL(&savevm_state.handlers, se, entry);
return 0; return 0;
} }
@@ -495,9 +500,9 @@ void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque)
} }
pstrcat(id, sizeof(id), idstr); pstrcat(id, sizeof(id), idstr);
QTAILQ_FOREACH_SAFE(se, &savevm_handlers, entry, new_se) { QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) {
if (strcmp(se->idstr, id) == 0 && se->opaque == opaque) { if (strcmp(se->idstr, id) == 0 && se->opaque == opaque) {
QTAILQ_REMOVE(&savevm_handlers, se, entry); QTAILQ_REMOVE(&savevm_state.handlers, se, entry);
if (se->compat) { if (se->compat) {
g_free(se->compat); g_free(se->compat);
} }
@@ -519,7 +524,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
se = g_malloc0(sizeof(SaveStateEntry)); se = g_malloc0(sizeof(SaveStateEntry));
se->version_id = vmsd->version_id; se->version_id = vmsd->version_id;
se->section_id = global_section_id++; se->section_id = savevm_state.global_section_id++;
se->opaque = opaque; se->opaque = opaque;
se->vmsd = vmsd; se->vmsd = vmsd;
se->alias_id = alias_id; se->alias_id = alias_id;
@@ -547,7 +552,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
} }
assert(!se->compat || se->instance_id == 0); assert(!se->compat || se->instance_id == 0);
/* add at the end of list */ /* add at the end of list */
QTAILQ_INSERT_TAIL(&savevm_handlers, se, entry); QTAILQ_INSERT_TAIL(&savevm_state.handlers, se, entry);
return 0; return 0;
} }
@@ -556,9 +561,9 @@ void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,
{ {
SaveStateEntry *se, *new_se; SaveStateEntry *se, *new_se;
QTAILQ_FOREACH_SAFE(se, &savevm_handlers, entry, new_se) { QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) {
if (se->vmsd == vmsd && se->opaque == opaque) { if (se->vmsd == vmsd && se->opaque == opaque) {
QTAILQ_REMOVE(&savevm_handlers, se, entry); QTAILQ_REMOVE(&savevm_state.handlers, se, entry);
if (se->compat) { if (se->compat) {
g_free(se->compat); g_free(se->compat);
} }
@@ -610,7 +615,7 @@ bool qemu_savevm_state_blocked(Error **errp)
{ {
SaveStateEntry *se; SaveStateEntry *se;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (se->vmsd && se->vmsd->unmigratable) { if (se->vmsd && se->vmsd->unmigratable) {
error_setg(errp, "State blocked by non-migratable device '%s'", error_setg(errp, "State blocked by non-migratable device '%s'",
se->idstr); se->idstr);
@@ -627,7 +632,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
int ret; int ret;
trace_savevm_state_begin(); trace_savevm_state_begin();
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->ops || !se->ops->set_params) { if (!se->ops || !se->ops->set_params) {
continue; continue;
} }
@@ -637,7 +642,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
qemu_put_be32(f, QEMU_VM_FILE_MAGIC); qemu_put_be32(f, QEMU_VM_FILE_MAGIC);
qemu_put_be32(f, QEMU_VM_FILE_VERSION); qemu_put_be32(f, QEMU_VM_FILE_VERSION);
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
int len; int len;
if (!se->ops || !se->ops->save_live_setup) { if (!se->ops || !se->ops->save_live_setup) {
@@ -680,7 +685,7 @@ int qemu_savevm_state_iterate(QEMUFile *f)
int ret = 1; int ret = 1;
trace_savevm_state_iterate(); trace_savevm_state_iterate();
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->ops || !se->ops->save_live_iterate) { if (!se->ops || !se->ops->save_live_iterate) {
continue; continue;
} }
@@ -731,7 +736,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
cpu_synchronize_all_states(); cpu_synchronize_all_states();
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->ops || !se->ops->save_live_complete) { if (!se->ops || !se->ops->save_live_complete) {
continue; continue;
} }
@@ -756,7 +761,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
vmdesc = qjson_new(); vmdesc = qjson_new();
json_prop_int(vmdesc, "page_size", TARGET_PAGE_SIZE); json_prop_int(vmdesc, "page_size", TARGET_PAGE_SIZE);
json_start_array(vmdesc, "devices"); json_start_array(vmdesc, "devices");
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
int len; int len;
if ((!se->ops || !se->ops->save_state) && !se->vmsd) { if ((!se->ops || !se->ops->save_state) && !se->vmsd) {
@@ -807,7 +812,7 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
SaveStateEntry *se; SaveStateEntry *se;
uint64_t ret = 0; uint64_t ret = 0;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->ops || !se->ops->save_live_pending) { if (!se->ops || !se->ops->save_live_pending) {
continue; continue;
} }
@@ -826,7 +831,7 @@ void qemu_savevm_state_cancel(void)
SaveStateEntry *se; SaveStateEntry *se;
trace_savevm_state_cancel(); trace_savevm_state_cancel();
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (se->ops && se->ops->cancel) { if (se->ops && se->ops->cancel) {
se->ops->cancel(se->opaque); se->ops->cancel(se->opaque);
} }
@@ -876,7 +881,7 @@ static int qemu_save_device_state(QEMUFile *f)
cpu_synchronize_all_states(); cpu_synchronize_all_states();
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
int len; int len;
if (se->is_ram) { if (se->is_ram) {
@@ -910,7 +915,7 @@ static SaveStateEntry *find_se(const char *idstr, int instance_id)
{ {
SaveStateEntry *se; SaveStateEntry *se;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!strcmp(se->idstr, idstr) && if (!strcmp(se->idstr, idstr) &&
(instance_id == se->instance_id || (instance_id == se->instance_id ||
instance_id == se->alias_id)) instance_id == se->alias_id))