OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

* afaerber/qom-cpu:
  target-i386: cpu: fix --disable-kvm compilation
This commit is contained in:
Anthony Liguori 2012-11-02 13:05:38 -05:00
commit 1ef2a82e8f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-i386/cpu.c
View File

@ -758,6 +758,7 @@ static x86_def_t builtin_x86_defs[] = {
}, },
}; };
#ifdef CONFIG_KVM
static int cpu_x86_fill_model_id(char *str) static int cpu_x86_fill_model_id(char *str)
{ {
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0; uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
@ -772,6 +773,7 @@ static int cpu_x86_fill_model_id(char *str)
} }
return 0; return 0;
} }
#endif
/* Fill a x86_def_t struct with information about the host CPU, and /* Fill a x86_def_t struct with information about the host CPU, and
* the CPU features supported by the host hardware + host kernel * the CPU features supported by the host hardware + host kernel
@ -780,6 +782,7 @@ static int cpu_x86_fill_model_id(char *str)
*/ */
static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
{ {
#ifdef CONFIG_KVM
KVMState *s = kvm_state; KVMState *s = kvm_state;
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0; uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
@ -838,6 +841,7 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
* unsupported ones later. * unsupported ones later.
*/ */
x86_cpu_def->svm_features = -1; x86_cpu_def->svm_features = -1;
#endif /* CONFIG_KVM */
} }
static int unavailable_host_feature(struct model_features_t *f, uint32_t mask) static int unavailable_host_feature(struct model_features_t *f, uint32_t mask)