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

Commit 9d8f549d authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Avi Kivity
Browse files

KVM: Use ARRAY_SIZE macro instead of manual calculation. 



Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: default avatarDor Laor <dor.laor@qumranet.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent de979caa

drivers/kvm/kvm_svm.h

+2 −1
Original line number Diff line number Diff line 
#ifndef __KVM_SVM_H

#define __KVM_SVM_H



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/list.h>

#include <asm/msr.h>
@@ -18,7 +19,7 @@ static const u32 host_save_msrs[] = { 
	MSR_IA32_LASTBRANCHTOIP, MSR_IA32_LASTINTFROMIP,MSR_IA32_LASTINTTOIP,*/

};



#define NR_HOST_SAVE_MSRS (sizeof(host_save_msrs) / sizeof(*host_save_msrs))

#define NR_HOST_SAVE_MSRS ARRAY_SIZE(host_save_msrs)

#define NUM_DB_REGS 4



struct vcpu_svm {

drivers/kvm/svm.c

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/vmalloc.h>

#include <linux/highmem.h>

#include <linux/profile.h>
@@ -75,7 +76,7 @@ struct svm_init_data { 


static u32 msrpm_ranges[] = {0, 0xc0000000, 0xc0010000};



#define NUM_MSR_MAPS (sizeof(msrpm_ranges) / sizeof(*msrpm_ranges))

#define NUM_MSR_MAPS ARRAY_SIZE(msrpm_ranges)

#define MSRS_RANGE_SIZE 2048

#define MSRS_IN_RANGE (MSRS_RANGE_SIZE * 8 / 2)
@@ -1297,7 +1298,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		       __FUNCTION__, vcpu->svm->vmcb->control.exit_int_info,

		       exit_code);



	if (exit_code >= sizeof(svm_exit_handlers) / sizeof(*svm_exit_handlers)

	if (exit_code >= ARRAY_SIZE(svm_exit_handlers)

	    || svm_exit_handlers[exit_code] == 0) {

		kvm_run->exit_reason = KVM_EXIT_UNKNOWN;

		printk(KERN_ERR "%s: 0x%x @ 0x%llx cr0 0x%lx rflags 0x%llx\n",

drivers/kvm/vmx.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "vmx.h"

#include "kvm_vmx.h"

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/highmem.h>

#include <linux/profile.h>
@@ -75,7 +76,7 @@ static const u32 vmx_msr_index[] = { 
#endif

	MSR_EFER, MSR_K6_STAR,

};

#define NR_VMX_MSR (sizeof(vmx_msr_index) / sizeof(*vmx_msr_index))

#define NR_VMX_MSR ARRAY_SIZE(vmx_msr_index)



static inline int is_page_fault(u32 intr_info)

{