diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-02 13:05:38 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-02 13:05:38 -0500 |
| commit | 1ef2a82e8f60779bebdae59f7dad8205cc93db30 (patch) | |
| tree | 6cea1edef0ae229a21fc4031c371a1f82166c969 | |
| parent | 1d8ddda045b4b72dc95a325debb6df0fc19ec821 (diff) | |
| parent | e4ab0d6b0d1118a90238d8194eedb91aab15ebe1 (diff) | |
| download | qemu-1ef2a82e8f60779bebdae59f7dad8205cc93db30.tar.gz | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* afaerber/qom-cpu:
target-i386: cpu: fix --disable-kvm compilation
| -rw-r--r-- | target-i386/cpu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c46286ab3e..e1db639295 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -758,6 +758,7 @@ static x86_def_t builtin_x86_defs[] = { }, }; +#ifdef CONFIG_KVM static int cpu_x86_fill_model_id(char *str) { 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; } +#endif /* Fill a x86_def_t struct with information about the host CPU, and * 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) { +#ifdef CONFIG_KVM KVMState *s = kvm_state; 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. */ x86_cpu_def->svm_features = -1; +#endif /* CONFIG_KVM */ } static int unavailable_host_feature(struct model_features_t *f, uint32_t mask) |