[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] kvm: x86: Use symbols for all xsave field
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 1/5] kvm: x86: Use symbols for all xsave field |
Date: |
Thu, 22 Dec 2011 18:13:46 -0200 |
From: Jan Kiszka <address@hidden>
Field 0 (FCW+FSW) and 1 (FTW+FOP) were hard-coded so far.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 5bfc21f..d2f70f9 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -759,6 +759,8 @@ static int kvm_put_fpu(CPUState *env)
return kvm_vcpu_ioctl(env, KVM_SET_FPU, &fpu);
}
+#define XSAVE_FCW_FSW 0
+#define XSAVE_FTW_FOP 1
#define XSAVE_CWD_RIP 2
#define XSAVE_CWD_RDP 4
#define XSAVE_MXCSR 6
@@ -786,8 +788,8 @@ static int kvm_put_xsave(CPUState *env)
for (i = 0; i < 8; ++i) {
twd |= (!env->fptags[i]) << i;
}
- xsave->region[0] = (uint32_t)(swd << 16) + cwd;
- xsave->region[1] = (uint32_t)(env->fpop << 16) + twd;
+ xsave->region[XSAVE_FCW_FSW] = (uint32_t)(swd << 16) + cwd;
+ xsave->region[XSAVE_FTW_FOP] = (uint32_t)(env->fpop << 16) + twd;
memcpy(&xsave->region[XSAVE_CWD_RIP], &env->fpip, sizeof(env->fpip));
memcpy(&xsave->region[XSAVE_CWD_RDP], &env->fpdp, sizeof(env->fpdp));
memcpy(&xsave->region[XSAVE_ST_SPACE], env->fpregs,
@@ -991,10 +993,10 @@ static int kvm_get_xsave(CPUState *env)
return ret;
}
- cwd = (uint16_t)xsave->region[0];
- swd = (uint16_t)(xsave->region[0] >> 16);
- twd = (uint16_t)xsave->region[1];
- env->fpop = (uint16_t)(xsave->region[1] >> 16);
+ cwd = (uint16_t)xsave->region[XSAVE_FCW_FSW];
+ swd = (uint16_t)(xsave->region[XSAVE_FCW_FSW] >> 16);
+ twd = (uint16_t)xsave->region[XSAVE_FTW_FOP];
+ env->fpop = (uint16_t)(xsave->region[XSAVE_FTW_FOP] >> 16);
env->fpstt = (swd >> 11) & 7;
env->fpus = swd;
env->fpuc = cwd;
--
1.7.6.4
- [Qemu-devel] [PATCH 0/5] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/12/22
- [Qemu-devel] [PATCH 2/5] kvm: x86: Avoid runtime allocation of xsave buffer, Marcelo Tosatti, 2011/12/22
- [Qemu-devel] [PATCH 5/5] enable architectural PMU cpuid leaf for kvm, Marcelo Tosatti, 2011/12/22
- [Qemu-devel] [PATCH 4/5] Set numa topology for max_cpus, Marcelo Tosatti, 2011/12/22
- [Qemu-devel] [PATCH 3/5] kvm: x86: Drop redundant apic base and tpr update from kvm_get_sregs, Marcelo Tosatti, 2011/12/22
- [Qemu-devel] [PATCH 1/5] kvm: x86: Use symbols for all xsave field,
Marcelo Tosatti <=
- Re: [Qemu-devel] [PATCH 0/5] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2011/12/27