From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgEE-0000GJ-Qv for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsgED-00059h-KQ for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:58 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45641 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgED-00059Y-8A for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:57 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Jan 2013 21:56:30 +0100 Message-Id: <1357678594-427-14-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 13/17] 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: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Now that all entries have check_feat=3D~0 in 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 Reviewed-by: Gleb Natapov Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 14 ++++++-------- 1 Datei ge=C3=A4ndert, 6 Zeilen hinzugef=C3=BCgt(+), 8 Zeilen entfernt(-= ) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 535cd52..951e206 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -148,7 +148,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; @@ -945,8 +944,7 @@ static int unavailable_host_feature(struct model_feat= ures_t *f, uint32_t mask) } =20 /* 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 flag= s. + * their way to the guest. * * This function may be called only if KVM is enabled. */ @@ -957,13 +955,13 @@ static int kvm_check_features_against_host(x86_def_= t *guest_def) int rv, i; struct model_features_t ft[] =3D { {&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} }; =20 assert(kvm_enabled()); @@ -971,7 +969,7 @@ static int kvm_check_features_against_host(x86_def_t = *guest_def) kvm_cpu_fill_host(&host_def); for (rv =3D 0, i =3D 0; i < ARRAY_SIZE(ft); ++i) for (mask =3D 1; mask; mask <<=3D 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 =3D 1; --=20 1.7.10.4