Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6210e37b authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Avi Kivity
Browse files

KVM: VMX: move cpu_has_kvm_support() to an inline on asm/virtext.h 



It will be used by core code on kdump and reboot, to disable
vmx if needed.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent eca70fc5

arch/x86/include/asm/virtext.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* CPU virtualization extensions handling

 *

 * This should carry the code for handling CPU virtualization extensions

 * that needs to live in the kernel core.

 *

 * Author: Eduardo Habkost <ehabkost@redhat.com>

 *

 * Copyright (C) 2008, Red Hat Inc.

 *

 * Contains code from KVM, Copyright (C) 2006 Qumranet, Inc.

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 */

#ifndef _ASM_X86_VIRTEX_H

#define _ASM_X86_VIRTEX_H



#include <asm/processor.h>

#include <asm/system.h>



/*

 * VMX functions:

 */



static inline int cpu_has_vmx(void)

{

	unsigned long ecx = cpuid_ecx(1);

	return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */

}



#endif /* _ASM_X86_VIRTEX_H */

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/io.h>

#include <asm/desc.h>

#include <asm/vmx.h>

#include <asm/virtext.h>



#define __ex(x) __kvm_handle_fault_on_reboot(x)
@@ -1044,8 +1045,7 @@ static int vmx_get_irq(struct kvm_vcpu *vcpu) 


static __init int cpu_has_kvm_support(void)

{

	unsigned long ecx = cpuid_ecx(1);

	return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */

	return cpu_has_vmx();

}



static __init int vmx_disabled_by_bios(void)