From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 14 Nov 2023 14:23:24 +0000 (+0100)
Subject: hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS
X-Git-Tag: v9.0.0-rc0~25^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=906c0876eef947b8abfe2da3ad15fd6c8fa1e2ff;p=thirdparty%2Fqemu.git

hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS

xen-hvm.c calls xc_set_hvm_param() from <xenctrl.h>,
so better compile it with Xen CPPFLAGS.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20231114143816.71079-19-philmd@linaro.org>
---

diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build
index 3dc4c4f106e..3f0df8bc075 100644
--- a/hw/i386/xen/meson.build
+++ b/hw/i386/xen/meson.build
@@ -1,8 +1,10 @@
 i386_ss.add(when: 'CONFIG_XEN', if_true: files(
-  'xen-hvm.c',
   'xen_apic.c',
   'xen_pvdevice.c',
 ))
+i386_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+  'xen-hvm.c',
+))
 
 i386_ss.add(when: 'CONFIG_XEN_BUS', if_true: files(
   'xen_platform.c',