Commit 79122e93 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qemu-kvm/memory/core' into staging 

* qemu-kvm/memory/core:
  memory: get rid of cpu_register_io_memory()
  memory: dispatch directly via MemoryRegion
  exec: fix code tlb entry misused as iotlb in get_page_addr_code()
  memory: store section indices in iotlb instead of io indices
  memory: make phys_page_find() return an unadjusted section
parents cbedde09 97161e17

cpu-all.h

+0 −8
Original line number Diff line number Diff line
@@ -498,14 +498,6 @@ extern RAMList ram_list; 
extern const char *mem_path;

extern int mem_prealloc;



/* physical memory access */



/* MMIO pages are identified by a combination of an IO device index and

   3 flags.  The ROMD code stores the page ram offset in iotlb entry, 

   so only a limited number of ids are avaiable.  */



#define IO_MEM_NB_ENTRIES  (1 << TARGET_PAGE_BITS)



/* Flags stored in the low bits of the TLB virtual address.  These are

   defined so that fast path ram access is all zeros.  */

/* Zero if TLB entry is valid.  */

exec-all.h

+5 −4
Original line number Diff line number Diff line
@@ -299,10 +299,11 @@ extern void *tci_tb_ptr; 


#if !defined(CONFIG_USER_ONLY)



uint64_t io_mem_read(int index, target_phys_addr_t addr, unsigned size);

void io_mem_write(int index, target_phys_addr_t addr, uint64_t value,

struct MemoryRegion *iotlb_to_region(target_phys_addr_t index);

uint64_t io_mem_read(struct MemoryRegion *mr, target_phys_addr_t addr,

                     unsigned size);

extern struct MemoryRegion *io_mem_region[IO_MEM_NB_ENTRIES];

void io_mem_write(struct MemoryRegion *mr, target_phys_addr_t addr,

                  uint64_t value, unsigned size);



void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,

              void *retaddr);

exec-obsolete.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ void qemu_ram_free(ram_addr_t addr); 
void qemu_ram_free_from_ptr(ram_addr_t addr);



struct MemoryRegion;

int cpu_register_io_memory(MemoryRegion *mr);

void cpu_unregister_io_memory(int table_address);



struct MemoryRegionSection;

void cpu_register_physical_memory_log(struct MemoryRegionSection *section,

                                      bool readonly);

exec.c

+138 −224

File changed.

Preview size limit exceeded, changes collapsed.

memory.c

+5 −8
Original line number Diff line number Diff line
@@ -781,13 +781,11 @@ static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr) 


static void memory_region_destructor_iomem(MemoryRegion *mr)

{

    cpu_unregister_io_memory(mr->ram_addr);

}



static void memory_region_destructor_rom_device(MemoryRegion *mr)

{

    qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK);

    cpu_unregister_io_memory(mr->ram_addr & ~TARGET_PAGE_MASK);

}



static bool memory_region_wrong_endianness(MemoryRegion *mr)
@@ -942,7 +940,7 @@ void memory_region_init_io(MemoryRegion *mr, 
    mr->opaque = opaque;

    mr->terminates = true;

    mr->destructor = memory_region_destructor_iomem;

    mr->ram_addr = cpu_register_io_memory(mr);

    mr->ram_addr = ~(ram_addr_t)0;

}



void memory_region_init_ram(MemoryRegion *mr,
@@ -992,7 +990,6 @@ void memory_region_init_rom_device(MemoryRegion *mr, 
    mr->rom_device = true;

    mr->destructor = memory_region_destructor_rom_device;

    mr->ram_addr = qemu_ram_alloc(size, mr);

    mr->ram_addr |= cpu_register_io_memory(mr);

}



static uint64_t invalid_read(void *opaque, target_phys_addr_t addr,
@@ -1501,15 +1498,15 @@ void set_system_io_map(MemoryRegion *mr) 
    memory_region_update_topology(NULL);

}



uint64_t io_mem_read(int io_index, target_phys_addr_t addr, unsigned size)

uint64_t io_mem_read(MemoryRegion *mr, target_phys_addr_t addr, unsigned size)

{

    return memory_region_dispatch_read(io_mem_region[io_index], addr, size);

    return memory_region_dispatch_read(mr, addr, size);

}



void io_mem_write(int io_index, target_phys_addr_t addr,

void io_mem_write(MemoryRegion *mr, target_phys_addr_t addr,

                  uint64_t val, unsigned size)

{

    memory_region_dispatch_write(io_mem_region[io_index], addr, val, size);

    memory_region_dispatch_write(mr, addr, val, size);

}



typedef struct MemoryRegionList MemoryRegionList;