x86/fpu: Harmonize FPU register state types
Use these consistent names: struct fregs_state # was: i387_fsave_struct struct fxregs_state # was: i387_fxsave_struct struct swregs_state # was: i387_soft_struct struct xregs_state # was: xsave_struct union fpregs_state # was: thread_xstate Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -3195,7 +3195,7 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
|
||||
|
||||
static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct xsave_struct *xsave = &vcpu->arch.guest_fpu.state.xsave;
|
||||
struct xregs_state *xsave = &vcpu->arch.guest_fpu.state.xsave;
|
||||
u64 xstate_bv = xsave->header.xfeatures;
|
||||
u64 valid;
|
||||
|
||||
@@ -3231,7 +3231,7 @@ static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)
|
||||
|
||||
static void load_xsave(struct kvm_vcpu *vcpu, u8 *src)
|
||||
{
|
||||
struct xsave_struct *xsave = &vcpu->arch.guest_fpu.state.xsave;
|
||||
struct xregs_state *xsave = &vcpu->arch.guest_fpu.state.xsave;
|
||||
u64 xstate_bv = *(u64 *)(src + XSAVE_HDR_OFFSET);
|
||||
u64 valid;
|
||||
|
||||
@@ -3277,7 +3277,7 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
|
||||
} else {
|
||||
memcpy(guest_xsave->region,
|
||||
&vcpu->arch.guest_fpu.state.fxsave,
|
||||
sizeof(struct i387_fxsave_struct));
|
||||
sizeof(struct fxregs_state));
|
||||
*(u64 *)&guest_xsave->region[XSAVE_HDR_OFFSET / sizeof(u32)] =
|
||||
XSTATE_FPSSE;
|
||||
}
|
||||
@@ -3302,7 +3302,7 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
|
||||
if (xstate_bv & ~XSTATE_FPSSE)
|
||||
return -EINVAL;
|
||||
memcpy(&vcpu->arch.guest_fpu.state.fxsave,
|
||||
guest_xsave->region, sizeof(struct i387_fxsave_struct));
|
||||
guest_xsave->region, sizeof(struct fxregs_state));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -6970,7 +6970,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
|
||||
|
||||
int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
|
||||
{
|
||||
struct i387_fxsave_struct *fxsave =
|
||||
struct fxregs_state *fxsave =
|
||||
&vcpu->arch.guest_fpu.state.fxsave;
|
||||
|
||||
memcpy(fpu->fpr, fxsave->st_space, 128);
|
||||
@@ -6987,7 +6987,7 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
|
||||
|
||||
int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
|
||||
{
|
||||
struct i387_fxsave_struct *fxsave =
|
||||
struct fxregs_state *fxsave =
|
||||
&vcpu->arch.guest_fpu.state.fxsave;
|
||||
|
||||
memcpy(fxsave->st_space, fpu->fpr, 128);
|
||||
|
Reference in New Issue
Block a user