From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqirO-0008En-Tk for qemu-devel@nongnu.org; Tue, 27 Feb 2018 12:16:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqirK-0000io-LY for qemu-devel@nongnu.org; Tue, 27 Feb 2018 12:16:14 -0500 Received: from smtp.citrix.com ([66.165.176.89]:3228) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqirK-0000hz-DJ for qemu-devel@nongnu.org; Tue, 27 Feb 2018 12:16:10 -0500 Date: Tue, 27 Feb 2018 16:46:51 +0000 From: Anthony PERARD Message-ID: <20180227164651.GC1799@perard.uk.xensource.com> References: <20171207101812.23602-1-haozhong.zhang@intel.com> <20171207101812.23602-6-haozhong.zhang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20171207101812.23602-6-haozhong.zhang@intel.com> Subject: Re: [Qemu-devel] [RFC QEMU PATCH v4 05/10] xen-hvm: initialize fw_cfg interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Haozhong Zhang Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Konrad Rzeszutek Wilk , Dan Williams , Chao Peng , "Michael S. Tsirkin" , Paolo Bonzini , Richard Henderson , Eduardo Habkost On Thu, Dec 07, 2017 at 06:18:07PM +0800, Haozhong Zhang wrote: > Xen is going to reuse QEMU to build ACPI of some devices (e.g., NFIT > and SSDT for NVDIMM) for HVM domains. The existing QEMU ACPI build > code requires a fw_cfg interface which will also be used to pass QEMU > built ACPI to Xen. Therefore, we need to initialize fw_cfg when any > ACPI is going to be built by QEMU. > > Signed-off-by: Haozhong Zhang > --- > Cc: Stefano Stabellini > Cc: Anthony Perard > Cc: "Michael S. Tsirkin" > Cc: Paolo Bonzini > Cc: Richard Henderson > Cc: Eduardo Habkost > --- > hw/i386/xen/xen-hvm.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index fe01b7a025..4b29f4052b 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -14,6 +14,7 @@ > #include "hw/pci/pci.h" > #include "hw/i386/pc.h" > #include "hw/i386/apic-msidef.h" > +#include "hw/loader.h" > #include "hw/xen/xen_common.h" > #include "hw/xen/xen_backend.h" > #include "qmp-commands.h" > @@ -1234,6 +1235,14 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data) > xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); > } > > +static void xen_fw_cfg_init(PCMachineState *pcms) > +{ The fw_cfg interface might already be initialized, it is used for "direct kernel boot" on hvm. It is initialized in xen_load_linux(). > + FWCfgState *fw_cfg = fw_cfg_init_io(FW_CFG_IO_BASE); > + > + rom_set_fw(fw_cfg); > + pcms->fw_cfg = fw_cfg; > +} > + > void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) > { > int i, rc; > @@ -1384,6 +1393,9 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) > > /* Disable ACPI build because Xen handles it */ > pcms->acpi_build_enabled = false; > + if (pcms->acpi_build_enabled) { > + xen_fw_cfg_init(pcms); > + } > > return; > > -- > 2.15.1 > -- Anthony PERARD