From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv9Rh-00014b-1Y for qemu-devel@nongnu.org; Wed, 08 Feb 2012 10:28:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rv9RV-00007T-IV for qemu-devel@nongnu.org; Wed, 08 Feb 2012 10:28:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv9RV-00006s-8G for qemu-devel@nongnu.org; Wed, 08 Feb 2012 10:28:21 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q18FSKsY019736 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 8 Feb 2012 10:28:20 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q18FSH6n025146 for ; Wed, 8 Feb 2012 10:28:19 -0500 From: Avi Kivity Date: Wed, 8 Feb 2012 17:27:59 +0200 Message-Id: <1328714879-18906-11-git-send-email-avi@redhat.com> In-Reply-To: <1328714879-18906-1-git-send-email-avi@redhat.com> References: <1328714879-18906-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] memory: drop AddressSpaceOps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org All functionality has been moved to various MemoryListeners. Signed-off-by: Avi Kivity --- memory.c | 56 ++------------------------------------------------------ 1 files changed, 2 insertions(+), 54 deletions(-) diff --git a/memory.c b/memory.c index 4e7a90b..4f854d4 100644 --- a/memory.c +++ b/memory.c @@ -191,20 +191,12 @@ struct FlatView { /* A system address space - I/O, memory, etc. */ struct AddressSpace { - const AddressSpaceOps *ops; MemoryRegion *root; FlatView current_map; int ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; }; -struct AddressSpaceOps { - void (*range_add)(AddressSpace *as, FlatRange *fr); - void (*range_del)(AddressSpace *as, FlatRange *fr); - void (*log_start)(AddressSpace *as, FlatRange *fr); - void (*log_stop)(AddressSpace *as, FlatRange *fr); -}; - #define FOR_EACH_FLAT_RANGE(var, view) \ for (var = (view)->ranges; var < (view)->ranges + (view)->nr; ++var) @@ -336,32 +328,7 @@ static void access_with_adjusted_size(target_phys_addr_t addr, } } -static void as_memory_range_add(AddressSpace *as, FlatRange *fr) -{ -} - -static void as_memory_range_del(AddressSpace *as, FlatRange *fr) -{ -} - -static void as_memory_log_start(AddressSpace *as, FlatRange *fr) -{ -} - -static void as_memory_log_stop(AddressSpace *as, FlatRange *fr) -{ -} - -static const AddressSpaceOps address_space_ops_memory = { - .range_add = as_memory_range_add, - .range_del = as_memory_range_del, - .log_start = as_memory_log_start, - .log_stop = as_memory_log_stop, -}; - -static AddressSpace address_space_memory = { - .ops = &address_space_ops_memory, -}; +static AddressSpace address_space_memory; static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset, unsigned width, bool write) @@ -437,22 +404,7 @@ static void memory_region_iorange_write(IORange *iorange, .write = memory_region_iorange_write, }; -static void as_io_range_add(AddressSpace *as, FlatRange *fr) -{ -} - -static void as_io_range_del(AddressSpace *as, FlatRange *fr) -{ -} - -static const AddressSpaceOps address_space_ops_io = { - .range_add = as_io_range_add, - .range_del = as_io_range_del, -}; - -static AddressSpace address_space_io = { - .ops = &address_space_ops_io, -}; +static AddressSpace address_space_io; static AddressSpace *memory_region_to_address_space(MemoryRegion *mr) { @@ -685,7 +637,6 @@ static void address_space_update_topology_pass(AddressSpace *as, if (!adding) { MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del); - as->ops->range_del(as, frold); } ++iold; @@ -695,9 +646,7 @@ static void address_space_update_topology_pass(AddressSpace *as, if (adding) { if (frold->dirty_log_mask && !frnew->dirty_log_mask) { MEMORY_LISTENER_UPDATE_REGION(frnew, as, Reverse, log_stop); - as->ops->log_stop(as, frnew); } else if (frnew->dirty_log_mask && !frold->dirty_log_mask) { - as->ops->log_start(as, frnew); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start); } } @@ -708,7 +657,6 @@ static void address_space_update_topology_pass(AddressSpace *as, /* In new */ if (adding) { - as->ops->range_add(as, frnew); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add); } -- 1.7.9