Commit fb626663 authored by Chen Gang's avatar Chen Gang Committed by Juan Quintela
Browse files

arch_init: Simplify code for load_xbzrle() 



For xbzrle_decode_buffer(), when decoding contents will exceed writing
buffer, it will return -1, so need not check the return value whether
large than writing buffer.

And when failure occurs within load_xbzrle(), it always return -1
without any resources which need release.

So can remove the related checking statements, and also can remove 'rc'
and 'ret' local variables,

Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent f30d56e7

arch_init.c

+4 −10
Original line number Diff line number Diff line
@@ -946,7 +946,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 +970,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,