exec: Build up 'cputlb.h' and 'ram_addr.h' headers

[PATCH 23/24] exec/memory: Move qemu_map_ram_ptr() declaration to 'exec/ram_addr.h'

Posted by Philippe Mathieu-Daudé 1 week, 2 days ago

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/exec/memory.h   | 2 +-
 include/exec/ram_addr.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 9458e2801d..58faa3eb08 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -28,6 +28,7 @@
 #include "qemu/notify.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
+#include "exec/ram_addr.h"
 
 #define RAM_ADDR_INVALID (~(ram_addr_t)0)
 
@@ -2973,7 +2974,6 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
                                    MemTxAttrs attrs, void *buf,
                                    hwaddr len, hwaddr addr1, hwaddr l,
                                    MemoryRegion *mr);
-void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
 
 /* Internal functions, part of the implementation of address_space_read_cached
  * and address_space_write_cached.  */
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index e0620ddb03..c4f220ae93 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -73,6 +73,7 @@ void qemu_ram_set_migratable(RAMBlock *rb);
 void qemu_ram_unset_migratable(RAMBlock *rb);
 bool qemu_ram_is_named_file(RAMBlock *rb);
 int qemu_ram_get_fd(RAMBlock *rb);
+void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
 
 size_t qemu_ram_pagesize(RAMBlock *block);
 size_t qemu_ram_pagesize_largest(void);
-- 
2.45.2

Re: [PATCH 23/24] exec/memory: Move qemu_map_ram_ptr() declaration to 'exec/ram_addr.h'

Posted by Richard Henderson 1 week, 1 day ago

On 11/13/24 17:13, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/exec/memory.h   | 2 +-
>   include/exec/ram_addr.h | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

> 
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 9458e2801d..58faa3eb08 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -28,6 +28,7 @@
>   #include "qemu/notify.h"
>   #include "qom/object.h"
>   #include "qemu/rcu.h"
> +#include "exec/ram_addr.h"
>   
>   #define RAM_ADDR_INVALID (~(ram_addr_t)0)
>   
> @@ -2973,7 +2974,6 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
>                                      MemTxAttrs attrs, void *buf,
>                                      hwaddr len, hwaddr addr1, hwaddr l,
>                                      MemoryRegion *mr);
> -void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
>   
>   /* Internal functions, part of the implementation of address_space_read_cached
>    * and address_space_write_cached.  */
> diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
> index e0620ddb03..c4f220ae93 100644
> --- a/include/exec/ram_addr.h
> +++ b/include/exec/ram_addr.h
> @@ -73,6 +73,7 @@ void qemu_ram_set_migratable(RAMBlock *rb);
>   void qemu_ram_unset_migratable(RAMBlock *rb);
>   bool qemu_ram_is_named_file(RAMBlock *rb);
>   int qemu_ram_get_fd(RAMBlock *rb);
> +void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
>   
>   size_t qemu_ram_pagesize(RAMBlock *block);
>   size_t qemu_ram_pagesize_largest(void);

Re: [PATCH 23/24] exec/memory: Move qemu_map_ram_ptr() declaration to 'exec/ram_addr.h'

Posted by Pierrick Bouvier 1 week, 2 days ago

On 11/13/24 17:13, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/exec/memory.h   | 2 +-
>   include/exec/ram_addr.h | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 9458e2801d..58faa3eb08 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -28,6 +28,7 @@
>   #include "qemu/notify.h"
>   #include "qom/object.h"
>   #include "qemu/rcu.h"
> +#include "exec/ram_addr.h"
>   
>   #define RAM_ADDR_INVALID (~(ram_addr_t)0)
>   
> @@ -2973,7 +2974,6 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
>                                      MemTxAttrs attrs, void *buf,
>                                      hwaddr len, hwaddr addr1, hwaddr l,
>                                      MemoryRegion *mr);
> -void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
>   
>   /* Internal functions, part of the implementation of address_space_read_cached
>    * and address_space_write_cached.  */
> diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
> index e0620ddb03..c4f220ae93 100644
> --- a/include/exec/ram_addr.h
> +++ b/include/exec/ram_addr.h
> @@ -73,6 +73,7 @@ void qemu_ram_set_migratable(RAMBlock *rb);
>   void qemu_ram_unset_migratable(RAMBlock *rb);
>   bool qemu_ram_is_named_file(RAMBlock *rb);
>   int qemu_ram_get_fd(RAMBlock *rb);
> +void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);
>   
>   size_t qemu_ram_pagesize(RAMBlock *block);
>   size_t qemu_ram_pagesize_largest(void);

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>