From c8f8e0c1f0a3687539a92169735845814e18c187 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 31 10月 2020 10:15:16 +0800
Subject: [PATCH] read dmi information segfault on windows
---
src/library/os/linux/cpu_info.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/library/os/linux/cpu_info.cpp b/src/library/os/linux/cpu_info.cpp
index 37620cb..cfb4efc 100644
--- a/src/library/os/linux/cpu_info.cpp
+++ b/src/library/os/linux/cpu_info.cpp
@@ -16,9 +16,9 @@
using namespace std;
struct CPUVendorID {
- unsigned int ebx;
- unsigned int edx;
- unsigned int ecx;
+ uint32_t ebx;
+ uint32_t edx;
+ uint32_t ecx;
string toString() const { return string(reinterpret_cast<const char *>(this), 12); }
};
@@ -56,7 +56,7 @@
* @return true if the cpu hypervisor bit is set to 1
*/
bool CpuInfo::is_hypervisor_set() const {
- unsigned int level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
+ uint32_t level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
__get_cpuid(level, &eax, &ebx, &ecx, &edx);
bool is_virtual = (((ecx >> 31) & 1) == 1); // hypervisor flag
@@ -64,7 +64,7 @@
}
uint32_t CpuInfo::model() const {
- unsigned int level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
+ uint32_t level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
__get_cpuid(level, &eax, &ebx, &ecx, &edx);
// ax bits 0-3 stepping,4-7 model,8-11 family id,12-13 processor type
// 14-15 reserved, 16-19 extended model, 20-27 extended family, 27-31 reserved
--
Gitblit v1.9.1