Re: [PATCH 3/3] target/i386: Fix duplicated feature name in FEAT_KVM

2023-08-25 Thread Tim Wiederhake 
On Thu, 2023-08-24 at 17:12 +0200, Philippe Mathieu-Daudé wrote:
> On 24/8/23 15:57, Tim Wiederhake wrote:
> > The mistake became apparent as there were two features with the
> > same name
> > in this cpuid leaf. The names are now in line with the
> > documentation from
> > https://kernel.org/doc/html/latest/virt/kvm/x86/cpuid.html
> > 
> 
> Fixes: 642258c6c7 ("kvm: add kvmclock to its second bit")
> ?
> 
Right, added that locally. Thanks!

> > Signed-off-by: Tim Wiederhake 
> > ---
> >   target/i386/cpu.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 0b74d80371..ceb291f8a8 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -852,7 +852,7 @@ FeatureWordInfo
> > feature_word_info[FEATURE_WORDS] = {
> >   [FEAT_KVM] = {
> >   .type = CPUID_FEATURE_WORD,
> >   .feat_names = {
> > -    "kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock",
> > +    "kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock2",
> >   "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-
> > pv-unhalt",
> >   NULL, "kvm-pv-tlb-flush", NULL, "kvm-pv-ipi",
> >   "kvm-poll-control", "kvm-pv-sched-yield", "kvm-
> > asyncpf-int", "kvm-msi-ext-dest-id",
>

Re: [PATCH 3/3] target/i386: Fix duplicated feature name in FEAT_KVM

2023-08-24 Thread Philippe Mathieu-Daudé 

On 24/8/23 15:57, Tim Wiederhake wrote:

The mistake became apparent as there were two features with the same name
in this cpuid leaf. The names are now in line with the documentation from
https://kernel.org/doc/html/latest/virt/kvm/x86/cpuid.html



Fixes: 642258c6c7 ("kvm: add kvmclock to its second bit")
?


Signed-off-by: Tim Wiederhake 
---
  target/i386/cpu.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 0b74d80371..ceb291f8a8 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -852,7 +852,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
  [FEAT_KVM] = {
  .type = CPUID_FEATURE_WORD,
  .feat_names = {
-"kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock",
+"kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock2",
  "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-pv-unhalt",
  NULL, "kvm-pv-tlb-flush", NULL, "kvm-pv-ipi",
  "kvm-poll-control", "kvm-pv-sched-yield", "kvm-asyncpf-int", 
"kvm-msi-ext-dest-id",

[PATCH 3/3] target/i386: Fix duplicated feature name in FEAT_KVM

2023-08-24 Thread Tim Wiederhake 
The mistake became apparent as there were two features with the same name
in this cpuid leaf. The names are now in line with the documentation from
https://kernel.org/doc/html/latest/virt/kvm/x86/cpuid.html

Signed-off-by: Tim Wiederhake 
---
 target/i386/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 0b74d80371..ceb291f8a8 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -852,7 +852,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
 [FEAT_KVM] = {
 .type = CPUID_FEATURE_WORD,
 .feat_names = {
-"kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock",
+"kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock2",
 "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-pv-unhalt",
 NULL, "kvm-pv-tlb-flush", NULL, "kvm-pv-ipi",
 "kvm-poll-control", "kvm-pv-sched-yield", "kvm-asyncpf-int", 
"kvm-msi-ext-dest-id",
-- 
2.39.2