| Message ID | 20200910070131.435543-7-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | misc: Some inclusive terminology changes | expand |
On 10/09/2020 09.01, Philippe Mathieu-Daudé wrote: > In order to use inclusive terminology, rename host_tsx_blacklisted() > as host_tsx_broken(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/i386/kvm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/i386/kvm.c b/target/i386/kvm.c > index 205b68bc0ce..3d640a8decf 100644 > --- a/target/i386/kvm.c > +++ b/target/i386/kvm.c > @@ -302,7 +302,7 @@ static int get_para_features(KVMState *s) > return features; > } > > -static bool host_tsx_blacklisted(void) > +static bool host_tsx_broken(void) > { > int family, model, stepping;\ > char vendor[CPUID_VENDOR_SZ + 1]; > @@ -408,7 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, > } else if (function == 6 && reg == R_EAX) { > ret |= CPUID_6_EAX_ARAT; /* safe to allow because of emulated APIC */ > } else if (function == 7 && index == 0 && reg == R_EBX) { > - if (host_tsx_blacklisted()) { > + if (host_tsx_broken()) { > ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); > } > } else if (function == 7 && index == 0 && reg == R_EDX) { > Looking at commit 40e80ee4113, the term "broken" seems to be a good replacement here. Reviewed-by: Thomas Huth <thuth@redhat.com>
On 10/09/20 09:08, Thomas Huth wrote: > On 10/09/2020 09.01, Philippe Mathieu-Daudé wrote: >> In order to use inclusive terminology, rename host_tsx_blacklisted() >> as host_tsx_broken(). >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> target/i386/kvm.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/target/i386/kvm.c b/target/i386/kvm.c >> index 205b68bc0ce..3d640a8decf 100644 >> --- a/target/i386/kvm.c >> +++ b/target/i386/kvm.c >> @@ -302,7 +302,7 @@ static int get_para_features(KVMState *s) >> return features; >> } >> >> -static bool host_tsx_blacklisted(void) >> +static bool host_tsx_broken(void) >> { >> int family, model, stepping;\ >> char vendor[CPUID_VENDOR_SZ + 1]; >> @@ -408,7 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, >> } else if (function == 6 && reg == R_EAX) { >> ret |= CPUID_6_EAX_ARAT; /* safe to allow because of emulated APIC */ >> } else if (function == 7 && index == 0 && reg == R_EBX) { >> - if (host_tsx_blacklisted()) { >> + if (host_tsx_broken()) { >> ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); >> } >> } else if (function == 7 && index == 0 && reg == R_EDX) { >> > > Looking at commit 40e80ee4113, the term "broken" seems to be a good > replacement here. > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Le 10/09/2020 à 09:01, Philippe Mathieu-Daudé a écrit : > In order to use inclusive terminology, rename host_tsx_blacklisted() > as host_tsx_broken(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/i386/kvm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/i386/kvm.c b/target/i386/kvm.c > index 205b68bc0ce..3d640a8decf 100644 > --- a/target/i386/kvm.c > +++ b/target/i386/kvm.c > @@ -302,7 +302,7 @@ static int get_para_features(KVMState *s) > return features; > } > > -static bool host_tsx_blacklisted(void) > +static bool host_tsx_broken(void) > { > int family, model, stepping;\ > char vendor[CPUID_VENDOR_SZ + 1]; > @@ -408,7 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, > } else if (function == 6 && reg == R_EAX) { > ret |= CPUID_6_EAX_ARAT; /* safe to allow because of emulated APIC */ > } else if (function == 7 && index == 0 && reg == R_EBX) { > - if (host_tsx_blacklisted()) { > + if (host_tsx_broken()) { > ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); > } > } else if (function == 7 && index == 0 && reg == R_EDX) { > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 205b68bc0ce..3d640a8decf 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -302,7 +302,7 @@ static int get_para_features(KVMState *s) return features; } -static bool host_tsx_blacklisted(void) +static bool host_tsx_broken(void) { int family, model, stepping;\ char vendor[CPUID_VENDOR_SZ + 1]; @@ -408,7 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, } else if (function == 6 && reg == R_EAX) { ret |= CPUID_6_EAX_ARAT; /* safe to allow because of emulated APIC */ } else if (function == 7 && index == 0 && reg == R_EBX) { - if (host_tsx_blacklisted()) { + if (host_tsx_broken()) { ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); } } else if (function == 7 && index == 0 && reg == R_EDX) {
In order to use inclusive terminology, rename host_tsx_blacklisted() as host_tsx_broken(). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)