Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756159AbYKDO53 (ORCPT ); Tue, 4 Nov 2008 09:57:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754720AbYKDOxy (ORCPT ); Tue, 4 Nov 2008 09:53:54 -0500 Received: from mx2.redhat.com ([66.187.237.31]:60546 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753531AbYKDOxm (ORCPT ); Tue, 4 Nov 2008 09:53:42 -0500 From: Eduardo Habkost To: Avi Kivity , Ingo Molnar Cc: "Eric W. Biederman" , Simon Horman , Andrew Morton , Vivek Goyal , Haren Myneni , Andrey Borzenkov , mingo@redhat.com, "Rafael J. Wysocki" , kexec@lists.infradead.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Eduardo Habkost Subject: [PATCH 15/16] kvm: x86: set kdump virt_disable function on initialization Date: Tue, 4 Nov 2008 12:52:43 -0200 Message-Id: <1225810364-8990-16-git-send-email-ehabkost@redhat.com> In-Reply-To: <1225810364-8990-1-git-send-email-ehabkost@redhat.com> References: <1225810364-8990-1-git-send-email-ehabkost@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1964 Lines: 77 Finally implement the virt_disable function for kdump. It will call kvm_x86_ops->crash_hardware_disable(), that will disable virtualization extensions on the CPU if it is not disabled yet. Signed-off-by: Eduardo Habkost --- arch/x86/kvm/x86.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 049c6a0..9e61baf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -40,6 +40,7 @@ #include #include #include +#include #define MAX_IO_MSRS 256 #define CR0_RESERVED_BITS \ @@ -2581,6 +2582,13 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu, struct kvm_run *run, int in, } EXPORT_SYMBOL_GPL(kvm_emulate_pio_string); +/* Called at crash time, so we can disable virtualization if needed + */ +static void crash_hardware_disable(void) +{ + kvm_x86_ops->crash_hardware_disable(NULL); +} + int kvm_arch_init(void *opaque) { int r; @@ -2605,9 +2613,15 @@ int kvm_arch_init(void *opaque) kvm_x86_ops = ops; + r = set_virt_disable_func(crash_hardware_disable); + if (r) { + printk(KERN_ERR "kvm: virt_disable function already set?\n"); + goto out_clear_ops; + } + r = kvm_mmu_module_init(); if (r) - goto out_clear_ops; + goto out_clear_crash; kvm_init_msr_list(); @@ -2617,6 +2631,8 @@ int kvm_arch_init(void *opaque) PT_DIRTY_MASK, PT64_NX_MASK, 0, 0); return 0; +out_clear_crash: + clear_virt_disable_func(); out_clear_ops: kvm_x86_ops = NULL; out: @@ -2625,6 +2641,7 @@ out: void kvm_arch_exit(void) { + clear_virt_disable_func(); kvm_x86_ops = NULL; kvm_mmu_module_exit(); } -- 1.5.5.GIT -- 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/