From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd8p-00051T-7f for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tkd8n-0001qI-5m for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd8m-0001q8-N7 for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:05 -0500 From: Igor Mammedov Date: Mon, 17 Dec 2012 17:01:20 +0100 Message-Id: <1355760092-18755-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1355760092-18755-1-git-send-email-imammedo@redhat.com> References: <1355760092-18755-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 08/20] target-i386: compile kvm only functions if CONFIG_KVM is defined List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Don@CloudSwitch.com, ehabkost@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 418c899..24bfd95 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -862,7 +862,6 @@ 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 @@ -871,7 +870,6 @@ 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; @@ -930,7 +928,6 @@ 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) @@ -981,6 +978,7 @@ static int kvm_check_features_against_host(x86_def_t *guest_def) } return rv; } +#endif /* CONFIG_KVM */ static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -1273,7 +1271,9 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) } } if (kvm_enabled() && name && strcmp(name, "host") == 0) { +#ifdef CONFIG_KVM kvm_cpu_fill_host(x86_cpu_def); +#endif } else if (!def) { return -1; } else { @@ -1428,10 +1428,12 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) x86_cpu_def->kvm_features &= ~minus_kvm_features; x86_cpu_def->svm_features &= ~minus_svm_features; x86_cpu_def->cpuid_7_0_ebx_features &= ~minus_7_0_ebx_features; +#ifdef CONFIG_KVM if (check_cpuid && kvm_enabled()) { if (kvm_check_features_against_host(x86_cpu_def) && enforce_cpuid) goto error; } +#endif return 0; error: -- 1.7.1