]> git.proxmox.com Git - qemu.git/commit - target-i386/cpu.c
target-i386: cpu: fix --disable-kvm compilation
authorEduardo Habkost <ehabkost@redhat.com>
Fri, 2 Nov 2012 16:25:15 +0000 (14:25 -0200)
committerAndreas Färber <afaerber@suse.de>
Fri, 2 Nov 2012 16:55:29 +0000 (17:55 +0100)
commite4ab0d6b0d1118a90238d8194eedb91aab15ebe1
treebd748ddd30318c984206639b806765748d156558
parent4ba79505f43bd0ace35c3fe42197eb02e7e0478e
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>
target-i386/cpu.c