Commit 03acb4e9 authored by Daniel Henrique Barboza's avatar Daniel Henrique Barboza Committed by Juan Quintela
Browse files

ram.c: remove unneeded labels 



ram_save_queue_pages() has an 'err' label that can be replaced by
'return -1' instead.

Same thing with ram_discard_range(), and in this case we can also
get rid of the 'ret' variable and return either '-1' on error
or the result of ram_block_discard_range().

CC: Juan Quintela <quintela@redhat.com>
CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent ddad81bd

migration/ram.c

+5 −13
Original line number Diff line number Diff line
@@ -2459,7 +2459,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len) 
             * it's the 1st request.

             */

            error_report("ram_save_queue_pages no previous block");

            goto err;

            return -1;

        }

    } else {

        ramblock = qemu_ram_block_by_name(rbname);
@@ -2467,7 +2467,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len) 
        if (!ramblock) {

            /* We shouldn't be asked for a non-existent RAMBlock */

            error_report("ram_save_queue_pages no block '%s'", rbname);

            goto err;

            return -1;

        }

        rs->last_req_rb = ramblock;

    }
@@ -2476,7 +2476,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len) 
        error_report("%s request overrun start=" RAM_ADDR_FMT " len="

                     RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,

                     __func__, start, len, ramblock->used_length);

        goto err;

        return -1;

    }



    struct RAMSrcPageRequest *new_entry =
@@ -2492,9 +2492,6 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len) 
    qemu_mutex_unlock(&rs->src_page_req_mutex);



    return 0;



err:

    return -1;

}



static bool save_page_use_compression(RAMState *rs)
@@ -3097,8 +3094,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) 
 */

int ram_discard_range(const char *rbname, uint64_t start, size_t length)

{

    int ret = -1;



    trace_ram_discard_range(rbname, start, length);



    RCU_READ_LOCK_GUARD();
@@ -3106,7 +3101,7 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length) 


    if (!rb) {

        error_report("ram_discard_range: Failed to find block '%s'", rbname);

        goto err;

        return -1;

    }



    /*
@@ -3118,10 +3113,7 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length) 
                     length >> qemu_target_page_bits());

    }



    ret = ram_block_discard_range(rb, start, length);



err:

    return ret;

    return ram_block_discard_range(rb, start, length);

}



/*