Skip to content

Commit 10f0216

Browse files
Reapply "fix: backport QEMU 10.2.0 hvf fixes"
1 parent d1458ff commit 10f0216

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

accel/hvf/hvf-accel-ops.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,11 @@ static int hvf_init_vcpu(CPUState *cpu)
148148
sigact.sa_handler = dummy_signal;
149149
sigaction(SIG_IPI, &sigact, NULL);
150150

151+
#ifdef __aarch64__
151152
pthread_sigmask(SIG_BLOCK, NULL, &cpu->accel->unblock_ipi_mask);
152153
sigdelset(&cpu->accel->unblock_ipi_mask, SIG_IPI);
154+
cpu->accel->guest_debug_enabled = false;
153155

154-
#ifdef __aarch64__
155156
r = hv_vcpu_create(&cpu->accel->fd,
156157
(hv_vcpu_exit_t **)&cpu->accel->exit, NULL);
157158
#else
@@ -160,8 +161,6 @@ static int hvf_init_vcpu(CPUState *cpu)
160161
assert_hvf_ok(r);
161162
cpu->vcpu_dirty = true;
162163

163-
cpu->accel->guest_debug_enabled = false;
164-
165164
return hvf_arch_init_vcpu(cpu);
166165
}
167166

0 commit comments

Comments
 (0)