Commit 895527ee authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140515' into staging 



migration/next for 20140515

# gpg: Signature made Thu 15 May 2014 02:32:25 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140515:
  usb: fix up post load checks
  migration: show average throughput when migration finishes
  savevm: Remove all the unneeded version_minimum_id_old (rest)
  savevm: Remove all the unneeded version_minimum_id_old (usb)
  Split ram_save_block
  arch_init: Simplify code for load_xbzrle()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 50cb70d1 719ffe1f

arch_init.c

+83 −72
Original line number Diff line number Diff line
@@ -560,45 +560,22 @@ static void migration_bitmap_sync(void) 
}



/*

 * ram_save_block: Writes a page of memory to the stream f

 * ram_save_page: Send the given page to the stream

 *

 * Returns:  The number of bytes written.

 *           0 means no dirty pages

 * Returns: Number of bytes written.

 */



static int ram_save_block(QEMUFile *f, bool last_stage)

static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset,

                         bool last_stage)

{

    RAMBlock *block = last_seen_block;

    ram_addr_t offset = last_offset;

    bool complete_round = false;

    int bytes_sent = 0;

    MemoryRegion *mr;

    int bytes_sent;

    int cont;

    ram_addr_t current_addr;



    if (!block)

        block = QTAILQ_FIRST(&ram_list.blocks);



    while (true) {

        mr = block->mr;

        offset = migration_bitmap_find_and_reset_dirty(mr, offset);

        if (complete_round && block == last_seen_block &&

            offset >= last_offset) {

            break;

        }

        if (offset >= block->length) {

            offset = 0;

            block = QTAILQ_NEXT(block, next);

            if (!block) {

                block = QTAILQ_FIRST(&ram_list.blocks);

                complete_round = true;

                ram_bulk_stage = false;

            }

        } else {

            int ret;

    MemoryRegion *mr = block->mr;

    uint8_t *p;

    int ret;

    bool send_async = true;

            int cont = (block == last_sent_block) ?

                RAM_SAVE_FLAG_CONTINUE : 0;



    cont = (block == last_sent_block) ? RAM_SAVE_FLAG_CONTINUE : 0;



    p = memory_region_get_ram_ptr(mr) + offset;
@@ -652,6 +629,46 @@ static int ram_save_block(QEMUFile *f, bool last_stage) 
    }



    XBZRLE_cache_unlock();



    return bytes_sent;

}



/*

 * ram_find_and_save_block: Finds a page to send and sends it to f

 *

 * Returns:  The number of bytes written.

 *           0 means no dirty pages

 */



static int ram_find_and_save_block(QEMUFile *f, bool last_stage)

{

    RAMBlock *block = last_seen_block;

    ram_addr_t offset = last_offset;

    bool complete_round = false;

    int bytes_sent = 0;

    MemoryRegion *mr;



    if (!block)

        block = QTAILQ_FIRST(&ram_list.blocks);



    while (true) {

        mr = block->mr;

        offset = migration_bitmap_find_and_reset_dirty(mr, offset);

        if (complete_round && block == last_seen_block &&

            offset >= last_offset) {

            break;

        }

        if (offset >= block->length) {

            offset = 0;

            block = QTAILQ_NEXT(block, next);

            if (!block) {

                block = QTAILQ_FIRST(&ram_list.blocks);

                complete_round = true;

                ram_bulk_stage = false;

            }

        } else {

            bytes_sent = ram_save_page(f, block, offset, last_stage);



            /* if page is unmodified, continue to the next */

            if (bytes_sent > 0) {

                last_sent_block = block;
@@ -850,7 +867,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) 
    while ((ret = qemu_file_rate_limit(f)) == 0) {

        int bytes_sent;



        bytes_sent = ram_save_block(f, false);

        bytes_sent = ram_find_and_save_block(f, false);

        /* no more blocks to sent */

        if (bytes_sent == 0) {

            break;
@@ -912,7 +929,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) 
    while (true) {

        int bytes_sent;



        bytes_sent = ram_save_block(f, true);

        bytes_sent = ram_find_and_save_block(f, true);

        /* no more blocks to sent */

        if (bytes_sent == 0) {

            break;
@@ -946,7 +963,6 @@ static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) 


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

{

    int ret, rc = 0;

    unsigned int xh_len;

    int xh_flags;
@@ -971,18 +987,13 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) 
    qemu_get_buffer(f, xbzrle_decoded_buf, xh_len);



    /* decode RLE */

    ret = xbzrle_decode_buffer(xbzrle_decoded_buf, xh_len, host,

                               TARGET_PAGE_SIZE);

    if (ret == -1) {

    if (xbzrle_decode_buffer(xbzrle_decoded_buf, xh_len, host,

                             TARGET_PAGE_SIZE) == -1) {

        fprintf(stderr, "Failed to load XBZRLE page - decode error!\n");

        rc = -1;

    } else  if (ret > TARGET_PAGE_SIZE) {

        fprintf(stderr, "Failed to load XBZRLE page - size %d exceeds %d!\n",

                ret, TARGET_PAGE_SIZE);

        abort();

        return -1;

    }



    return rc;

    return 0;

}



static inline void *host_from_stream_offset(QEMUFile *f,

audio/audio.c

+1 −2
Original line number Diff line number Diff line
@@ -1812,7 +1812,6 @@ static const VMStateDescription vmstate_audio = { 
    .name = "audio",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_END_OF_LIST()

    }

cpus.c

+1 −2
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ static const VMStateDescription vmstate_timers = { 
    .name = "timer",

    .version_id = 2,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_INT64(cpu_ticks_offset, TimersState),

        VMSTATE_INT64(dummy, TimersState),

exec.c

+1 −2
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ const VMStateDescription vmstate_cpu_common = { 
    .name = "cpu_common",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .post_load = cpu_common_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(halted, CPUState),

hw/audio/milkymist-ac97.c

+1 −2
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ static const VMStateDescription vmstate_milkymist_ac97 = { 
    .name = "milkymist-ac97",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .post_load = ac97_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32_ARRAY(regs, MilkymistAC97State, R_MAX),