[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC v1 15/22] memory: move address_space_memory and ad
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [RFC v1 15/22] memory: move address_space_memory and address_space_io out of memory core |
Date: |
Thu, 04 Oct 2012 09:08:41 -0500 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
Avi Kivity <address@hidden> writes:
> With this change, memory.c no longer knows anything about special address
> spaces, so it is prepared for AddressSpace based DMA.
>
> Signed-off-by: Avi Kivity <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Regards,
Anthony Liguori
> ---
> exec-memory.h | 6 ------
> exec.c | 9 +++++++--
> memory.c | 16 ----------------
> 3 files changed, 7 insertions(+), 24 deletions(-)
>
> diff --git a/exec-memory.h b/exec-memory.h
> index 1cd92ee..6707e40 100644
> --- a/exec-memory.h
> +++ b/exec-memory.h
> @@ -33,12 +33,6 @@ MemoryRegion *get_system_memory(void);
> */
> MemoryRegion *get_system_io(void);
>
> -/* Set the root memory region. This region is the system memory map. */
> -void set_system_memory_map(MemoryRegion *mr);
> -
> -/* Set the I/O memory region. This region is the I/O memory map. */
> -void set_system_io_map(MemoryRegion *mr);
> -
> #endif
>
> #endif
> diff --git a/exec.c b/exec.c
> index 51a32e7..e5f26fb 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -116,6 +116,9 @@
> static MemoryRegion *system_memory;
> static MemoryRegion *system_io;
>
> +static AddressSpace address_space_io;
> +static AddressSpace address_space_memory;
> +
> MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty;
> static MemoryRegion io_mem_subpage_ram;
>
> @@ -3245,11 +3248,13 @@ static void memory_map_init(void)
> {
> system_memory = g_malloc(sizeof(*system_memory));
> memory_region_init(system_memory, "system", INT64_MAX);
> - set_system_memory_map(system_memory);
> + address_space_init(&address_space_memory, system_memory);
> + address_space_memory.name = "memory";
>
> system_io = g_malloc(sizeof(*system_io));
> memory_region_init(system_io, "io", 65536);
> - set_system_io_map(system_io);
> + address_space_init(&address_space_io, system_io);
> + address_space_io.name = "I/O";
>
> memory_listener_register(&core_memory_listener, system_memory);
> memory_listener_register(&io_memory_listener, system_io);
> diff --git a/memory.c b/memory.c
> index eb75349..7bc5a32 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -358,8 +358,6 @@ static void access_with_adjusted_size(target_phys_addr_t
> addr,
> }
> }
>
> -static AddressSpace address_space_memory;
> -
> static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t
> offset,
> unsigned width, bool write)
> {
> @@ -448,8 +446,6 @@ static void memory_region_iorange_destructor(IORange
> *iorange)
> .destructor = memory_region_iorange_destructor,
> };
>
> -static AddressSpace address_space_io;
> -
> static AddressSpace *memory_region_to_address_space(MemoryRegion *mr)
> {
> AddressSpace *as;
> @@ -1556,18 +1552,6 @@ void address_space_init(AddressSpace *as, MemoryRegion
> *root)
> memory_region_transaction_commit();
> }
>
> -void set_system_memory_map(MemoryRegion *mr)
> -{
> - address_space_init(&address_space_memory, mr);
> - address_space_memory.name = "memory";
> -}
> -
> -void set_system_io_map(MemoryRegion *mr)
> -{
> - address_space_init(&address_space_io, mr);
> - address_space_io.name = "I/O";
> -}
> -
> uint64_t io_mem_read(MemoryRegion *mr, target_phys_addr_t addr, unsigned
> size)
> {
> return memory_region_dispatch_read(mr, addr, size);
> --
> 1.7.12
- Re: [Qemu-devel] [RFC v1 08/22] memory: provide defaults for MemoryListener operations, (continued)
[Qemu-devel] [RFC v1 13/22] xen: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 10/22] vfio: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 11/22] xen_pt: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 12/22] kvm: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 15/22] memory: move address_space_memory and address_space_io out of memory core, Avi Kivity, 2012/10/03
- Re: [Qemu-devel] [RFC v1 15/22] memory: move address_space_memory and address_space_io out of memory core,
Anthony Liguori <=
[Qemu-devel] [RFC v1 14/22] memory: manage coalesced mmio via a MemoryListener, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 16/22] memory: move tcg flush into a tcg memory listener, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 21/22] pci: give each device its own address space, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 22/22] pci: honor PCI_COMMAND_MASTER, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 20/22] dma: make dma access its own address space, Avi Kivity, 2012/10/03
[Qemu-devel] [RFC v1 19/22] memory: per-AddressSpace dispatch, Avi Kivity, 2012/10/03