Merge pull request #61 from michaellin01/fix-x86-max

vanhauser-thc · web-flow · commit d40bcd896521 · 2024-09-21T09:36:16.000+03:00
Cherry pick d135f78 ("linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default")
diff --git a/linux-user/i386/target_elf.h b/linux-user/i386/target_elf.h
@@ -9,6 +9,6 @@
 #define I386_TARGET_ELF_H
 static inline const char *cpu_get_model(uint32_t eflags)
 {
-    return "qemu32";
+    return "max";
 }
 #endif
diff --git a/linux-user/x86_64/target_elf.h b/linux-user/x86_64/target_elf.h
@@ -9,6 +9,6 @@
 #define X86_64_TARGET_ELF_H
 static inline const char *cpu_get_model(uint32_t eflags)
 {
-    return "qemu64";
+    return "max";
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`#define I386_TARGET_ELF_H`
`10`	`10`	`static inline const char *cpu_get_model(uint32_t eflags)`
`11`	`11`	`{`
`12`		`- return "qemu32";`
	`12`	`+ return "max";`
`13`	`13`	`}`
`14`	`14`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`#define X86_64_TARGET_ELF_H`
`10`	`10`	`static inline const char *cpu_get_model(uint32_t eflags)`
`11`	`11`	`{`
`12`		`- return "qemu64";`
	`12`	`+ return "max";`
`13`	`13`	`}`
`14`	`14`	`#endif`