From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr9Jg-0003w6-VF for qemu-devel@nongnu.org; Fri, 04 Jan 2013 10:36:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tr9Je-0004cP-39 for qemu-devel@nongnu.org; Fri, 04 Jan 2013 10:36:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr9Jd-0004c5-R2 for qemu-devel@nongnu.org; Fri, 04 Jan 2013 10:36:14 -0500 From: Eduardo Habkost Date: Fri, 4 Jan 2013 13:37:42 -0200 Message-Id: <1357313864-31026-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357313864-31026-1-git-send-email-ehabkost@redhat.com> References: <1357313864-31026-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 7/9] target-i386: check/enforce: Eliminate check_feat field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: libvir-list@redhat.com, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kvm@vger.kernel.org Now that all entries have check_feat=~0 on kvm_check_features_against_host(), we can eliminate check_feat entirely and make the code check all bits. This patch shouldn't introduce any behavior change, as check_feat is set to ~0 on all entries. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 21aceed..05134a8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -147,7 +147,6 @@ const char *get_register_name_32(unsigned int reg) typedef struct model_features_t { uint32_t *guest_feat; uint32_t *host_feat; - uint32_t check_feat; const char **flag_names; uint32_t cpuid; int reg; @@ -951,8 +950,7 @@ static int unavailable_host_feature(struct model_features_t *f, uint32_t mask) } /* best effort attempt to inform user requested cpu flags aren't making - * their way to the guest. Note: ft[].check_feat ideally should be - * specified via a guest_def field to suppress report of extraneous flags. + * their way to the guest. * * This function may be called only if KVM is enabled. */ @@ -963,20 +961,20 @@ static int kvm_check_features_against_host(x86_def_t *guest_def) int rv, i; struct model_features_t ft[] = { {&guest_def->features, &host_def.features, - ~0, feature_name, 0x00000001, R_EDX}, + feature_name, 0x00000001, R_EDX}, {&guest_def->ext_features, &host_def.ext_features, - ~0, ext_feature_name, 0x00000001, R_ECX}, + ext_feature_name, 0x00000001, R_ECX}, {&guest_def->ext2_features, &host_def.ext2_features, - ~0, ext2_feature_name, 0x80000001, R_EDX}, + ext2_feature_name, 0x80000001, R_EDX}, {&guest_def->ext3_features, &host_def.ext3_features, - ~0, ext3_feature_name, 0x80000001, R_ECX}}; + ext3_feature_name, 0x80000001, R_ECX}}; assert(kvm_enabled()); kvm_cpu_fill_host(&host_def); for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i) for (mask = 1; mask; mask <<= 1) - if (ft[i].check_feat & mask && *ft[i].guest_feat & mask && + if (*ft[i].guest_feat & mask && !(*ft[i].host_feat & mask)) { unavailable_host_feature(&ft[i], mask); rv = 1; -- 1.7.11.7