From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx2.redhat.com ([66.187.237.31]) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1KxNHP-0007Mw-WA for kexec@lists.infradead.org; Tue, 04 Nov 2008 14:53:16 +0000 From: Eduardo Habkost Subject: [PATCH 14/16] kvmx: x86: set kvm_x86_ops earlier on kvm_arch_init() Date: Tue, 4 Nov 2008 12:52:42 -0200 Message-Id: <1225810364-8990-15-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> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Avi Kivity , Ingo Molnar Cc: Andrew Morton , Eduardo Habkost , kvm@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Haren Myneni , Simon Horman , "Eric W. Biederman" , Andrey Borzenkov , mingo@redhat.com, Vivek Goyal Small change that will be needed when we use set_virt_disable_func() on kvm_arch_init(). Signed-off-by: Eduardo Habkost --- arch/x86/kvm/x86.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9a4a39c..049c6a0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2603,19 +2603,22 @@ int kvm_arch_init(void *opaque) goto out; } + kvm_x86_ops = ops; + r = kvm_mmu_module_init(); if (r) - goto out; + goto out_clear_ops; kvm_init_msr_list(); - kvm_x86_ops = ops; kvm_mmu_set_nonpresent_ptes(0ull, 0ull); kvm_mmu_set_base_ptes(PT_PRESENT_MASK); kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0, 0); return 0; +out_clear_ops: + kvm_x86_ops = NULL; out: return r; } -- 1.5.5.GIT _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755876AbYKDO42 (ORCPT ); Tue, 4 Nov 2008 09:56:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754348AbYKDOxs (ORCPT ); Tue, 4 Nov 2008 09:53:48 -0500 Received: from mx2.redhat.com ([66.187.237.31]:60559 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753681AbYKDOxo (ORCPT ); Tue, 4 Nov 2008 09:53:44 -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 14/16] kvmx: x86: set kvm_x86_ops earlier on kvm_arch_init() Date: Tue, 4 Nov 2008 12:52:42 -0200 Message-Id: <1225810364-8990-15-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 Small change that will be needed when we use set_virt_disable_func() on kvm_arch_init(). Signed-off-by: Eduardo Habkost --- arch/x86/kvm/x86.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9a4a39c..049c6a0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2603,19 +2603,22 @@ int kvm_arch_init(void *opaque) goto out; } + kvm_x86_ops = ops; + r = kvm_mmu_module_init(); if (r) - goto out; + goto out_clear_ops; kvm_init_msr_list(); - kvm_x86_ops = ops; kvm_mmu_set_nonpresent_ptes(0ull, 0ull); kvm_mmu_set_base_ptes(PT_PRESENT_MASK); kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0, 0); return 0; +out_clear_ops: + kvm_x86_ops = NULL; out: return r; } -- 1.5.5.GIT