Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503AbaGOPKM (ORCPT ); Tue, 15 Jul 2014 11:10:12 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:32033 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754342AbaGOPJw (ORCPT ); Tue, 15 Jul 2014 11:09:52 -0400 Date: Tue, 15 Jul 2014 11:09:38 -0400 From: Konrad Rzeszutek Wilk To: Vitaly Kuznetsov Cc: xen-devel@lists.xenproject.org, Boris Ostrovsky , David Vrabel , Stefano Stabellini , Andrew Jones , linux-kernel@vger.kernel.org Subject: Re: [PATCH RFC 2/4] xen/pvhvm: Introduce xen_pvhvm_kexec_shutdown() Message-ID: <20140715150938.GO3403@laptop.dumpdata.com> References: <1405431640-649-1-git-send-email-vkuznets@redhat.com> <1405431640-649-3-git-send-email-vkuznets@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1405431640-649-3-git-send-email-vkuznets@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 15, 2014 at 03:40:38PM +0200, Vitaly Kuznetsov wrote: > PVHVM guest requires special actions before kexec. Register specific > xen_pvhvm_kexec_shutdown() handler for machine_ops.shutdown(). > This looks close to what I had sent as an RFC to you? > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/xen/enlighten.c | 9 +++++++++ > arch/x86/xen/smp.c | 9 +++++++++ > arch/x86/xen/smp.h | 1 + > 3 files changed, 19 insertions(+) > > diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c > index a11af62..8074e4a 100644 > --- a/arch/x86/xen/enlighten.c > +++ b/arch/x86/xen/enlighten.c > @@ -1833,6 +1833,12 @@ static struct notifier_block xen_hvm_cpu_notifier = { > .notifier_call = xen_hvm_cpu_notify, > }; > > +static void xen_pvhvm_kexec_shutdown(void) > +{ > + xen_kexec_shutdown(); > + native_machine_shutdown(); > +} > + > static void __init xen_hvm_guest_init(void) > { > init_hvm_pv_info(); > @@ -1849,6 +1855,9 @@ static void __init xen_hvm_guest_init(void) > x86_init.irqs.intr_init = xen_init_IRQ; > xen_hvm_init_time_ops(); > xen_hvm_init_mmu_ops(); > +#ifdef CONFIG_KEXEC > + machine_ops.shutdown = xen_pvhvm_kexec_shutdown; > +#endif > } > > static uint32_t __init xen_hvm_platform(void) > diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c > index 7005974..35dcf39 100644 > --- a/arch/x86/xen/smp.c > +++ b/arch/x86/xen/smp.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -762,6 +763,14 @@ static void xen_hvm_cpu_die(unsigned int cpu) > native_cpu_die(cpu); > } > > +void xen_kexec_shutdown(void) > +{ > +#ifdef CONFIG_KEXEC > + if (!kexec_in_progress) > + return; > +#endif > +} > + > void __init xen_hvm_smp_init(void) > { > if (!xen_have_vector_callback) > diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h > index c7c2d89..1af0493 100644 > --- a/arch/x86/xen/smp.h > +++ b/arch/x86/xen/smp.h > @@ -8,4 +8,5 @@ extern void xen_send_IPI_allbutself(int vector); > extern void xen_send_IPI_all(int vector); > extern void xen_send_IPI_self(int vector); > > +extern void xen_kexec_shutdown(void); > #endif > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/