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

Modify save_live_pending for postcopy 



Modify save_live_pending to return separate postcopiable and
non-postcopiable counts.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 11cf1d98

include/migration/vmstate.h

+3 −2
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ typedef struct SaveVMHandlers { 


    /* This runs outside the iothread lock!  */

    int (*save_live_setup)(QEMUFile *f, void *opaque);

    uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size);



    void (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size,

                              uint64_t *non_postcopiable_pending,

                              uint64_t *postcopiable_pending);

    LoadStateHandler *load_state;

} SaveVMHandlers;

include/sysemu/sysemu.h

+3 −1
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ void qemu_savevm_state_header(QEMUFile *f); 
int qemu_savevm_state_iterate(QEMUFile *f);

void qemu_savevm_state_cleanup(void);

void qemu_savevm_state_complete_precopy(QEMUFile *f);

uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);

void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size,

                               uint64_t *res_non_postcopiable,

                               uint64_t *res_postcopiable);

void qemu_savevm_command_send(QEMUFile *f, enum qemu_vm_cmd command,

                              uint16_t len, uint8_t *data);

void qemu_savevm_send_ping(QEMUFile *f, uint32_t value);

migration/block.c

+5 −2
Original line number Diff line number Diff line
@@ -748,7 +748,9 @@ static int block_save_complete(QEMUFile *f, void *opaque) 
    return 0;

}



static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size)

static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,

                               uint64_t *non_postcopiable_pending,

                               uint64_t *postcopiable_pending)

{

    /* Estimate pending number of bytes to send */

    uint64_t pending;
@@ -767,7 +769,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) 
    qemu_mutex_unlock_iothread();



    DPRINTF("Enter save live pending  %" PRIu64 "\n", pending);

    return pending;

    /* We don't do postcopy */

    *non_postcopiable_pending += pending;

}



static int block_load(QEMUFile *f, void *opaque, int version_id)

migration/migration.c

+7 −2
Original line number Diff line number Diff line
@@ -1288,8 +1288,13 @@ static void *migration_thread(void *opaque) 
        uint64_t pending_size;



        if (!qemu_file_rate_limit(s->file)) {

            pending_size = qemu_savevm_state_pending(s->file, max_size);

            trace_migrate_pending(pending_size, max_size);

            uint64_t pend_post, pend_nonpost;



            qemu_savevm_state_pending(s->file, max_size, &pend_nonpost,

                                      &pend_post);

            pending_size = pend_nonpost + pend_post;

            trace_migrate_pending(pending_size, max_size,

                                  pend_post, pend_nonpost);

            if (pending_size && pending_size >= max_size) {

                qemu_savevm_state_iterate(s->file);

            } else {

migration/ram.c

+6 −2
Original line number Diff line number Diff line
@@ -1383,7 +1383,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque) 
    return 0;

}



static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size)

static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,

                             uint64_t *non_postcopiable_pending,

                             uint64_t *postcopiable_pending)

{

    uint64_t remaining_size;
@@ -1397,7 +1399,9 @@ static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) 
        qemu_mutex_unlock_iothread();

        remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE;

    }

    return remaining_size;



    /* We can do postcopy, and all the data is postcopiable */

    *postcopiable_pending += remaining_size;

}



static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)