Am 02.11.2012 17:25, schrieb Eduardo Habkost:
> 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@xxxxxxx>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
Acked-by: Andreas Färber <afaerber@xxxxxxx>
If no one objects to this solution, unless Marcelo or Avi beat me, I'll
send out an urgent pull request as requested by Anthony.
Thanks,
Andreas
> ---
> target-i386/cpu.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index c46286a..e1db639 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)
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
