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

Commit e1d8a96d authored May 26, 2014 by Paul Mackerras Committed by Alexander Graf May 30, 2014

KVM: PPC: Book3S: Move KVM_REG_PPC_WORT to an unused register number



Commit b005255e ("KVM: PPC: Book3S HV: Context-switch new POWER8
SPRs") added a definition of KVM_REG_PPC_WORT with the same register
number as the existing KVM_REG_PPC_VRSAVE (though in fact the
definitions are not identical because of the different register sizes.)

For clarity, this moves KVM_REG_PPC_WORT to the next unused number,
and also adds it to api.txt.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 2f9c6943

Documentation/virtual/kvm/api.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1873,6 +1873,7 @@ registers, find a list below:
		PPC \| KVM_REG_PPC_PPR \| 64
		PPC \| KVM_REG_PPC_ARCH_COMPAT 32
		PPC \| KVM_REG_PPC_DABRX \| 32
		PPC \| KVM_REG_PPC_WORT \| 64
		PPC \| KVM_REG_PPC_TM_GPR0 \| 64
		...
		PPC \| KVM_REG_PPC_TM_GPR31 \| 64

arch/powerpc/include/uapi/asm/kvm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -545,7 +545,6 @@ struct kvm_get_htab_header {
		#define KVM_REG_PPC_TCSCR (KVM_REG_PPC \| KVM_REG_SIZE_U64 \| 0xb1)
		#define KVM_REG_PPC_PID (KVM_REG_PPC \| KVM_REG_SIZE_U64 \| 0xb2)
		#define KVM_REG_PPC_ACOP (KVM_REG_PPC \| KVM_REG_SIZE_U64 \| 0xb3)
		#define KVM_REG_PPC_WORT (KVM_REG_PPC \| KVM_REG_SIZE_U64 \| 0xb4)

		#define KVM_REG_PPC_VRSAVE (KVM_REG_PPC \| KVM_REG_SIZE_U32 \| 0xb4)
		#define KVM_REG_PPC_LPCR (KVM_REG_PPC \| KVM_REG_SIZE_U32 \| 0xb5)
		@@ -555,6 +554,7 @@ struct kvm_get_htab_header {
		#define KVM_REG_PPC_ARCH_COMPAT (KVM_REG_PPC \| KVM_REG_SIZE_U32 \| 0xb7)

		#define KVM_REG_PPC_DABRX (KVM_REG_PPC \| KVM_REG_SIZE_U32 \| 0xb8)
		#define KVM_REG_PPC_WORT (KVM_REG_PPC \| KVM_REG_SIZE_U64 \| 0xb9)

		/* Transactional Memory checkpointed state:
		* This is all GPRs, all VSX regs and a subset of SPRs