diff options
| author | Dr. David Alan Gilbert | 2015-05-21 14:24:12 +0200 |
|---|---|---|
| committer | Juan Quintela | 2015-06-12 06:54:01 +0200 |
| commit | f796baa1b3efcf105ba3a465f797e05ac2b3dcfc (patch) | |
| tree | c01eca58610333bb362a8422b42144c9c3cd3235 /migration | |
| parent | Add qemu_get_counted_string to read a string prefixed by a count byte (diff) | |
| download | qemu-f796baa1b3efcf105ba3a465f797e05ac2b3dcfc.tar.gz qemu-f796baa1b3efcf105ba3a465f797e05ac2b3dcfc.tar.xz qemu-f796baa1b3efcf105ba3a465f797e05ac2b3dcfc.zip | |
Split header writing out of qemu_savevm_state_begin
Split qemu_savevm_state_begin to:
qemu_savevm_state_header That writes the initial file header.
qemu_savevm_state_begin That sets up devices and does the first
device pass.
Used later in postcopy.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 1 | ||||
| -rw-r--r-- | migration/savevm.c | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c index 5d77046a69..438bf91b54 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -738,6 +738,7 @@ static void *migration_thread(void *opaque) int64_t start_time = initial_time; bool old_vm_running = false; + qemu_savevm_state_header(s->file); qemu_savevm_state_begin(s->file, &s->params); s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; diff --git a/migration/savevm.c b/migration/savevm.c index 2b0aa65cd7..903dbebf9f 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -625,6 +625,13 @@ bool qemu_savevm_state_blocked(Error **errp) return false; } +void qemu_savevm_state_header(QEMUFile *f) +{ + trace_savevm_state_header(); + qemu_put_be32(f, QEMU_VM_FILE_MAGIC); + qemu_put_be32(f, QEMU_VM_FILE_VERSION); +} + void qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params) { @@ -639,9 +646,6 @@ void qemu_savevm_state_begin(QEMUFile *f, se->ops->set_params(params, se->opaque); } - qemu_put_be32(f, QEMU_VM_FILE_MAGIC); - qemu_put_be32(f, QEMU_VM_FILE_VERSION); - QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { int len; @@ -851,6 +855,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) } qemu_mutex_unlock_iothread(); + qemu_savevm_state_header(f); qemu_savevm_state_begin(f, ¶ms); qemu_mutex_lock_iothread(); |