On Wed, Oct 3, 2012 at 4:04 PM, Avi Kivity <a...@redhat.com> wrote:
> Using the AddressSpace type reduces confusion, as you can't accidentally
> supply the MemoryRegion you're interested in.
>
> Signed-off-by: Avi Kivity <a...@redhat.com>
> ---
> exec-memory.h | 3 +++
> exec.c | 10 +++++-----
> hw/vfio_pci.c | 3 +--
> hw/vhost.c | 2 +-
> hw/xen_pt.c | 4 ++--
> kvm-all.c | 4 ++--
> memory.c | 14 +++++++-------
> memory.h | 6 +++---
> xen-all.c | 2 +-
> 9 files changed, 25 insertions(+), 23 deletions(-)
>
> diff --git a/exec-memory.h b/exec-memory.h
> index 6707e40..ac1d07d 100644
> --- a/exec-memory.h
> +++ b/exec-memory.h
> @@ -33,6 +33,9 @@ MemoryRegion *get_system_memory(void);
> */
> MemoryRegion *get_system_io(void);
>
> +extern AddressSpace address_space_memory;
> +extern AddressSpace address_space_io;
> +
> #endif
>
> #endif
> diff --git a/exec.c b/exec.c
> index 3c46298..7a76efa 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -116,8 +116,8 @@
> static MemoryRegion *system_memory;
> static MemoryRegion *system_io;
>
> -static AddressSpace address_space_io;
> -static AddressSpace address_space_memory;
> +AddressSpace address_space_io;
> +AddressSpace address_space_memory;
>
> MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty;
> static MemoryRegion io_mem_subpage_ram;
> @@ -3260,9 +3260,9 @@ static void memory_map_init(void)
> 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);
> - memory_listener_register(&tcg_memory_listener, system_memory);
> + memory_listener_register(&core_memory_listener, &address_space_memory);
> + memory_listener_register(&io_memory_listener, &address_space_io);
> + memory_listener_register(&tcg_memory_listener, &address_space_memory);
> }
>
> MemoryRegion *get_system_memory(void)
> diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
> index 8e49535..dc6c776 100644
> --- a/hw/vfio_pci.c
> +++ b/hw/vfio_pci.c
> @@ -1406,8 +1406,7 @@ static int vfio_connect_container(VFIOGroup *group)
> container->iommu_data.listener = vfio_memory_listener;
> container->iommu_data.release = vfio_listener_release;
>
> - memory_listener_register(&container->iommu_data.listener,
> - get_system_memory());
> + memory_listener_register(&container->iommu_data.listener,
> &address_space_memory);
> } else {
> error_report("vfio: No available IOMMU models\n");
> g_free(container);
> diff --git a/hw/vhost.c b/hw/vhost.c
> index 100f765..0b4ac3f 100644
> --- a/hw/vhost.c
> +++ b/hw/vhost.c
> @@ -792,7 +792,7 @@ int vhost_dev_init(struct vhost_dev *hdev, int devfd,
> const char *devpath,
> hdev->log_size = 0;
> hdev->log_enabled = false;
> hdev->started = false;
> - memory_listener_register(&hdev->memory_listener, get_system_memory());
> + memory_listener_register(&hdev->memory_listener, &address_space_memory);
> hdev->force = force;
> return 0;
> fail:
> diff --git a/hw/xen_pt.c b/hw/xen_pt.c
> index 4dcf46a..5a527eb 100644
> --- a/hw/xen_pt.c
> +++ b/hw/xen_pt.c
> @@ -748,8 +748,8 @@ static int xen_pt_initfn(PCIDevice *d)
> }
>
> out:
> - memory_listener_register(&s->memory_listener, get_system_memory());
> - memory_listener_register(&s->io_listener, get_system_io());
> + memory_listener_register(&s->memory_listener, &address_space_memory);
> + memory_listener_register(&s->io_listener, &address_space_io);
> XEN_PT_LOG(d, "Real physical device %02x:%02x.%d registered
> successfuly!\n",
> bus, slot, func);
>
> diff --git a/kvm-all.c b/kvm-all.c
> index 25ca202..5859d37 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1377,8 +1377,8 @@ int kvm_init(void)
> }
>
> kvm_state = s;
> - memory_listener_register(&kvm_memory_listener, get_system_memory());
> - memory_listener_register(&kvm_io_listener, get_system_io());
> + memory_listener_register(&kvm_memory_listener, &address_space_memory);
> + memory_listener_register(&kvm_io_listener, &address_space_io);
>
> s->many_ioeventfds = kvm_check_many_ioeventfds();
>
> diff --git a/memory.c b/memory.c
> index 7bc5a32..f829d84 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -141,7 +141,7 @@ static bool memory_listener_match(MemoryListener
> *listener,
> #define MEMORY_LISTENER_UPDATE_REGION(fr, as, dir, callback) \
> MEMORY_LISTENER_CALL(callback, dir, (&(MemoryRegionSection) { \
> .mr = (fr)->mr, \
> - .address_space = (as)->root, \
> + .address_space = (as), \
Maybe remove parenthesis.
> .offset_within_region = (fr)->offset_in_region, \
> .size = int128_get64((fr)->addr.size), \
> .offset_within_address_space = int128_get64((fr)->addr.start), \
> @@ -587,7 +587,7 @@ static void address_space_add_del_ioeventfds(AddressSpace
> *as,
> fds_new[inew]))) {
> fd = &fds_old[iold];
> section = (MemoryRegionSection) {
> - .address_space = as->root,
> + .address_space = as,
> .offset_within_address_space = int128_get64(fd->addr.start),
> .size = int128_get64(fd->addr.size),
> };
> @@ -600,7 +600,7 @@ static void address_space_add_del_ioeventfds(AddressSpace
> *as,
> fds_old[iold]))) {
> fd = &fds_new[inew];
> section = (MemoryRegionSection) {
> - .address_space = as->root,
> + .address_space = as,
> .offset_within_address_space = int128_get64(fd->addr.start),
> .size = int128_get64(fd->addr.size),
> };
> @@ -1131,7 +1131,7 @@ static void
> memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa
> FOR_EACH_FLAT_RANGE(fr, as->current_map) {
> if (fr->mr == mr) {
> section = (MemoryRegionSection) {
> - .address_space = as->root,
> + .address_space = as,
> .offset_within_address_space = int128_get64(fr->addr.start),
> .size = int128_get64(fr->addr.size),
> };
> @@ -1470,7 +1470,7 @@ static void listener_add_address_space(MemoryListener
> *listener,
> FlatRange *fr;
>
> if (listener->address_space_filter
> - && listener->address_space_filter != as->root) {
> + && listener->address_space_filter != as) {
> return;
> }
>
> @@ -1480,7 +1480,7 @@ static void listener_add_address_space(MemoryListener
> *listener,
> FOR_EACH_FLAT_RANGE(fr, as->current_map) {
> MemoryRegionSection section = {
> .mr = fr->mr,
> - .address_space = as->root,
> + .address_space = as,
> .offset_within_region = fr->offset_in_region,
> .size = int128_get64(fr->addr.size),
> .offset_within_address_space = int128_get64(fr->addr.start),
> @@ -1490,7 +1490,7 @@ static void listener_add_address_space(MemoryListener
> *listener,
> }
> }
>
> -void memory_listener_register(MemoryListener *listener, MemoryRegion *filter)
> +void memory_listener_register(MemoryListener *listener, AddressSpace *filter)
> {
> MemoryListener *other = NULL;
> AddressSpace *as;
> diff --git a/memory.h b/memory.h
> index 5f50bce..6115f48 100644
> --- a/memory.h
> +++ b/memory.h
> @@ -187,7 +187,7 @@ typedef struct MemoryRegionSection MemoryRegionSection;
> */
> struct MemoryRegionSection {
> MemoryRegion *mr;
> - MemoryRegion *address_space;
> + AddressSpace *address_space;
> target_phys_addr_t offset_within_region;
> uint64_t size;
> target_phys_addr_t offset_within_address_space;
> @@ -223,7 +223,7 @@ struct MemoryListener {
> target_phys_addr_t addr, target_phys_addr_t
> len);
> /* Lower = earlier (during add), later (during del) */
> unsigned priority;
> - MemoryRegion *address_space_filter;
> + AddressSpace *address_space_filter;
> QTAILQ_ENTRY(MemoryListener) link;
> };
>
> @@ -801,7 +801,7 @@ void memory_region_transaction_commit(void);
> * @listener: an object containing the callbacks to be called
> * @filter: if non-%NULL, only regions in this address space will be observed
> */
> -void memory_listener_register(MemoryListener *listener, MemoryRegion
> *filter);
> +void memory_listener_register(MemoryListener *listener, AddressSpace
> *filter);
>
> /**
> * memory_listener_unregister: undo the effect of memory_listener_register()
> diff --git a/xen-all.c b/xen-all.c
> index 823e043..85f799b 100644
> --- a/xen-all.c
> +++ b/xen-all.c
> @@ -1117,7 +1117,7 @@ int xen_hvm_init(void)
>
> state->memory_listener = xen_memory_listener;
> QLIST_INIT(&state->physmap);
> - memory_listener_register(&state->memory_listener, get_system_memory());
> + memory_listener_register(&state->memory_listener, &address_space_memory);
> state->log_for_dirtybit = NULL;
>
> /* Initialize backend core & drivers */
> --
> 1.7.12
>
