Commit 7443b437 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

exec: move qemu_ram_addr_from_host_nofail to cputlb.c 



After the next patch it would not be used elsewhere anyway.  Also,
the _nofail and the standard versions of this function return different
things, which is confusing.  Removing the function from the public headers
limits the confusion.

Reviewed-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 23887b79

cputlb.c

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start, 
    }

}



static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)

{

    ram_addr_t ram_addr;



    if (qemu_ram_addr_from_host(ptr, &ram_addr)) {

        fprintf(stderr, "Bad ram pointer %p\n", ptr);

        abort();

    }

    return ram_addr;

}



static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)

{

    ram_addr_t ram_addr;

exec.c

+5 −14
Original line number Diff line number Diff line
@@ -1390,6 +1390,8 @@ static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size) 
    }

}



/* Some of the softmmu routines need to translate from a host pointer

   (typically a TLB entry) back to a ram offset.  */

int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr)

{

    RAMBlock *block;
@@ -1422,19 +1424,6 @@ found: 
    return 0;

}



/* Some of the softmmu routines need to translate from a host pointer

   (typically a TLB entry) back to a ram offset.  */

ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)

{

    ram_addr_t ram_addr;



    if (qemu_ram_addr_from_host(ptr, &ram_addr)) {

        fprintf(stderr, "Bad ram pointer %p\n", ptr);

        abort();

    }

    return ram_addr;

}



static void notdirty_mem_write(void *opaque, hwaddr ram_addr,

                               uint64_t val, unsigned size)

{
@@ -2121,7 +2110,9 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, 
{

    if (buffer != bounce.buffer) {

        if (is_write) {

            ram_addr_t addr1 = qemu_ram_addr_from_host_nofail(buffer);

            ram_addr_t addr1;

            int rc = qemu_ram_addr_from_host(buffer, &addr1);

            assert(rc == 0);

            while (access_len) {

                unsigned l;

                l = TARGET_PAGE_SIZE;

include/exec/cpu-common.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); 
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);

/* This should not be used by devices.  */

int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);

ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr);

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



void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,