| Message ID | 1425922215-20819-6-git-send-email-thuth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 09/03/2015 18:30, Thomas Huth wrote: > The functions portio_list_destroy() and portio_list_del() > are not used anywhere, so let's remove them. > > Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> I think it's better to provide a complete API, mimicking memory_region_* as much as possible, so I'd rather keep these. Paolo > --- > include/exec/ioport.h | 2 -- > ioport.c | 24 ------------------------ > 2 files changed, 0 insertions(+), 26 deletions(-) > > diff --git a/include/exec/ioport.h b/include/exec/ioport.h > index 3bd6722..218c835 100644 > --- a/include/exec/ioport.h > +++ b/include/exec/ioport.h > @@ -71,10 +71,8 @@ void portio_list_init(PortioList *piolist, Object *owner, > const struct MemoryRegionPortio *callbacks, > void *opaque, const char *name); > void portio_list_set_flush_coalesced(PortioList *piolist); > -void portio_list_destroy(PortioList *piolist); > void portio_list_add(PortioList *piolist, > struct MemoryRegion *address_space, > uint32_t addr); > -void portio_list_del(PortioList *piolist); > > #endif /* IOPORT_H */ > diff --git a/ioport.c b/ioport.c > index 783a3ae..712b9e2 100644 > --- a/ioport.c > +++ b/ioport.c > @@ -147,19 +147,6 @@ void portio_list_set_flush_coalesced(PortioList *piolist) > piolist->flush_coalesced_mmio = true; > } > > -void portio_list_destroy(PortioList *piolist) > -{ > - MemoryRegionPortioList *mrpio; > - unsigned i; > - > - for (i = 0; i < piolist->nr; ++i) { > - mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); > - object_unparent(OBJECT(&mrpio->mr)); > - g_free(mrpio); > - } > - g_free(piolist->regions); > -} > - > static const MemoryRegionPortio *find_portio(MemoryRegionPortioList *mrpio, > uint64_t offset, unsigned size, > bool write) > @@ -290,14 +277,3 @@ void portio_list_add(PortioList *piolist, > /* There will always be an open sub-list. */ > portio_list_add_1(piolist, pio_start, count, start, off_low, off_high); > } > - > -void portio_list_del(PortioList *piolist) > -{ > - MemoryRegionPortioList *mrpio; > - unsigned i; > - > - for (i = 0; i < piolist->nr; ++i) { > - mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); > - memory_region_del_subregion(piolist->address_space, &mrpio->mr); > - } > -} >
On Mon, 09 Mar 2015 20:23:24 +0100 Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 09/03/2015 18:30, Thomas Huth wrote: > > The functions portio_list_destroy() and portio_list_del() > > are not used anywhere, so let's remove them. > > > > Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> > > Cc: Paolo Bonzini <pbonzini@redhat.com> > > I think it's better to provide a complete API, mimicking memory_region_* > as much as possible, so I'd rather keep these. Ok, then let's keep then and drop this patch. Thomas
diff --git a/include/exec/ioport.h b/include/exec/ioport.h index 3bd6722..218c835 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -71,10 +71,8 @@ void portio_list_init(PortioList *piolist, Object *owner, const struct MemoryRegionPortio *callbacks, void *opaque, const char *name); void portio_list_set_flush_coalesced(PortioList *piolist); -void portio_list_destroy(PortioList *piolist); void portio_list_add(PortioList *piolist, struct MemoryRegion *address_space, uint32_t addr); -void portio_list_del(PortioList *piolist); #endif /* IOPORT_H */ diff --git a/ioport.c b/ioport.c index 783a3ae..712b9e2 100644 --- a/ioport.c +++ b/ioport.c @@ -147,19 +147,6 @@ void portio_list_set_flush_coalesced(PortioList *piolist) piolist->flush_coalesced_mmio = true; } -void portio_list_destroy(PortioList *piolist) -{ - MemoryRegionPortioList *mrpio; - unsigned i; - - for (i = 0; i < piolist->nr; ++i) { - mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); - object_unparent(OBJECT(&mrpio->mr)); - g_free(mrpio); - } - g_free(piolist->regions); -} - static const MemoryRegionPortio *find_portio(MemoryRegionPortioList *mrpio, uint64_t offset, unsigned size, bool write) @@ -290,14 +277,3 @@ void portio_list_add(PortioList *piolist, /* There will always be an open sub-list. */ portio_list_add_1(piolist, pio_start, count, start, off_low, off_high); } - -void portio_list_del(PortioList *piolist) -{ - MemoryRegionPortioList *mrpio; - unsigned i; - - for (i = 0; i < piolist->nr; ++i) { - mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); - memory_region_del_subregion(piolist->address_space, &mrpio->mr); - } -}
The functions portio_list_destroy() and portio_list_del() are not used anywhere, so let's remove them. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> --- include/exec/ioport.h | 2 -- ioport.c | 24 ------------------------ 2 files changed, 0 insertions(+), 26 deletions(-)