From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAMYb-0005a1-V7 for qemu-devel@nongnu.org; Mon, 03 Feb 2014 11:39:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAMYT-0006IY-81 for qemu-devel@nongnu.org; Mon, 03 Feb 2014 11:39:37 -0500 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:35627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAMYT-0006I9-0o for qemu-devel@nongnu.org; Mon, 03 Feb 2014 11:39:29 -0500 Received: by mail-ea0-f178.google.com with SMTP id a15so3839037eae.37 for ; Mon, 03 Feb 2014 08:39:28 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 3 Feb 2014 17:38:59 +0100 Message-Id: <1391445551-6561-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1391445551-6561-1-git-send-email-pbonzini@redhat.com> References: <1391445551-6561-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/16] target-i386: kvm_cpu_fill_host(): No need to check xlevel2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost From: Eduardo Habkost There's no need to check CPU xlevel2 before calling kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX), because: * The kernel won't return any entry for 0xC0000000 if host CPU vendor is not Centaur (See kvm_dev_ioctl_get_supported_cpuid() on the kernel code) * Similarly, the kernel won't return any entry for 0xC0000001 if CPUID[0xC0000000].EAX is < 0xC0000001 * kvm_arch_get_supported_cpuid() will return 0 if no entry is returned by the kernel for the requested leaf For similar reasons, we can simply set x86_cpu_def->xlevel2 directly instead of making it conditional, because it will be set to 0 CPU vendor is not Centaur. This will simplify the kvm_cpu_fill_host() code a little. Signed-off-by: Eduardo Habkost [Remove unparseable comment. - Paolo] Signed-off-by: Paolo Bonzini --- target-i386/cpu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1e115cf..5c3817c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1177,13 +1177,10 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) cpu_x86_fill_model_id(x86_cpu_def->model_id); /* Call Centaur's CPUID instruction. */ - eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); - if (eax >= 0xC0000001) { - /* Support VIA max extended level */ - x86_cpu_def->xlevel2 = eax; - x86_cpu_def->features[FEAT_C000_0001_EDX] = - kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX); - } + x86_cpu_def->xlevel2 = + kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); + x86_cpu_def->features[FEAT_C000_0001_EDX] = + kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX); /* Other KVM-specific feature fields: */ x86_cpu_def->features[FEAT_SVM] = -- 1.8.3.1