Commit 4f39178b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

exec: eliminate qemu_put_ram_ptr 



Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bbcfd291

exec.c

+0 −8
Original line number Diff line number Diff line
@@ -1334,11 +1334,6 @@ static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size) 
    }

}



void qemu_put_ram_ptr(void *addr)

{

    trace_qemu_put_ram_ptr(addr);

}



int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr)

{

    RAMBlock *block;
@@ -1928,7 +1923,6 @@ void address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf, 
                ptr = qemu_get_ram_ptr(addr1);

                memcpy(ptr, buf, l);

                invalidate_and_set_dirty(addr1, l);

                qemu_put_ram_ptr(ptr);

            }

        } else {

            if (!(memory_region_is_ram(section->mr) ||
@@ -1958,7 +1952,6 @@ void address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf, 
                                       + memory_region_section_addr(section,

                                                                    addr));

                memcpy(buf, ptr, l);

                qemu_put_ram_ptr(ptr);

            }

        }

        len -= l;
@@ -2020,7 +2013,6 @@ void cpu_physical_memory_write_rom(hwaddr addr, 
            ptr = qemu_get_ram_ptr(addr1);

            memcpy(ptr, buf, l);

            invalidate_and_set_dirty(addr1, l);

            qemu_put_ram_ptr(ptr);

        }

        len -= l;

        buf += l;

hw/pci/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -1959,8 +1959,6 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) 
        pci_patch_ids(pdev, ptr, size);

    }



    qemu_put_ram_ptr(ptr);



    pci_register_bar(pdev, PCI_ROM_SLOT, 0, &pdev->rom);



    return 0;

hw/scsi/megasas.c

+0 −1
Original line number Diff line number Diff line
@@ -711,7 +711,6 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd) 


        ptr = memory_region_get_ram_ptr(&s->dev.rom);

        memcpy(biosver, ptr + 0x41, 31);

        qemu_put_ram_ptr(ptr);

        memcpy(info.image_component[1].name, "BIOS", 4);

        memcpy(info.image_component[1].version, biosver,

               strlen((const char *)biosver));

include/exec/cpu-common.h

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

/* This should only be used for ram local to a device.  */

void *qemu_get_ram_ptr(ram_addr_t addr);

void qemu_put_ram_ptr(void *addr);

/* 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);

trace-events

+0 −3
Original line number Diff line number Diff line
@@ -813,9 +813,6 @@ xen_map_cache_return(void* ptr) "%p" 
xen_map_block(uint64_t phys_addr, uint64_t size) "%#"PRIx64", size %#"PRIx64

xen_unmap_block(void* addr, unsigned long size) "%p, size %#lx"



# exec.c

qemu_put_ram_ptr(void* addr) "%p"



# hw/xen_platform.c

xen_platform_log(char *s) "xen platform: %s"