| Message ID | 20221217152454.96388-2-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/s390x: Header cleanups around "cpu.h" | expand |
On Sat, 2022-12-17 at 16:24 +0100, Philippe Mathieu-Daudé wrote: > Instead of having hardware device poking into memory > internal API, expose memory_region_access_valid(). > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> That's the only memory_region_ function s390 calls that isn't already in memory.h, so makes sense to me. Reviewed-by: Eric Farman <farman@linux.ibm.com> > --- > hw/s390x/s390-pci-inst.c | 2 +- > include/exec/memory-internal.h | 4 ---- > include/exec/memory.h | 4 ++++ > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c > index 66e764f901..35db7777e4 100644 > --- a/hw/s390x/s390-pci-inst.c > +++ b/hw/s390x/s390-pci-inst.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "exec/memop.h" > -#include "exec/memory-internal.h" > +#include "exec/memory.h" > #include "qemu/error-report.h" > #include "sysemu/hw_accel.h" > #include "hw/s390x/s390-pci-inst.h" > diff --git a/include/exec/memory-internal.h b/include/exec/memory- > internal.h > index 9fcc2af25c..100c1237ac 100644 > --- a/include/exec/memory-internal.h > +++ b/include/exec/memory-internal.h > @@ -38,10 +38,6 @@ void flatview_unref(FlatView *view); > > extern const MemoryRegionOps unassigned_mem_ops; > > -bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, > - unsigned size, bool is_write, > - MemTxAttrs attrs); > - > void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection > *section); > AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv); > void address_space_dispatch_compact(AddressSpaceDispatch *d); > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 91f8a2395a..c37ffdbcd1 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -2442,6 +2442,10 @@ void memory_global_dirty_log_stop(unsigned int > flags); > > void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool > disabled); > > +bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, > + unsigned size, bool is_write, > + MemTxAttrs attrs); > + > /** > * memory_region_dispatch_read: perform a read directly to the > specified > * MemoryRegion.
On 17/12/2022 16.24, Philippe Mathieu-Daudé wrote: > Instead of having hardware device poking into memory > internal API, expose memory_region_access_valid(). > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/s390x/s390-pci-inst.c | 2 +- > include/exec/memory-internal.h | 4 ---- > include/exec/memory.h | 4 ++++ > 3 files changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 66e764f901..35db7777e4 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "exec/memop.h" -#include "exec/memory-internal.h" +#include "exec/memory.h" #include "qemu/error-report.h" #include "sysemu/hw_accel.h" #include "hw/s390x/s390-pci-inst.h" diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 9fcc2af25c..100c1237ac 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -38,10 +38,6 @@ void flatview_unref(FlatView *view); extern const MemoryRegionOps unassigned_mem_ops; -bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, - unsigned size, bool is_write, - MemTxAttrs attrs); - void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section); AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv); void address_space_dispatch_compact(AddressSpaceDispatch *d); diff --git a/include/exec/memory.h b/include/exec/memory.h index 91f8a2395a..c37ffdbcd1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2442,6 +2442,10 @@ void memory_global_dirty_log_stop(unsigned int flags); void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled); +bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, + unsigned size, bool is_write, + MemTxAttrs attrs); + /** * memory_region_dispatch_read: perform a read directly to the specified * MemoryRegion.