[PATCH-for-9.0,v2,18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS

Message ID	20231114143816.71079-19-philmd@linaro.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <xen-devel-bounces@lists.xenproject.org> Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org> To: David Woodhouse <dwmw@amazon.co.uk>, qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Paul Durrant <paul@xen.org>, qemu-arm@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, David Woodhouse <dwmw2@infradead.org>, Stefano Stabellini <sstabellini@kernel.org>, Richard Henderson <richard.henderson@linaro.org>, xen-devel@lists.xenproject.org, qemu-block@nongnu.org, Anthony Perard <anthony.perard@citrix.com>, kvm@vger.kernel.org, Thomas Huth <thuth@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eduardo Habkost <eduardo@habkost.net> Subject: [PATCH-for-9.0 v2 18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS Date: Tue, 14 Nov 2023 15:38:14 +0100 Message-ID: <20231114143816.71079-19-philmd@linaro.org> In-Reply-To: <20231114143816.71079-1-philmd@linaro.org> References: <20231114143816.71079-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	hw/xen: Have most of Xen files become target-agnostic \| expand [PATCH-for-9.0,v2,00/19] hw/xen: Have most of Xen files become target-agnostic [PATCH-for-9.0,v2,01/19] tests/avocado: Add 'guest:xen' tag to tests running Xen guest [PATCH-for-9.0,v2,02/19] sysemu/xen: Forbid using Xen headers in user emulation [PATCH-for-9.0,v2,03/19] sysemu/xen-mapcache: Check Xen availability with CONFIG_XEN_IS_POSSIBLE [PATCH-for-9.0,v2,04/19] system/physmem: Do not include 'hw/xen/xen.h' but 'sysemu/xen.h' [PATCH-for-9.0,v2,05/19] hw/display: Restrict xen_register_framebuffer() call to Xen [PATCH-for-9.0,v2,06/19] hw/pci/msi: Restrict xen_is_pirq_msi() call to Xen [PATCH-for-9.0,v2,07/19] hw/xen: Remove unnecessary xen_hvm_inject_msi() stub [PATCH-for-9.0,v2,08/19] hw/xen: Remove unused Xen stubs [RFC,PATCH-for-9.0,v2,09/19] hw/block/xen_blkif: Align structs with QEMU_ALIGNED() instead of #prag… [PATCH-for-9.0,v2,10/19] hw/xen: Rename 'ram_memory' global variable as 'xen_memory' [PATCH-for-9.0,v2,11/19] hw/xen/xen_arch_hvm: Rename prototypes using 'xen_arch_' prefix [PATCH-for-9.0,v2,12/19] hw/xen: Merge 'hw/xen/arch_hvm.h' in 'hw/xen/xen-hvm-common.h' [RFC,PATCH-for-9.0,v2,13/19] hw/xen: Remove use of 'target_ulong' in handle_ioreq() [PATCH-for-9.0,v2,14/19] hw/xen: Use target-agnostic qemu_target_page_bits() [PATCH-for-9.0,v2,15/19] hw/xen: Reduce inclusion of 'cpu.h' to target-specific sources [PATCH-for-9.0,v2,16/19] hw/xen/xen_pt: Add missing license [PATCH-for-9.0,v2,17/19] hw/xen: Extract 'xen_igd.h' from 'xen_pt.h' [PATCH-for-9.0,v2,18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS [PATCH-for-9.0,v2,19/19] hw/xen: Have most of Xen files become target-agnostic

Message ID

20231114143816.71079-19-philmd@linaro.org (mailing list archive)

State

New, archived

Headers

Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: David Woodhouse <dwmw@amazon.co.uk>,
	qemu-devel@nongnu.org
Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,
 Paul Durrant <paul@xen.org>, qemu-arm@nongnu.org,
 Paolo Bonzini <pbonzini@redhat.com>, David Woodhouse <dwmw2@infradead.org>,
 Stefano Stabellini <sstabellini@kernel.org>,
 Richard Henderson <richard.henderson@linaro.org>,
 xen-devel@lists.xenproject.org, qemu-block@nongnu.org,
 Anthony Perard <anthony.perard@citrix.com>, kvm@vger.kernel.org,
 Thomas Huth <thuth@redhat.com>,
 =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
 "Michael S. Tsirkin" <mst@redhat.com>,
 Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
 Eduardo Habkost <eduardo@habkost.net>
Subject: [PATCH-for-9.0 v2 18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen
 CPPFLAGS
Date: Tue, 14 Nov 2023 15:38:14 +0100
Message-ID: <20231114143816.71079-19-philmd@linaro.org>
In-Reply-To: <20231114143816.71079-1-philmd@linaro.org>
References: <20231114143816.71079-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Series

hw/xen: Have most of Xen files become target-agnostic | expand

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> --- hw/i386/xen/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

David Woodhouse Nov. 14, 2023, 3:56 p.m. UTC | #1

On 14 November 2023 09:38:14 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote:
>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>

diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build
index 3dc4c4f106..3f0df8bc07 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',

[PATCH-for-9.0,v2,18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS

Commit Message

Comments

Patch