Commit 3ea3bd62 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



migration/next for 20140204

# gpg: Signature made Tue 04 Feb 2014 15:52:00 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140204-1:
  Don't abort on memory allocation error
  Don't abort on out of memory when creating page cache
  XBZRLE cache size should not be larger than guest memory size
  migration:fix free XBZRLE decoded_buf wrong
  Add check for cache size smaller than page size
  Set xbzrle buffers to NULL after freeing them to avoid double free errors
  exec: fix ram_list dirty map optimization
  vmstate: Make VMSTATE_STRUCT_POINTER take type, not ptr-to-type

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4db00145 89db9987

arch_init.c

+37 −12
Original line number Diff line number Diff line
@@ -164,20 +164,22 @@ static struct { 
    uint8_t *encoded_buf;

    /* buffer for storing page content */

    uint8_t *current_buf;

    /* buffer used for XBZRLE decoding */

    uint8_t *decoded_buf;

    /* Cache for XBZRLE */

    PageCache *cache;

} XBZRLE = {

    .encoded_buf = NULL,

    .current_buf = NULL,

    .decoded_buf = NULL,

    .cache = NULL,

};



/* buffer used for XBZRLE decoding */

static uint8_t *xbzrle_decoded_buf;



int64_t xbzrle_cache_resize(int64_t new_size)

{

    if (new_size < TARGET_PAGE_SIZE) {

        return -1;

    }



    if (XBZRLE.cache != NULL) {

        return cache_resize(XBZRLE.cache, new_size / TARGET_PAGE_SIZE) *

            TARGET_PAGE_SIZE;
@@ -282,7 +284,9 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, 


    if (!cache_is_cached(XBZRLE.cache, current_addr)) {

        if (!last_stage) {

            cache_insert(XBZRLE.cache, current_addr, current_data);

            if (cache_insert(XBZRLE.cache, current_addr, current_data) == -1) {

                return -1;

            }

        }

        acct_info.xbzrle_cache_miss++;

        return -1;
@@ -602,6 +606,12 @@ uint64_t ram_bytes_total(void) 
    return total;

}



void free_xbzrle_decoded_buf(void)

{

    g_free(xbzrle_decoded_buf);

    xbzrle_decoded_buf = NULL;

}



static void migration_end(void)

{

    if (migration_bitmap) {
@@ -615,8 +625,9 @@ static void migration_end(void) 
        g_free(XBZRLE.cache);

        g_free(XBZRLE.encoded_buf);

        g_free(XBZRLE.current_buf);

        g_free(XBZRLE.decoded_buf);

        XBZRLE.cache = NULL;

        XBZRLE.encoded_buf = NULL;

        XBZRLE.current_buf = NULL;

    }

}
@@ -655,8 +666,22 @@ static int ram_save_setup(QEMUFile *f, void *opaque) 
            DPRINTF("Error creating cache\n");

            return -1;

        }

        XBZRLE.encoded_buf = g_malloc0(TARGET_PAGE_SIZE);

        XBZRLE.current_buf = g_malloc(TARGET_PAGE_SIZE);



        /* We prefer not to abort if there is no memory */

        XBZRLE.encoded_buf = g_try_malloc0(TARGET_PAGE_SIZE);

        if (!XBZRLE.encoded_buf) {

            DPRINTF("Error allocating encoded_buf\n");

            return -1;

        }



        XBZRLE.current_buf = g_try_malloc(TARGET_PAGE_SIZE);

        if (!XBZRLE.current_buf) {

            DPRINTF("Error allocating current_buf\n");

            g_free(XBZRLE.encoded_buf);

            XBZRLE.encoded_buf = NULL;

            return -1;

        }



        acct_clear();

    }
@@ -807,8 +832,8 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) 
    unsigned int xh_len;

    int xh_flags;



    if (!XBZRLE.decoded_buf) {

        XBZRLE.decoded_buf = g_malloc(TARGET_PAGE_SIZE);

    if (!xbzrle_decoded_buf) {

        xbzrle_decoded_buf = g_malloc(TARGET_PAGE_SIZE);

    }



    /* extract RLE header */
@@ -825,10 +850,10 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) 
        return -1;

    }

    /* load data and decode */

    qemu_get_buffer(f, XBZRLE.decoded_buf, xh_len);

    qemu_get_buffer(f, xbzrle_decoded_buf, xh_len);



    /* decode RLE */

    ret = xbzrle_decode_buffer(XBZRLE.decoded_buf, xh_len, host,

    ret = xbzrle_decode_buffer(xbzrle_decoded_buf, xh_len, host,

                               TARGET_PAGE_SIZE);

    if (ret == -1) {

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

hw/arm/pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ static const VMStateDescription vmstate_pxa2xx_i2c = { 
        VMSTATE_UINT8(ibmr, PXA2xxI2CState),

        VMSTATE_UINT8(data, PXA2xxI2CState),

        VMSTATE_STRUCT_POINTER(slave, PXA2xxI2CState,

                               vmstate_pxa2xx_i2c_slave, PXA2xxI2CSlaveState *),

                               vmstate_pxa2xx_i2c_slave, PXA2xxI2CSlaveState),

        VMSTATE_END_OF_LIST()

    }

};

include/exec/ram_addr.h

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, 
    unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);



    /* start address is aligned at the start of a word? */

    if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) {

    if ((((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) &&

        (hpratio == 1)) {

        long k;

        long nr = BITS_TO_LONGS(pages);

include/hw/ptimer.h

+2 −8
Original line number Diff line number Diff line
@@ -27,14 +27,8 @@ void ptimer_stop(ptimer_state *s); 


extern const VMStateDescription vmstate_ptimer;



#define VMSTATE_PTIMER(_field, _state) {                             \

    .name       = (stringify(_field)),                               \

    .version_id = (1),                                               \

    .vmsd       = &vmstate_ptimer,                                   \

    .size       = sizeof(ptimer_state *),                            \

    .flags      = VMS_STRUCT|VMS_POINTER,                            \

    .offset     = vmstate_offset_pointer(_state, _field, ptimer_state), \

}

#define VMSTATE_PTIMER(_field, _state) \

    VMSTATE_STRUCT_POINTER_V(_field, _state, 1, vmstate_ptimer, ptimer_state)



#define VMSTATE_PTIMER_ARRAY(_f, _s, _n)                                \

    VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, 0,                   \

include/migration/migration.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ MigrationState *migrate_get_current(void); 
uint64_t ram_bytes_remaining(void);

uint64_t ram_bytes_transferred(void);

uint64_t ram_bytes_total(void);

void free_xbzrle_decoded_buf(void);



void acct_update_position(QEMUFile *f, size_t size, bool zero);