From patchwork Fri Jan 4 22:01:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 209554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0023C2C0087 for ; Sat, 5 Jan 2013 09:00:10 +1100 (EST) Received: from localhost ([::1]:57951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFJ7-0002Ga-IB for incoming@patchwork.ozlabs.org; Fri, 04 Jan 2013 17:00:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFIo-0001y1-8J for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrFIk-00056h-F8 for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFIk-00055c-9k for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:42 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r04LxfS6007836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jan 2013 16:59:41 -0500 Received: from blackpad.lan.raisama.net (vpn1-7-13.gru2.redhat.com [10.97.7.13]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r04LxZQe008180; Fri, 4 Jan 2013 16:59:36 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 938F3203D48; Fri, 4 Jan 2013 20:01:14 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 4 Jan 2013 20:01:11 -0200 Message-Id: <1357336872-7200-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357336872-7200-1-git-send-email-ehabkost@redhat.com> References: <1357336872-7200-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: libvir-list@redhat.com, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH qom-cpu 10/11] target-i386: Call kvm_check_features_against_host() only if CONFIG_KVM is set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This will be necessary once kvm_check_features_against_host() starts using KVM-specific definitions (so it won't compile anymore if CONFIG_KVM is not set). Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1c3c7e1..876b0f6 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -936,6 +936,7 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) #endif /* CONFIG_KVM */ } +#ifdef CONFIG_KVM static int unavailable_host_feature(struct model_features_t *f, uint32_t mask) { int i; @@ -987,6 +988,7 @@ static int kvm_check_features_against_host(x86_def_t *guest_def) } return rv; } +#endif static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -1410,10 +1412,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: