| Message ID | 20231114163123.74888-6-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/xen: Have ARM targets use common xen_memory_listener | expand |
On Tue, 14 Nov 2023 18:31, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: >In a pair of commit we are going to call xen_read_physmap() >out of hw/i386/xen/xen-hvm.c. > >Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >--- > include/hw/xen/xen-hvm-common.h | 1 + > hw/i386/xen/xen-hvm.c | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > >diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h >index 0fed15ed04..536712dc83 100644 >--- a/include/hw/xen/xen-hvm-common.h >+++ b/include/hw/xen/xen-hvm-common.h >@@ -97,6 +97,7 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, > > void cpu_ioreq_pio(ioreq_t *req); > >+void xen_read_physmap(XenIOState *state); > void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req); > void xen_arch_set_memory(XenIOState *state, > MemoryRegionSection *section, >diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c >index a65a96f0de..789779d02c 100644 >--- a/hw/i386/xen/xen-hvm.c >+++ b/hw/i386/xen/xen-hvm.c >@@ -525,7 +525,7 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) > } > > #ifdef XEN_COMPAT_PHYSMAP >-static void xen_read_physmap(XenIOState *state) >+void xen_read_physmap(XenIOState *state) > { > XenPhysmap *physmap = NULL; > unsigned int len, num, i; >@@ -573,7 +573,7 @@ static void xen_read_physmap(XenIOState *state) > free(entries); > } > #else >-static void xen_read_physmap(XenIOState *state) >+void xen_read_physmap(XenIOState *state) > { > } > #endif >-- >2.41.0 > > Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h index 0fed15ed04..536712dc83 100644 --- a/include/hw/xen/xen-hvm-common.h +++ b/include/hw/xen/xen-hvm-common.h @@ -97,6 +97,7 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, void cpu_ioreq_pio(ioreq_t *req); +void xen_read_physmap(XenIOState *state); void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req); void xen_arch_set_memory(XenIOState *state, MemoryRegionSection *section, diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index a65a96f0de..789779d02c 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -525,7 +525,7 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) } #ifdef XEN_COMPAT_PHYSMAP -static void xen_read_physmap(XenIOState *state) +void xen_read_physmap(XenIOState *state) { XenPhysmap *physmap = NULL; unsigned int len, num, i; @@ -573,7 +573,7 @@ static void xen_read_physmap(XenIOState *state) free(entries); } #else -static void xen_read_physmap(XenIOState *state) +void xen_read_physmap(XenIOState *state) { } #endif
In a pair of commit we are going to call xen_read_physmap() out of hw/i386/xen/xen-hvm.c. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/xen/xen-hvm-common.h | 1 + hw/i386/xen/xen-hvm.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)