From 4e2f73ce3d70083dacb99815c9633af48aae32b4 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 25 Aug 2009 18:13:36 -0400 Subject: [PATCH] do not issue ioctl from within the io thread According to Documentation/kvm/api.txt, (and well, to common sense), we should not be calling vcpu ioctls from within the iothread. Since vcpu initialization issues a vcpu ioctl, move it a little bit further in time to prevent it. Signed-off-by: Glauber Costa Signed-off-by: Anthony Liguori --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 4f75d9b564..dd5eebfe9c 100644 --- a/vl.c +++ b/vl.c @@ -3749,6 +3749,7 @@ static void *kvm_cpu_thread_fn(void *arg) block_io_signals(); qemu_thread_self(env->thread); + kvm_init_vcpu(env); /* signal CPU creation */ qemu_mutex_lock(&qemu_global_mutex); @@ -3944,7 +3945,6 @@ static void tcg_init_vcpu(void *_env) static void kvm_start_vcpu(CPUState *env) { - kvm_init_vcpu(env); env->thread = qemu_mallocz(sizeof(QemuThread)); env->halt_cond = qemu_mallocz(sizeof(QemuCond)); qemu_cond_init(env->halt_cond); -- 2.30.2