@@ -40,6 +40,16 @@
#include "sysbus.h"
#include "sysemu.h"
#include "blockdev.h"
+#include "kvm.h"
+
+
+#ifdef TARGET_X86_64
+#define DEFAULT_KVM_CPU_MODEL "kvm64"
+#define DEFAULT_QEMU_CPU_MODEL "qemu64"
+#else
+#define DEFAULT_KVM_CPU_MODEL "kvm32"
+#define DEFAULT_QEMU_CPU_MODEL "qemu32"
+#endif
/* output Bochs bios info messages */
//#define DEBUG_BIOS
@@ -867,11 +877,11 @@ void pc_cpus_init(const char *cpu_model)
/* init CPUs */
if (cpu_model == NULL) {
-#ifdef TARGET_X86_64
- cpu_model = "qemu64";
-#else
- cpu_model = "qemu32";
-#endif
+ if (kvm_enabled()) {
+ cpu_model = DEFAULT_KVM_CPU_MODEL;
+ } else {
+ cpu_model = DEFAULT_QEMU_CPU_MODEL;
+ }
}
for(i = 0; i < smp_cpus; i++) {