openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: VMX: Use proper types to access const arrays 

Use a const pointer type instead of casting away the const qualifier
from const arrays. Keep the pointer array on the stack, nonetheless.
Making it static just increases the object size.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Mathias Krause 2013-06-26 20:36:21 +02:00 committed by Paolo Bonzini
parent a25eb114d5
commit c2bae89394
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kvm/vmx.c
View File

@ -5971,8 +5971,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
unsigned long field; unsigned long field;
u64 field_value; u64 field_value;
struct vmcs *shadow_vmcs = vmx->nested.current_shadow_vmcs; struct vmcs *shadow_vmcs = vmx->nested.current_shadow_vmcs;
unsigned long *fields = (unsigned long *)shadow_read_write_fields; const unsigned long *fields = shadow_read_write_fields;
int num_fields = max_shadow_read_write_fields; const int num_fields = max_shadow_read_write_fields;
vmcs_load(shadow_vmcs); vmcs_load(shadow_vmcs);
@ -6001,12 +6001,11 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx) static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
{ {
unsigned long *fields[] = { const unsigned long *fields[] = {
(unsigned long *)shadow_read_write_fields, shadow_read_write_fields,
(unsigned long *)shadow_read_only_fields shadow_read_only_fields
}; };
int num_lists = ARRAY_SIZE(fields); const int max_fields[] = {
int max_fields[] = {
max_shadow_read_write_fields, max_shadow_read_write_fields,
max_shadow_read_only_fields max_shadow_read_only_fields
}; };
@ -6017,7 +6016,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
vmcs_load(shadow_vmcs); vmcs_load(shadow_vmcs);
for (q = 0; q < num_lists; q++) { for (q = 0; q < ARRAY_SIZE(fields); q++) {
for (i = 0; i < max_fields[q]; i++) { for (i = 0; i < max_fields[q]; i++) {
field = fields[q][i]; field = fields[q][i];
vmcs12_read_any(&vmx->vcpu, field, &field_value); vmcs12_read_any(&vmx->vcpu, field, &field_value);