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

Commit 0fbe9b0b authored by Mathias Krause's avatar Mathias Krause Committed by Avi Kivity
Browse files

KVM: x86: constify read_write_emulator_ops 



We never change those, make them r/o.

Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0225fb50

arch/x86/kvm/x86.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -3773,14 +3773,14 @@ static int write_exit_mmio(struct kvm_vcpu *vcpu, gpa_t gpa, 
	return X86EMUL_CONTINUE;

	return X86EMUL_CONTINUE;

}

}





static struct read_write_emulator_ops read_emultor = {

static const struct read_write_emulator_ops read_emultor = {

	.read_write_prepare = read_prepare,

	.read_write_prepare = read_prepare,

	.read_write_emulate = read_emulate,

	.read_write_emulate = read_emulate,

	.read_write_mmio = vcpu_mmio_read,

	.read_write_mmio = vcpu_mmio_read,

	.read_write_exit_mmio = read_exit_mmio,

	.read_write_exit_mmio = read_exit_mmio,

};

};





static struct read_write_emulator_ops write_emultor = {

static const struct read_write_emulator_ops write_emultor = {

	.read_write_emulate = write_emulate,

	.read_write_emulate = write_emulate,

	.read_write_mmio = write_mmio,

	.read_write_mmio = write_mmio,

	.read_write_exit_mmio = write_exit_mmio,

	.read_write_exit_mmio = write_exit_mmio,
@@ -3791,7 +3791,7 @@ static int emulator_read_write_onepage(unsigned long addr, void *val, 
				       unsigned int bytes,

				       unsigned int bytes,

				       struct x86_exception *exception,

				       struct x86_exception *exception,

				       struct kvm_vcpu *vcpu,

				       struct kvm_vcpu *vcpu,

				       struct read_write_emulator_ops *ops)

				       const struct read_write_emulator_ops *ops)

{

{

	gpa_t gpa;

	gpa_t gpa;

	int handled, ret;

	int handled, ret;
@@ -3840,7 +3840,7 @@ mmio: 
int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr,

int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr,

			void *val, unsigned int bytes,

			void *val, unsigned int bytes,

			struct x86_exception *exception,

			struct x86_exception *exception,

			struct read_write_emulator_ops *ops)

			const struct read_write_emulator_ops *ops)

{

{

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);

	gpa_t gpa;

	gpa_t gpa;