Skip to contentSkip to conversation

x86/cpu: fix vendor string for Shanghai CPU

RFC PATCH In review Wei Liu 3 participants 5 messages Apr 4, 2019

lore
Share & tools
lore

Wei Liu

author
#0 lore raw

RFC PATCH 1/1 x86/cpu: fix vendor string for Shanghai CPU

---
Cc: DavidWang <[email protected]>

Or perhaps it should have been Zhaoxin?

---
 xen/arch/x86/cpu/shanghai.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/x86/cpu/shanghai.c +1 -1
index 24af5c8259..36c1763c81 100644
@@ -16,7 +16,7 @@ static void init_shanghai(struct cpuinfo_x86 *c)
 }
 
 static const struct cpu_dev shanghai_cpu_dev = {
-    .c_vendor   = "  Shang",
+    .c_vendor   = "Shanghai",
     .c_init     = init_shanghai,
 };
 
Signature · 7 lines
2.20.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
author
#2 lore raw
Quoted 8 lines · Andrew Cooper
Quoted 1 line · Wei Liu

Sadly not.  This is a char[8] field (so loses the \0 terminator), which then gets passed to %s

I've got an overhaul to this area of code in the works, and am planning to remove this field entirely,

Good. I will leave this to you and cross it off my list. :p

Wei.

Quoted 2 lines

~Andrew

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw
Quoted 9 lines · Wei Liu
Quoted 7 lines · Andrew Cooper
Quoted 1 line · Wei Liu

Sadly not.  This is a char[8] field (so loses the \0 terminator), which then gets passed to %s

I've got an overhaul to this area of code in the works, and am planning to remove this field entirely,

Good. I will leave this to you and cross it off my list. :p

That said, I would like the answer to your original question to David, because whatever the answer is, it clearly isn't "  Shang".

~Andrew

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#4 lore raw
In reply to Wei Liu

xen/arch/x86/cpu/shanghai.c static void init_shanghai(struct cpuinfo_x86 *c) · line 19

Quoted 9 lines
Quoted 1 line
Quoted 1 line · On 04.04.19 at 16:11, <[email protected]> wrote:
xen/arch/x86/cpu/shanghai.c +1 -1
@@ -16,7 +16,7 @@ static void init_shanghai(struct cpuinfo_x86 *c)
 }
 
 static const struct cpu_dev shanghai_cpu_dev = {
-    .c_vendor   = "  Shang",
+    .c_vendor   = "Shanghai",

But this makes it a non-nul terminated string: The structure member is an array of just 8 characters.

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel