On 2/23/26 3:39 PM, Mohamed Mediouni wrote:
For symmetry, save/restore the same set of registers even when not needed.
CR2 save/restore needed as page faults injected to the guest imply modifying
CR2.
Signed-off-by: Mohamed Mediouni <[email protected]>
---
target/i386/hvf/hvf.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index fb039ff7bd..a70f8461b0 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -477,7 +477,19 @@ static void hvf_load_crs(CPUState *cs)
env->cr[0] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR0);
env->cr[3] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR3);
+ env->cr[2] = rreg(cpu->accel->fd, HV_X86_CR2);
}
+
+static void hvf_save_crs(CPUState *cs)
+{
+ X86CPU *x86_cpu = X86_CPU(cpu);
+ CPUX86State *env = &x86_cpu->env;
+
+ wvmcs(cpu->accel->fd, VMCS_GUEST_CR0, env->cr[0]);
+ wvmcs(cpu->accel->fd, VMCS_GUEST_CR3, env->cr[3]);
+ wreg(cs->accel->fd, HV_X86_CR2, env->cr[2]);
+}
+
void hvf_load_regs(CPUState *cs)
{
X86CPU *cpu = X86_CPU(cs);
@@ -794,6 +806,7 @@ static int hvf_handle_vmexit(CPUState *cpu)
decode_instruction(env, &decode);
exec_instruction(env, &decode);
hvf_store_regs(cpu);
+ hvf_save_crs(cpu);
break;
}
break;
@@ -837,6 +850,7 @@ static int hvf_handle_vmexit(CPUState *cpu)
assert(ins_len == decode.len);
exec_instruction(env, &decode);
hvf_store_regs(cpu);
+ hvf_save_crs(cpu);
break;
}
@@ -942,6 +956,7 @@ static int hvf_handle_vmexit(CPUState *cpu)
decode_instruction(env, &decode);
exec_instruction(env, &decode);
hvf_store_regs(cpu);
+ hvf_save_crs(cpu);
break;
}
case EXIT_REASON_TPR: {
This patch doesn't compile.
See a fixing patch I'll let you upstream.
I'm a bit puzzled about how this has been tested though.
If you don't have access to a Mac intel based, you can use a
github-runner for free [1].
[1] https://github.com/second-reality/github-runners
Regards,
Pierrick
From e614f25ca30953815a0c59702ceebfb9465f8030 Mon Sep 17 00:00:00 2001
From: Pierrick Bouvier <[email protected]>
Date: Tue, 3 Mar 2026 10:51:57 -0800
Subject: [PATCH] target/i386/hvf/hvf.c: fix compilation
../target/i386/hvf/hvf.c:476:31: error: use of undeclared identifier 'cpu'
476 | X86CPU *x86_cpu = X86_CPU(cpu);
| ^
../target/i386/hvf/hvf.c:479:24: error: use of undeclared identifier 'cpu'
479 | env->cr[0] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR0);
| ^
../target/i386/hvf/hvf.c:480:24: error: use of undeclared identifier 'cpu'
480 | env->cr[3] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR3);
| ^
../target/i386/hvf/hvf.c:481:23: error: use of undeclared identifier 'cpu'
481 | env->cr[2] = rreg(cpu->accel->fd, HV_X86_CR2);
| ^
../target/i386/hvf/hvf.c:486:31: error: use of undeclared identifier 'cpu'
486 | X86CPU *x86_cpu = X86_CPU(cpu);
| ^
../target/i386/hvf/hvf.c:489:11: error: use of undeclared identifier 'cpu'
489 | wvmcs(cpu->accel->fd, VMCS_GUEST_CR0, env->cr[0]);
| ^
../target/i386/hvf/hvf.c:490:11: error: use of undeclared identifier 'cpu'
490 | wvmcs(cpu->accel->fd, VMCS_GUEST_CR3, env->cr[3]);
| ^
7 errors generated.
Signed-off-by: Pierrick Bouvier <[email protected]>
---
target/i386/hvf/hvf.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index c2475b1a3b2..f5320967087 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -473,21 +473,21 @@ static void hvf_cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
static void hvf_load_crs(CPUState *cs)
{
- X86CPU *x86_cpu = X86_CPU(cpu);
+ X86CPU *x86_cpu = X86_CPU(cs);
CPUX86State *env = &x86_cpu->env;
- env->cr[0] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR0);
- env->cr[3] = rvmcs(cpu->accel->fd, VMCS_GUEST_CR3);
- env->cr[2] = rreg(cpu->accel->fd, HV_X86_CR2);
+ env->cr[0] = rvmcs(cs->accel->fd, VMCS_GUEST_CR0);
+ env->cr[3] = rvmcs(cs->accel->fd, VMCS_GUEST_CR3);
+ env->cr[2] = rreg(cs->accel->fd, HV_X86_CR2);
}
static void hvf_save_crs(CPUState *cs)
{
- X86CPU *x86_cpu = X86_CPU(cpu);
+ X86CPU *x86_cpu = X86_CPU(cs);
CPUX86State *env = &x86_cpu->env;
- wvmcs(cpu->accel->fd, VMCS_GUEST_CR0, env->cr[0]);
- wvmcs(cpu->accel->fd, VMCS_GUEST_CR3, env->cr[3]);
+ wvmcs(cs->accel->fd, VMCS_GUEST_CR0, env->cr[0]);
+ wvmcs(cs->accel->fd, VMCS_GUEST_CR3, env->cr[3]);
wreg(cs->accel->fd, HV_X86_CR2, env->cr[2]);
}
--
2.47.3
