diff options
author | Mathias Krause <minipli@googlemail.com> | 2012-08-29 19:30:17 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-09-05 05:41:54 -0400 |
commit | 0fbe9b0b19fb92eee2cf23c23d63d6b3312681e5 (patch) | |
tree | bf07cc869ed78c41f20ac493dfeab866f78910fd | |
parent | 0225fb509d51fcf777eb0aa31c304c582e3248fd (diff) |
KVM: x86: constify read_write_emulator_ops
We never change those, make them r/o.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r-- | arch/x86/kvm/x86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0dc066f0428d..317241619e2d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3773,14 +3773,14 @@ static int write_exit_mmio(struct kvm_vcpu *vcpu, gpa_t gpa, | |||
3773 | return X86EMUL_CONTINUE; | 3773 | return X86EMUL_CONTINUE; |
3774 | } | 3774 | } |
3775 | 3775 | ||
3776 | static struct read_write_emulator_ops read_emultor = { | 3776 | static const struct read_write_emulator_ops read_emultor = { |
3777 | .read_write_prepare = read_prepare, | 3777 | .read_write_prepare = read_prepare, |
3778 | .read_write_emulate = read_emulate, | 3778 | .read_write_emulate = read_emulate, |
3779 | .read_write_mmio = vcpu_mmio_read, | 3779 | .read_write_mmio = vcpu_mmio_read, |
3780 | .read_write_exit_mmio = read_exit_mmio, | 3780 | .read_write_exit_mmio = read_exit_mmio, |
3781 | }; | 3781 | }; |
3782 | 3782 | ||
3783 | static struct read_write_emulator_ops write_emultor = { | 3783 | static const struct read_write_emulator_ops write_emultor = { |
3784 | .read_write_emulate = write_emulate, | 3784 | .read_write_emulate = write_emulate, |
3785 | .read_write_mmio = write_mmio, | 3785 | .read_write_mmio = write_mmio, |
3786 | .read_write_exit_mmio = write_exit_mmio, | 3786 | .read_write_exit_mmio = write_exit_mmio, |
@@ -3791,7 +3791,7 @@ static int emulator_read_write_onepage(unsigned long addr, void *val, | |||
3791 | unsigned int bytes, | 3791 | unsigned int bytes, |
3792 | struct x86_exception *exception, | 3792 | struct x86_exception *exception, |
3793 | struct kvm_vcpu *vcpu, | 3793 | struct kvm_vcpu *vcpu, |
3794 | struct read_write_emulator_ops *ops) | 3794 | const struct read_write_emulator_ops *ops) |
3795 | { | 3795 | { |
3796 | gpa_t gpa; | 3796 | gpa_t gpa; |
3797 | int handled, ret; | 3797 | int handled, ret; |
@@ -3840,7 +3840,7 @@ mmio: | |||
3840 | int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr, | 3840 | int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr, |
3841 | void *val, unsigned int bytes, | 3841 | void *val, unsigned int bytes, |
3842 | struct x86_exception *exception, | 3842 | struct x86_exception *exception, |
3843 | struct read_write_emulator_ops *ops) | 3843 | const struct read_write_emulator_ops *ops) |
3844 | { | 3844 | { |
3845 | struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); | 3845 | struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); |
3846 | gpa_t gpa; | 3846 | gpa_t gpa; |