MIPS: KVM: Drop now unused asm offsets
Now that locore.S is converted to uasm, remove a bunch of the assembly offset definitions created by asm-offsets.c, including the CPUINFO_ ones for reading the variable asid mask, and the non FPU/MSA related VCPU_ definitions. KVM's fpu.S and msa.S still use the remaining definitions. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim KrÄmář <rkrcmar@redhat.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
d7b8f890b6
commit
9c98865840
|
@ -339,67 +339,9 @@ void output_pm_defines(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void output_cpuinfo_defines(void)
|
|
||||||
{
|
|
||||||
COMMENT(" MIPS cpuinfo offsets. ");
|
|
||||||
DEFINE(CPUINFO_SIZE, sizeof(struct cpuinfo_mips));
|
|
||||||
#ifdef CONFIG_MIPS_ASID_BITS_VARIABLE
|
|
||||||
OFFSET(CPUINFO_ASID_MASK, cpuinfo_mips, asid_mask);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void output_kvm_defines(void)
|
void output_kvm_defines(void)
|
||||||
{
|
{
|
||||||
COMMENT(" KVM/MIPS Specfic offsets. ");
|
COMMENT(" KVM/MIPS Specfic offsets. ");
|
||||||
DEFINE(VCPU_ARCH_SIZE, sizeof(struct kvm_vcpu_arch));
|
|
||||||
OFFSET(VCPU_RUN, kvm_vcpu, run);
|
|
||||||
OFFSET(VCPU_HOST_ARCH, kvm_vcpu, arch);
|
|
||||||
|
|
||||||
OFFSET(VCPU_GUEST_EBASE, kvm_vcpu_arch, guest_ebase);
|
|
||||||
|
|
||||||
OFFSET(VCPU_HOST_STACK, kvm_vcpu_arch, host_stack);
|
|
||||||
OFFSET(VCPU_HOST_GP, kvm_vcpu_arch, host_gp);
|
|
||||||
|
|
||||||
OFFSET(VCPU_HOST_CP0_BADVADDR, kvm_vcpu_arch, host_cp0_badvaddr);
|
|
||||||
OFFSET(VCPU_HOST_CP0_CAUSE, kvm_vcpu_arch, host_cp0_cause);
|
|
||||||
OFFSET(VCPU_HOST_EPC, kvm_vcpu_arch, host_cp0_epc);
|
|
||||||
|
|
||||||
OFFSET(VCPU_R0, kvm_vcpu_arch, gprs[0]);
|
|
||||||
OFFSET(VCPU_R1, kvm_vcpu_arch, gprs[1]);
|
|
||||||
OFFSET(VCPU_R2, kvm_vcpu_arch, gprs[2]);
|
|
||||||
OFFSET(VCPU_R3, kvm_vcpu_arch, gprs[3]);
|
|
||||||
OFFSET(VCPU_R4, kvm_vcpu_arch, gprs[4]);
|
|
||||||
OFFSET(VCPU_R5, kvm_vcpu_arch, gprs[5]);
|
|
||||||
OFFSET(VCPU_R6, kvm_vcpu_arch, gprs[6]);
|
|
||||||
OFFSET(VCPU_R7, kvm_vcpu_arch, gprs[7]);
|
|
||||||
OFFSET(VCPU_R8, kvm_vcpu_arch, gprs[8]);
|
|
||||||
OFFSET(VCPU_R9, kvm_vcpu_arch, gprs[9]);
|
|
||||||
OFFSET(VCPU_R10, kvm_vcpu_arch, gprs[10]);
|
|
||||||
OFFSET(VCPU_R11, kvm_vcpu_arch, gprs[11]);
|
|
||||||
OFFSET(VCPU_R12, kvm_vcpu_arch, gprs[12]);
|
|
||||||
OFFSET(VCPU_R13, kvm_vcpu_arch, gprs[13]);
|
|
||||||
OFFSET(VCPU_R14, kvm_vcpu_arch, gprs[14]);
|
|
||||||
OFFSET(VCPU_R15, kvm_vcpu_arch, gprs[15]);
|
|
||||||
OFFSET(VCPU_R16, kvm_vcpu_arch, gprs[16]);
|
|
||||||
OFFSET(VCPU_R17, kvm_vcpu_arch, gprs[17]);
|
|
||||||
OFFSET(VCPU_R18, kvm_vcpu_arch, gprs[18]);
|
|
||||||
OFFSET(VCPU_R19, kvm_vcpu_arch, gprs[19]);
|
|
||||||
OFFSET(VCPU_R20, kvm_vcpu_arch, gprs[20]);
|
|
||||||
OFFSET(VCPU_R21, kvm_vcpu_arch, gprs[21]);
|
|
||||||
OFFSET(VCPU_R22, kvm_vcpu_arch, gprs[22]);
|
|
||||||
OFFSET(VCPU_R23, kvm_vcpu_arch, gprs[23]);
|
|
||||||
OFFSET(VCPU_R24, kvm_vcpu_arch, gprs[24]);
|
|
||||||
OFFSET(VCPU_R25, kvm_vcpu_arch, gprs[25]);
|
|
||||||
OFFSET(VCPU_R26, kvm_vcpu_arch, gprs[26]);
|
|
||||||
OFFSET(VCPU_R27, kvm_vcpu_arch, gprs[27]);
|
|
||||||
OFFSET(VCPU_R28, kvm_vcpu_arch, gprs[28]);
|
|
||||||
OFFSET(VCPU_R29, kvm_vcpu_arch, gprs[29]);
|
|
||||||
OFFSET(VCPU_R30, kvm_vcpu_arch, gprs[30]);
|
|
||||||
OFFSET(VCPU_R31, kvm_vcpu_arch, gprs[31]);
|
|
||||||
OFFSET(VCPU_LO, kvm_vcpu_arch, lo);
|
|
||||||
OFFSET(VCPU_HI, kvm_vcpu_arch, hi);
|
|
||||||
OFFSET(VCPU_PC, kvm_vcpu_arch, pc);
|
|
||||||
BLANK();
|
|
||||||
|
|
||||||
OFFSET(VCPU_FPR0, kvm_vcpu_arch, fpu.fpr[0]);
|
OFFSET(VCPU_FPR0, kvm_vcpu_arch, fpu.fpr[0]);
|
||||||
OFFSET(VCPU_FPR1, kvm_vcpu_arch, fpu.fpr[1]);
|
OFFSET(VCPU_FPR1, kvm_vcpu_arch, fpu.fpr[1]);
|
||||||
|
@ -437,14 +379,6 @@ void output_kvm_defines(void)
|
||||||
OFFSET(VCPU_FCR31, kvm_vcpu_arch, fpu.fcr31);
|
OFFSET(VCPU_FCR31, kvm_vcpu_arch, fpu.fcr31);
|
||||||
OFFSET(VCPU_MSA_CSR, kvm_vcpu_arch, fpu.msacsr);
|
OFFSET(VCPU_MSA_CSR, kvm_vcpu_arch, fpu.msacsr);
|
||||||
BLANK();
|
BLANK();
|
||||||
|
|
||||||
OFFSET(VCPU_COP0, kvm_vcpu_arch, cop0);
|
|
||||||
OFFSET(VCPU_GUEST_KERNEL_ASID, kvm_vcpu_arch, guest_kernel_asid);
|
|
||||||
OFFSET(VCPU_GUEST_USER_ASID, kvm_vcpu_arch, guest_user_asid);
|
|
||||||
|
|
||||||
OFFSET(COP0_TLB_HI, mips_coproc, reg[MIPS_CP0_TLB_HI][0]);
|
|
||||||
OFFSET(COP0_STATUS, mips_coproc, reg[MIPS_CP0_STATUS][0]);
|
|
||||||
BLANK();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MIPS_CPS
|
#ifdef CONFIG_MIPS_CPS
|
||||||
|
|
Loading…
Reference in New Issue