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

[Paolo Bonzini <pbonzini@redhat.com>]

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