From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5Huq-00027z-Q7 for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:41:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5Huj-0001Ul-F0 for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:41:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5Huj-0001UK-7E for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:41:29 -0500 From: Eduardo Habkost Date: Mon, 20 Jan 2014 14:41:09 -0200 Message-Id: <1390236074-21533-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1390236074-21533-1-git-send-email-ehabkost@redhat.com> References: <1390236074-21533-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] target-i386: kvm_cpu_fill_host(): No need to check level List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" There's no need to check level (CPUID[0].EAX) before calling kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX), because: * The kernel won't return any entry for CPUID 7 if CPUID[0].EAX is < 7 (See kvm_dev_ioctl_get_supported_cpuid() on the kernel code); * kvm_arch_get_supported_cpuid() will return 0 if no entry is returned by the kernel for the requested leaf. This will simplify the kvm_cpu_fill_host() code a little. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6f27273..aec0107 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1161,12 +1161,8 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) x86_cpu_def->features[FEAT_1_ECX] = kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX); - if (x86_cpu_def->level >= 7) { - x86_cpu_def->features[FEAT_7_0_EBX] = - kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX); - } else { - x86_cpu_def->features[FEAT_7_0_EBX] = 0; - } + x86_cpu_def->features[FEAT_7_0_EBX] = + kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX); x86_cpu_def->xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX); x86_cpu_def->features[FEAT_8000_0001_EDX] = -- 1.8.4.2