From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 5/6] kvmx: x86: set kvm_x86_ops earlier on kvm_arch_init() Date: Thu, 30 Oct 2008 11:34:45 -0200 Message-ID: <1225373687-6960-6-git-send-email-ehabkost@redhat.com> References: <1225373687-6960-1-git-send-email-ehabkost@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Andrew Morton , Eduardo Habkost , kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Haren Myneni , Simon Horman , "Eric W. Biederman" , Vivek Goyal To: Avi Kivity Return-path: In-Reply-To: <1225373687-6960-1-git-send-email-ehabkost-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kexec-bounces-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: kvm.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 38f79b6..ff895e2 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