On 3/9/25 12:09 AM, Philippe Mathieu-Daudé wrote:
> Both qemu_minrampagesize() and qemu_maxrampagesize() are
> related to host memory backends, having the following call
> stack:
>
> qemu_minrampagesize()
> -> find_min_backend_pagesize()
> -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)
>
> qemu_maxrampagesize()
> -> find_max_backend_pagesize()
> -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)
>
> Having TYPE_MEMORY_BACKEND defined in "system/hostmem.h":
>
> include/system/hostmem.h:23:#define TYPE_MEMORY_BACKEND "memory-backend"
>
> Move their prototype declaration to "system/hostmem.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric
> ---
> include/exec/ram_addr.h | 3 ---
> include/system/hostmem.h | 3 +++
> hw/ppc/spapr_caps.c | 1 +
> hw/s390x/s390-virtio-ccw.c | 1 +
> hw/vfio/spapr.c | 1 +
> 5 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
> index 94bb3ccbe42..ccc8df561af 100644
> --- a/include/exec/ram_addr.h
> +++ b/include/exec/ram_addr.h
> @@ -101,9 +101,6 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr,
>
> bool ramblock_is_pmem(RAMBlock *rb);
>
> -long qemu_minrampagesize(void);
> -long qemu_maxrampagesize(void);
> -
> /**
> * qemu_ram_alloc_from_file,
> * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing
> diff --git a/include/system/hostmem.h b/include/system/hostmem.h
> index 5c21ca55c01..62642e602ca 100644
> --- a/include/system/hostmem.h
> +++ b/include/system/hostmem.h
> @@ -93,4 +93,7 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend);
> size_t host_memory_backend_pagesize(HostMemoryBackend *memdev);
> char *host_memory_backend_get_name(HostMemoryBackend *backend);
>
> +long qemu_minrampagesize(void);
> +long qemu_maxrampagesize(void);
> +
> #endif
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index 904bff87ce1..9e53d0c1fd1 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -34,6 +34,7 @@
> #include "kvm_ppc.h"
> #include "migration/vmstate.h"
> #include "system/tcg.h"
> +#include "system/hostmem.h"
>
> #include "hw/ppc/spapr.h"
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 51ae0c133d8..1261d93b7ce 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -41,6 +41,7 @@
> #include "hw/s390x/tod.h"
> #include "system/system.h"
> #include "system/cpus.h"
> +#include "system/hostmem.h"
> #include "target/s390x/kvm/pv.h"
> #include "migration/blocker.h"
> #include "qapi/visitor.h"
> diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
> index 9b5ad05bb1c..1a5d1611f2c 100644
> --- a/hw/vfio/spapr.c
> +++ b/hw/vfio/spapr.c
> @@ -12,6 +12,7 @@
> #include <sys/ioctl.h>
> #include <linux/vfio.h>
> #include "system/kvm.h"
> +#include "system/hostmem.h"
> #include "exec/address-spaces.h"
>
> #include "hw/vfio/vfio-common.h"