63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From 9d654537f0f667a36eb45d80fda283b31ace3d39 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:44 +0200
|
|
Subject: [PATCH 017/115] i386: Remove unused parameter "uint32_t bit" in
|
|
feature_word_description()
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [17/115] 37ee215225ee0757e51718df4548d4a43fe09e99 (bonzini/rhel-qemu-kvm)
|
|
|
|
Parameter "uint32_t bit" is not used in function feature_word_description(),
|
|
so remove it.
|
|
|
|
Signed-off-by: Lei Wang <lei4.wang@intel.com>
|
|
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Message-ID: <20241217123932.948789-2-xiaoyao.li@intel.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit bab32b8b4bf9da5d13386c8faa5a9389e63244b7)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/cpu.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index a97d042a2e..32e89f1a5c 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -5897,7 +5897,7 @@ static const TypeInfo max_x86_cpu_type_info = {
|
|
.class_init = max_x86_cpu_class_init,
|
|
};
|
|
|
|
-static char *feature_word_description(FeatureWordInfo *f, uint32_t bit)
|
|
+static char *feature_word_description(FeatureWordInfo *f)
|
|
{
|
|
assert(f->type == CPUID_FEATURE_WORD || f->type == MSR_FEATURE_WORD);
|
|
|
|
@@ -5936,6 +5936,7 @@ static void mark_unavailable_features(X86CPU *cpu, FeatureWord w, uint64_t mask,
|
|
CPUX86State *env = &cpu->env;
|
|
FeatureWordInfo *f = &feature_word_info[w];
|
|
int i;
|
|
+ g_autofree char *feat_word_str = feature_word_description(f);
|
|
|
|
if (!cpu->force_features) {
|
|
env->features[w] &= ~mask;
|
|
@@ -5948,7 +5949,6 @@ static void mark_unavailable_features(X86CPU *cpu, FeatureWord w, uint64_t mask,
|
|
|
|
for (i = 0; i < 64; ++i) {
|
|
if ((1ULL << i) & mask) {
|
|
- g_autofree char *feat_word_str = feature_word_description(f, i);
|
|
warn_report("%s: %s%s%s [bit %d]",
|
|
verbose_prefix,
|
|
feat_word_str,
|
|
--
|
|
2.50.1
|
|
|