Skip to content

Commit

Permalink
KVM: SVM: constify lookup tables
Browse files Browse the repository at this point in the history
We never modify direct_access_msrs[], msrpm_ranges[],
svm_exit_handlers[] or x86_intercept_map[] at runtime.
Mark them r/o.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
Mathias Krause authored and Avi Kivity committed Sep 5, 2012
1 parent 772e031 commit 09941fb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kvm/svm.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static DEFINE_PER_CPU(u64, current_tsc_ratio);

#define MSR_INVALID 0xffffffffU

static struct svm_direct_access_msrs {
static const struct svm_direct_access_msrs {
u32 index; /* Index of the MSR */
bool always; /* True if intercept is always on */
} direct_access_msrs[] = {
Expand Down Expand Up @@ -400,7 +400,7 @@ struct svm_init_data {
int r;
};

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

#define NUM_MSR_MAPS ARRAY_SIZE(msrpm_ranges)
#define MSRS_RANGE_SIZE 2048
Expand Down Expand Up @@ -3267,7 +3267,7 @@ static int pause_interception(struct vcpu_svm *svm)
return 1;
}

static int (*svm_exit_handlers[])(struct vcpu_svm *svm) = {
static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {
[SVM_EXIT_READ_CR0] = cr_interception,
[SVM_EXIT_READ_CR3] = cr_interception,
[SVM_EXIT_READ_CR4] = cr_interception,
Expand Down Expand Up @@ -4068,7 +4068,7 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
#define POST_MEM(exit) { .exit_code = (exit), \
.stage = X86_ICPT_POST_MEMACCESS, }

static struct __x86_intercept {
static const struct __x86_intercept {
u32 exit_code;
enum x86_intercept_stage stage;
} x86_intercept_map[] = {
Expand Down

0 comments on commit 09941fb

Please sign in to comment.