From patchwork Fri Jan 4 22:01:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 209553 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 2CC5E2C0087 for ; Sat, 5 Jan 2013 09:00:02 +1100 (EST) Received: from localhost ([::1]:57435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFJ2-0001yl-BE for incoming@patchwork.ozlabs.org; Fri, 04 Jan 2013 17:00:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFIn-0001xt-Cj for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrFIj-00055K-Sn for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrFIj-00053k-Jp for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:59:41 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r04LxeZs007213 (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-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r04LxZEh004525; Fri, 4 Jan 2013 16:59:35 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 260C7203D30; Fri, 4 Jan 2013 20:01:14 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 4 Jan 2013 20:01:05 -0200 Message-Id: <1357336872-7200-5-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.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org, Gleb Natapov , "Michael S. Tsirkin" , libvir-list@redhat.com, Marcelo Tosatti , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 04/11] target-i386: kvm: Enable all supported KVM features for -cpu host 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 When using -cpu host, we don't need to use the kvm_default_features variable, as the user is explicitly asking QEMU to enable all feature supported by the host. This changes the kvm_cpu_fill_host() code to use GET_SUPPORTED_CPUID to initialize the kvm_features field, so we get all host KVM features enabled. This will also allow use to properly check/enforce KVM features inside kvm_check_features_against_host() later. For example, we will be able to make this: $ qemu-system-x86_64 -cpu ...,+kvm_pv_eoi,enforce refuse to start if kvm_pv_eoi is not supported by the host (after we fix kvm_check_features_against_host() to check KVM flags as well). Signed-off-by: Eduardo Habkost Reviewed-by: Gleb Natapov --- Changes v2: - Coding style (indentation) fix Cc: Gleb Natapov Cc: Michael S. Tsirkin Cc: Marcelo Tosatti Cc: kvm@vger.kernel.org --- target-i386/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c49a97c..e916ae0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -911,6 +911,8 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) /* Other KVM-specific feature fields: */ x86_cpu_def->svm_features = kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX); + x86_cpu_def->kvm_features = + kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX); #endif /* CONFIG_KVM */ }