Commit fa53a0e5 authored by Gonglei's avatar Gonglei Committed by Paolo Bonzini
Browse files

memory: drop find_ram_block() 



On the one hand, we have already qemu_get_ram_block() whose function
is similar. On the other hand, we can directly use mr->ram_block but
searching RAMblock by ram_addr which is a kind of waste.

Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <1462845901-89716-2-git-send-email-arei.gonglei@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e92a2d9c

exec.c

+7 −27
Original line number Diff line number Diff line
@@ -1411,34 +1411,18 @@ static void qemu_ram_setup_dump(void *addr, ram_addr_t size) 
    }

}



/* Called within an RCU critical section, or while the ramlist lock

 * is held.

 */

static RAMBlock *find_ram_block(ram_addr_t addr)

{

    RAMBlock *block;



    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {

        if (block->offset == addr) {

            return block;

        }

    }



    return NULL;

}



const char *qemu_ram_get_idstr(RAMBlock *rb)

{

    return rb->idstr;

}



/* Called with iothread lock held.  */

void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev)

void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev)

{

    RAMBlock *new_block, *block;

    RAMBlock *block;



    rcu_read_lock();

    new_block = find_ram_block(addr);



    assert(new_block);

    assert(!new_block->idstr[0]);
@@ -1452,7 +1436,8 @@ void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev) 
    pstrcat(new_block->idstr, sizeof(new_block->idstr), name);



    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {

        if (block != new_block && !strcmp(block->idstr, new_block->idstr)) {

        if (block != new_block &&

            !strcmp(block->idstr, new_block->idstr)) {

            fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",

                    new_block->idstr);

            abort();
@@ -1462,17 +1447,14 @@ void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev) 
}



/* Called with iothread lock held.  */

void qemu_ram_unset_idstr(ram_addr_t addr)

void qemu_ram_unset_idstr(RAMBlock *block)

{

    RAMBlock *block;



    /* FIXME: arch_init.c assumes that this is not called throughout

     * migration.  Ignore the problem since hot-unplug during migration

     * does not work anyway.

     */



    rcu_read_lock();

    block = find_ram_block(addr);

    if (block) {

        memset(block->idstr, 0, sizeof(block->idstr));

    }
@@ -1496,10 +1478,8 @@ static int memory_try_enable_merging(void *addr, size_t len) 
 * resize callback to update device state and/or add assertions to detect

 * misuse, if necessary.

 */

int qemu_ram_resize(ram_addr_t base, ram_addr_t newsize, Error **errp)

int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)

{

    RAMBlock *block = find_ram_block(base);



    assert(block);



    newsize = HOST_PAGE_ALIGN(newsize);

include/exec/cpu-common.h

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ MemoryRegion *qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr); 
RAMBlock *qemu_ram_block_by_name(const char *name);

RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,

                                   ram_addr_t *ram_addr, ram_addr_t *offset);

void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev);

void qemu_ram_unset_idstr(ram_addr_t addr);

void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *dev);

void qemu_ram_unset_idstr(RAMBlock *block);

const char *qemu_ram_get_idstr(RAMBlock *rb);



void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,

include/exec/ram_addr.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void qemu_set_ram_fd(ram_addr_t addr, int fd); 
void *qemu_get_ram_block_host_ptr(ram_addr_t addr);

void qemu_ram_free(RAMBlock *block);



int qemu_ram_resize(ram_addr_t base, ram_addr_t newsize, Error **errp);

int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);



#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)

#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))

memory.c

+1 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,7 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp 
{

    assert(mr->ram_block);



    qemu_ram_resize(memory_region_get_ram_addr(mr), newsize, errp);

    qemu_ram_resize(mr->ram_block, newsize, errp);

}



static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpace *as)

migration/ram.c

+1 −1
Original line number Diff line number Diff line
@@ -2478,7 +2478,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
                    if (length != block->used_length) {

                        Error *local_err = NULL;



                        ret = qemu_ram_resize(block->offset, length,

                        ret = qemu_ram_resize(block, length,

                                              &local_err);

                        if (local_err) {

                            error_report_err(local_err);