On 2/12/22 03:59, Vikram Garhwal wrote:
xen-mapcache.c contains common functions which can be used for enabling Xen on
aarch64 with IOREQ handling. Moving it out from hw/i386/xen to hw/xen to make it
accessible for both aarch64 and x86.

Signed-off-by: Vikram Garhwal <vikram.garh...@amd.com>
Signed-off-by: Stefano Stabellini <stefano.stabell...@amd.com>
---
  hw/i386/meson.build              | 1 +
  hw/i386/xen/meson.build          | 1 -
  hw/i386/xen/trace-events         | 5 -----
  hw/xen/meson.build               | 4 ++++
  hw/xen/trace-events              | 5 +++++
  hw/{i386 => }/xen/xen-mapcache.c | 0
  6 files changed, 10 insertions(+), 6 deletions(-)
  rename hw/{i386 => }/xen/xen-mapcache.c (100%)

diff --git a/hw/i386/meson.build b/hw/i386/meson.build
index 213e2e82b3..cfdbfdcbcb 100644
--- a/hw/i386/meson.build
+++ b/hw/i386/meson.build
@@ -33,5 +33,6 @@ subdir('kvm')
  subdir('xen')
i386_ss.add_all(xenpv_ss)
+i386_ss.add_all(xen_ss)

Not needed ...

diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index ae0ace3046..19d0637c46 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -22,3 +22,7 @@ else
  endif
specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
+
+xen_ss = ss.source_set()
+
+xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))

... because we can simply add in the softmmu_ss list at the beginning
of this file.

Otherwise LGTM.


Reply via email to