[Qemu-devel] [PATCH 2/2] hook into vcpu creation

[Glauber Costa]

Allow kvm to override vcpu creation. We need to grab
a minimal amount of code that is shared, but the big
part is highly kvm/tcg specific.

Signed-off-by: Glauber Costa <address@hidden>
---
 kvm-all.c            |   18 ++++++++++++++----
 kvm.h                |    2 +-
 target-i386/helper.c |   12 +++++++++---
 target-i386/kvm.c    |    5 +++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index a279d6c..ebad664 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -104,12 +104,19 @@ static int kvm_set_user_memory_region(KVMState *s, 
KVMSlot *slot)
 }
 
 
-int kvm_init_vcpu(CPUState *env)
+CPUState *kvm_init_vcpu(const char *cpu_model)
 {
     KVMState *s = kvm_state;
     long mmap_size;
     int ret;
 
+    CPUState *env = qemu_mallocz(sizeof(*env));
+    if (!env)
+        return NULL;
+
+    cpu_exec_init(env);
+    env->cpu_model_str = cpu_model;
+
     dprintf("kvm_init_vcpu\n");
 
     ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, env->cpu_index);
@@ -135,10 +142,13 @@ int kvm_init_vcpu(CPUState *env)
         goto err;
     }
 
-    ret = kvm_arch_init_vcpu(env);
-
+    if (kvm_arch_init_vcpu(env))
+        goto err;
+    
+    return env;
 err:
-    return ret;
+    qemu_free(env);
+    return NULL;
 }
 
 int kvm_sync_vcpus(void)
diff --git a/kvm.h b/kvm.h
index efce145..4ea679f 100644
--- a/kvm.h
+++ b/kvm.h
@@ -30,7 +30,7 @@ struct kvm_run;
 
 int kvm_init(int smp_cpus);
 
-int kvm_init_vcpu(CPUState *env);
+CPUState *kvm_init_vcpu(const char *cpu_model);
 int kvm_sync_vcpus(void);
 
 int kvm_cpu_exec(CPUState *env);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 1389a0a..d8bed46 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1607,7 +1607,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
     }
 }
 
-CPUX86State *cpu_x86_init(const char *cpu_model)
+CPUX86State *cpu_x86_default_init(const char *cpu_model)
 {
     CPUX86State *env;
     static int inited;
@@ -1635,7 +1635,13 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
 #ifdef USE_KQEMU
     kqemu_init(env);
 #endif
-    if (kvm_enabled())
-        kvm_init_vcpu(env);
     return env;
 }
+
+CPUX86State *cpu_x86_init(const char *cpu_model)
+{
+    if (kvm_enabled())
+        return kvm_init_vcpu(cpu_model);
+    else
+        return cpu_x86_default_init(cpu_model);
+}
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 2412ae4..08a4416 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -44,6 +44,11 @@ int kvm_arch_init_vcpu(CPUState *env)
 
     cpuid_i = 0;
 
+    if (cpu_x86_register(env) < 0) {
+        cpu_x86_close(env);
+        return -1;
+    }
+
     cpu_x86_cpuid(env, 0, &eax, &ebx, &ecx, &edx);
     limit = eax;
 
-- 
1.5.6.5