From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgEA-0008Vk-VS for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsgE8-00057h-1b for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45627 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgE7-00057Q-O2 for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:51 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Jan 2013 21:56:24 +0100 Message-Id: <1357678594-427-8-git-send-email-afaerber@suse.de> In-Reply-To: <1357678594-427-1-git-send-email-afaerber@suse.de> References: <1357678594-427-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 07/17] target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost The existing -cpu host code simply sets every bit inside svm_features (initializing it to -1), and that makes it impossible to make the enforce/check options work properly when the user asks for SVM features explicitly in the command-line. So, instead of initializing svm_features to -1, use GET_SUPPORTED_CPUID to fill only the bits that are supported by the host (just like we do for all other CPUID feature words inside kvm_cpu_fill_host()). This will keep the existing behavior (as filter_features_for_kvm() already uses GET_SUPPORTED_CPUID to filter svm_features), but will allow us to properly check for KVM features inside kvm_check_features_against_host() later. For example, we will be able to make this: $ qemu-system-x86_64 -cpu ...,+pfthreshold,enforce refuse to start if the SVM "pfthreshold" feature is not supported by the host (after we fix kvm_check_features_against_host() to check SVM flags as well). Signed-off-by: Eduardo Habkost Reviewed-by: Gleb Natapov Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 11 ++++------- 1 Datei ge=C3=A4ndert, 4 Zeilen hinzugef=C3=BCgt(+), 7 Zeilen entfernt(-= ) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 82685dc..1e30015 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -897,13 +897,10 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_de= f) } } =20 - /* - * Every SVM feature requires emulation support in KVM - so we can't= just - * read the host features here. KVM might even support SVM features = not - * available on the host hardware. Just set all bits and mask out th= e - * unsupported ones later. - */ - x86_cpu_def->svm_features =3D -1; + /* Other KVM-specific feature fields: */ + x86_cpu_def->svm_features =3D + kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX); + #endif /* CONFIG_KVM */ } =20 --=20 1.7.10.4