target-i386: cpu: fix --disable-kvm compilation
This fixes the following: target-i386/cpu.o: In function `kvm_cpu_fill_host': target-i386/cpu.c:783: undefined reference to `kvm_state' I didn't notice the problem before because GCC was optimizing the entire kvm_cpu_fill_host() function out (because all calls are conditional on kvm_enabled()). * cpu_x86_fill_model_id() is used only if CONFIG_KVM is set, so #ifdef it entirely to avoid compiler warnings. * kvm_cpu_fill_host() should be called only if KVM is enabled, so use #ifdef CONFIG_KVM around the entire function body. Reported-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
4ba79505f4
commit
e4ab0d6b0d
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue