[PATCH 0/2] Clean up and enhance of feature_word_description()

[PATCH 0/2] Clean up and enhance of feature_word_description()

[Xiaoyao Li]

This series grabs two patches related to feature_word_description() from
two different old threads, they are simple and straightforward. 

Patch 1 is grabbed from [1] while patch 2 is grabbed from [2].

[1]: https://lore.kernel.org/qemu-devel/20230106083826.5384-3-lei4.wang@intel.com/
[2]: https://lore.kernel.org/qemu-devel/20220808085834.3227541-2-xiaoyao.li@intel.com/

Lei Wang (1):
  i386: Remove unused parameter "uint32_t bit" in
    feature_word_description()

Xiaoyao Li (1):
  target/i386: Print CPUID subleaf info for unsupported feature

 target/i386/cpu.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

-- 
2.34.1

[PATCH 1/2] i386: Remove unused parameter "uint32_t bit" in feature_word_description()

[Xiaoyao Li]

From: Lei Wang <lei4.wang@intel.com>

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>
---
 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 525339945920..d09e2f868c35 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5451,7 +5451,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);
 
@@ -5490,6 +5490,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;
@@ -5502,7 +5503,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.34.1

Re: [PATCH 1/2] i386: Remove unused parameter "uint32_t bit" in feature_word_description()

[Zhao Liu]

On Tue, Dec 17, 2024 at 07:39:31AM -0500, Xiaoyao Li wrote:
> Date: Tue, 17 Dec 2024 07:39:31 -0500
> From: Xiaoyao Li <xiaoyao.li@intel.com>
> Subject: [PATCH 1/2] i386: Remove unused parameter "uint32_t bit" in
>  feature_word_description()
> X-Mailer: git-send-email 2.34.1
> 
> From: Lei Wang <lei4.wang@intel.com>
> 
> 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>
> ---
>  target/i386/cpu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

[PATCH 2/2] target/i386: Print CPUID subleaf info for unsupported feature

[Xiaoyao Li]

Some CPUID leaves have meaningful subleaf index. Print the subleaf info
in feature_word_description for CPUID features.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
---
 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 d09e2f868c35..3a697834e3ad 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5460,8 +5460,9 @@ static char *feature_word_description(FeatureWordInfo *f)
         {
             const char *reg = get_register_name_32(f->cpuid.reg);
             assert(reg);
-            return g_strdup_printf("CPUID.%02XH:%s",
-                                   f->cpuid.eax, reg);
+            return g_strdup_printf("CPUID.%02XH_%02XH:%s",
+                                   f->cpuid.eax,
+                                   f->cpuid.needs_ecx ? f->cpuid.ecx : 0, reg);
         }
     case MSR_FEATURE_WORD:
         return g_strdup_printf("MSR(%02XH)",
-- 
2.34.1

Re: [PATCH 2/2] target/i386: Print CPUID subleaf info for unsupported feature

[Zhao Liu]

On Tue, Dec 17, 2024 at 07:39:32AM -0500, Xiaoyao Li wrote:
> Date: Tue, 17 Dec 2024 07:39:32 -0500
> From: Xiaoyao Li <xiaoyao.li@intel.com>
> Subject: [PATCH 2/2] target/i386: Print CPUID subleaf info for unsupported
>  feature
> X-Mailer: git-send-email 2.34.1
> 
> Some CPUID leaves have meaningful subleaf index. Print the subleaf info
> in feature_word_description for CPUID features.
> 
> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  target/i386/cpu.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

Re: [PATCH 0/2] Clean up and enhance of feature_word_description()

[Xiaoyao Li]

On 12/17/2024 8:39 PM, Xiaoyao Li wrote:
> This series grabs two patches related to feature_word_description() from
> two different old threads, they are simple and straightforward.
> 
> Patch 1 is grabbed from [1] while patch 2 is grabbed from [2].

Ping...

> [1]: https://lore.kernel.org/qemu-devel/20230106083826.5384-3-lei4.wang@intel.com/
> [2]: https://lore.kernel.org/qemu-devel/20220808085834.3227541-2-xiaoyao.li@intel.com/
> 
> Lei Wang (1):
>    i386: Remove unused parameter "uint32_t bit" in
>      feature_word_description()
> 
> Xiaoyao Li (1):
>    target/i386: Print CPUID subleaf info for unsupported feature
> 
>   target/i386/cpu.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 

Re: [PATCH 0/2] Clean up and enhance of feature_word_description()

[Paolo Bonzini]

On 1/13/25 09:04, Xiaoyao Li wrote:
> On 12/17/2024 8:39 PM, Xiaoyao Li wrote:
>> This series grabs two patches related to feature_word_description() from
>> two different old threads, they are simple and straightforward.
>>
>> Patch 1 is grabbed from [1] while patch 2 is grabbed from [2].
> 
> Ping...

Applied, thanks---with a slightly fancier formatting for patch 2:

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 8589391023d..446924be90f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5780,12 +5780,15 @@ static char *feature_word_description(FeatureWordInfo *f)
          {
              const char *reg = get_register_name_32(f->cpuid.reg);
              assert(reg);
-            return g_strdup_printf("CPUID.%02XH_%02XH:%s",
-                                   f->cpuid.eax,
-                                   f->cpuid.needs_ecx ? f->cpuid.ecx : 0, reg);
+            if (!f->cpuid.needs_ecx) {
+                return g_strdup_printf("CPUID[eax=%02Xh].%s", f->cpuid.eax, reg);
+            } else {
+                return g_strdup_printf("CPUID[eax=%02Xh,ecx=%02Xh].%s",
+                                       f->cpuid.eax, f->cpuid.ecx : 0, reg);
+            }
          }
      case MSR_FEATURE_WORD:
-        return g_strdup_printf("MSR(%02XH)",
+        return g_strdup_printf("MSR(%02Xh)",
                                 f->msr.index);
      }
  

Paolo