Commit f796baa1 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent b3af1bc9

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ void qemu_announce_self(void); 
bool qemu_savevm_state_blocked(Error **errp);

void qemu_savevm_state_begin(QEMUFile *f,

                             const MigrationParams *params);

void qemu_savevm_state_header(QEMUFile *f);

int qemu_savevm_state_iterate(QEMUFile *f);

void qemu_savevm_state_complete(QEMUFile *f);

void qemu_savevm_state_cancel(void);

migration/migration.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

migration/savevm.c

+8 −3
Original line number Diff line number Diff line
@@ -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, &params);

    qemu_mutex_lock_iothread();

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint 
savevm_section_start(const char *id, unsigned int section_id) "%s, section_id %u"

savevm_section_end(const char *id, unsigned int section_id, int ret) "%s, section_id %u -> %d"

savevm_state_begin(void) ""

savevm_state_header(void) ""

savevm_state_iterate(void) ""

savevm_state_complete(void) ""

savevm_state_cancel(void) ""