motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 08:17:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i386/cpu: Consolidate the helper to get Host's vendor

Browse source 
Extend host_cpu_vendor_fms() to help more cases to get Host's vendor
information.

Cc: Dongli Zhang <dongli.zhang@oracle.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20250410075619.145792-1-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Zhao Liu 2025-04-10 15:56:19 +08:00 • committed by Paolo Bonzini
parent c901905ea6
commit ae39acef49
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
target/i386/host-cpu.c
View file

@ -109,9 +109,13 @@ void host_cpu_vendor_fms(char *vendor, int *family, int *model, int *stepping)
{ {
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx); host_cpuid(0x0, 0, NULL, &ebx, &ecx, &edx);
x86_cpu_vendor_words2str(vendor, ebx, edx, ecx); x86_cpu_vendor_words2str(vendor, ebx, edx, ecx);
if (!family && !model && !stepping) {
return;
}
host_cpuid(0x1, 0, &eax, &ebx, &ecx, &edx); host_cpuid(0x1, 0, &eax, &ebx, &ecx, &edx);
if (family) { if (family) {
*family = ((eax >> 8) & 0x0F) + ((eax >> 20) & 0xFF); *family = ((eax >> 8) & 0x0F) + ((eax >> 20) & 0xFF);
@ -129,11 +133,9 @@ void host_cpu_instance_init(X86CPU *cpu)
X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu); X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu);
if (xcc->model) { if (xcc->model) {
uint32_t ebx = 0, ecx = 0, edx = 0;
char vendor[CPUID_VENDOR_SZ + 1]; char vendor[CPUID_VENDOR_SZ + 1];
host_cpuid(0, 0, NULL, &ebx, &ecx, &edx); host_cpu_vendor_fms(vendor, NULL, NULL, NULL);
x86_cpu_vendor_words2str(vendor, ebx, edx, ecx);
object_property_set_str(OBJECT(cpu), "vendor", vendor, &error_abort); object_property_set_str(OBJECT(cpu), "vendor", vendor, &error_abort);
} }
} }

3
target/i386/kvm/vmsr_energy.c
View file

@ -29,10 +29,9 @@ char *vmsr_compute_default_paths(void)
bool is_host_cpu_intel(void) bool is_host_cpu_intel(void)
{ {
int family, model, stepping;
char vendor[CPUID_VENDOR_SZ + 1]; char vendor[CPUID_VENDOR_SZ + 1];
host_cpu_vendor_fms(vendor, &family, &model, &stepping); host_cpu_vendor_fms(vendor, NULL, NULL, NULL);
return g_str_equal(vendor, CPUID_VENDOR_INTEL); return g_str_equal(vendor, CPUID_VENDOR_INTEL);
} }