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

Commit c8027f16 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Make DSISR 32 bits wide 



DSISR is only defined as 32 bits wide. So let's reflect that in the
structs too.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 18978768

arch/powerpc/include/asm/kvm_book3s.h

+1 −1
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ struct kvmppc_vcpu_book3s { 
	u64 hid[6];

	u64 gqr[8];

	int slb_nr;

	u32 dsisr;

	u64 sdr1;

	u64 dsisr;

	u64 hior;

	u64 msr_mask;

	u64 vsid_first;

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct kvm_vcpu_arch { 


	u32 last_inst;

#ifdef CONFIG_PPC64

	ulong fault_dsisr;

	u32 fault_dsisr;

#endif

	ulong fault_dear;

	ulong fault_esr;

arch/powerpc/kvm/book3s_64_interrupts.S

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ kvmppc_handler_highmem: 
	std	r3, VCPU_PC(r7)

	std	r4, VCPU_SHADOW_SRR1(r7)

	std	r5, VCPU_FAULT_DEAR(r7)

	std	r6, VCPU_FAULT_DSISR(r7)

	stw	r6, VCPU_FAULT_DSISR(r7)



	ld	r5, VCPU_HFLAGS(r7)

	rldicl.	r5, r5, 0, 63		/* CR = ((r5 & 1) == 0) */