MIPS: KVM: Emulate RDHWR CPUNum register

James Hogan · bonzini · commit cf1fb0f29d83 · 2016-06-15T23:58:35.000+02:00
Actually provide the VCPU number when emulating the RDHWR CPUNum
register, so that it will match the CPUNum field of CP0_EBase register,
rather than always returning 0.

Signed-off-by: James Hogan &lt;james.hogan@imgtec.com&gt;
Cc: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
Cc: Radim Krčmář &lt;rkrcmar@redhat.com&gt;
Cc: Ralf Baechle &lt;ralf@linux-mips.org&gt;
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
@@ -2307,7 +2307,7 @@ enum emulation_result kvm_mips_handle_ri(u32 cause, u32 *opc,
 		}
 		switch (rd) {
 		case MIPS_HWR_CPUNUM:		/* CPU number */
-			arch->gprs[rt] = 0;
+			arch->gprs[rt] = vcpu->vcpu_id;
 			break;
 		case MIPS_HWR_SYNCISTEP:	/* SYNCI length */
 			arch->gprs[rt] = min(current_cpu_data.dcache.linesz,

Original file line number	Diff line number	Diff line change
`@@ -2307,7 +2307,7 @@ enum emulation_result kvm_mips_handle_ri(u32 cause, u32 *opc,`
`2307`	`2307`	`}`
`2308`	`2308`	`switch (rd) {`
`2309`	`2309`	`case MIPS_HWR_CPUNUM: /* CPU number */`
`2310`		`- arch->gprs[rt] = 0;`
	`2310`	`+ arch->gprs[rt] = vcpu->vcpu_id;`
`2311`	`2311`	`break;`
`2312`	`2312`	`case MIPS_HWR_SYNCISTEP: /* SYNCI length */`
`2313`	`2313`	`arch->gprs[rt] = min(current_cpu_data.dcache.linesz,`