From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdUS-0005nP-Ro for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPdUM-0005aF-Sk for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdUM-0005aB-Kw for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:22 -0400 From: Eduardo Habkost Date: Mon, 17 Mar 2014 16:45:00 -0300 Message-Id: <1395085507-5544-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1395085507-5544-1-git-send-email-ehabkost@redhat.com> References: <1395085507-5544-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH qom-cpu v2 03/10] target-i386: Pass FeatureWord argument to report_unavailable_features() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Igor Mammedov , Paolo Bonzini , Aurelien Jarno , Richard Henderson This will help us simplify the code that calls report_unavailable_features() later. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Rebase to latest qom-cpu (commit 90c5d39c) --- target-i386/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a704541..5b8e0de 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1230,8 +1230,9 @@ static const TypeInfo host_x86_cpu_type_info = { #endif -static int report_unavailable_features(FeatureWordInfo *f, uint32_t mask) +static int report_unavailable_features(FeatureWord w, uint32_t mask) { + FeatureWordInfo *f = &feature_word_info[w]; int i; for (i = 0; i < 32; ++i) { @@ -1831,7 +1832,7 @@ static int filter_features_for_kvm(X86CPU *cpu) cpu->filtered_features[w] = requested_features & ~env->features[w]; if (cpu->filtered_features[w]) { if (cpu->check_cpuid || cpu->enforce_cpuid) { - report_unavailable_features(wi, cpu->filtered_features[w]); + report_unavailable_features(w, cpu->filtered_features[w]); } rv = 1; } -- 1.8.5.3