On Mon, May 27, 2024 at 6:25 PM Philippe Mathieu-Daudé <phi...@linaro.org>
wrote:
> Hi Edgar,
>
> On 24/5/24 12:51, Edgar E. Iglesias wrote:
> > From: "Edgar E. Iglesias" <edgar.igles...@amd.com>
> >
> > Add xen_mr_is_memory() to abstract away tests for the
> > xen_memory MR.
> >
> > No functional changes.
> >
> > Signed-off-by: Edgar E. Iglesias <edgar.igles...@amd.com>
> > Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> > Acked-by: David Hildenbrand <da...@redhat.com>
> > ---
> > hw/xen/xen-hvm-common.c | 10 ++++++++--
> > include/sysemu/xen.h | 8 ++++++++
> > 2 files changed, 16 insertions(+), 2 deletions(-)
>
> To consolidate we could add:
>
> static MemoryRegion xen_memory;
>
> MemoryRegion *xen_mr_memory_init(uint64_t block_len)
> {
> assert(!xen_memory.size);
> memory_region_init_ram(&xen_memory, NULL, "xen.ram", block_len,
> &error_fatal);
> return &xen_memory;
> }
>
> and remove the extern declaration.
>
Thanks,
We have a future patch series in the workings that will add a PVH machine
for x86, I'll keep this in mind for then!
>
> > diff --git a/include/sysemu/xen.h b/include/sysemu/xen.h
> > index 754ec2e6cb..dc72f83bcb 100644
> > --- a/include/sysemu/xen.h
> > +++ b/include/sysemu/xen.h
> > @@ -34,6 +34,8 @@ void xen_hvm_modified_memory(ram_addr_t start,
> ram_addr_t length);
> > void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
> > struct MemoryRegion *mr, Error **errp);
> >
> > +bool xen_mr_is_memory(MemoryRegion *mr);
> > +
> > #else /* !CONFIG_XEN_IS_POSSIBLE */
> >
> > #define xen_enabled() 0
> > @@ -47,6 +49,12 @@ static inline void xen_ram_alloc(ram_addr_t ram_addr,
> ram_addr_t size,
> > g_assert_not_reached();
> > }
> >
> > +static inline bool xen_mr_is_memory(MemoryRegion *mr)
> > +{
> > + g_assert_not_reached();
> > + return false;
>
> No need for the stub, just always declare xen_mr_is_memory() ...
> > +}
> > +
> > #endif /* CONFIG_XEN_IS_POSSIBLE */
>
> ... here.
>
> > #endif
>
> Removing the stub:
> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
>
>
Thanks Philippe, will remove the stubs in v8.
Cheers,
Edgar
