daemon status 26c (#20044)
more polishing
Costa Tsaousis committed
Apr 3, 2025 at 12:54 UTC
28d40e1e852e4d5ef7efbe3fce28824c8ba6e182
2 files changed
+13
-2
src/daemon/status-file-dmi.c
+12
-1
@@ -70,6 +70,8 @@ static void dmi_normalize_vendor_field(char *buf, size_t buf_size) {
70
const char *found;
71
const char *replace;
72
} vendors[] = {
73
+ {"QEMU", "KVM"},
74
+
75
// Major vendors with multiple variations
76
{"AMD Corporation", "AMD"},
77
{"Advanced Micro Devices, Inc.", "AMD"},
@@ -131,6 +133,7 @@ static void dmi_normalize_vendor_field(char *buf, size_t buf_size) {
133
{"Gigabyte Tecohnology Co., Ltd.", "Gigabyte"},
134
135
{"GOOGLE", "Google"},
136
+ {"Google Inc", "Google"},
137
138
{"HC Technology.,Ltd.", "HC Tech"},
139
@@ -165,10 +168,14 @@ static void dmi_normalize_vendor_field(char *buf, size_t buf_size) {
168
{"Micro-Star International Co., Ltd", "MSI"},
169
{"Micro-Star International Co., Ltd.", "MSI"},
170
171
+ {"MICROSOFT", "Microsoft"},
172
{"Microsoft Corporation", "Microsoft"},
173
174
{"nVIDIA", "NVIDIA"},
175
176
+ {"OPENSTACK", "OpenStack"},
177
+ {"OpenStack Foundation", "OpenStack"},
178
+
179
{"ORACLE CORPORATI", "Oracle"},
180
{"Oracle Corporation", "Oracle"},
181
{"innotek GmbH", "Oracle"},
@@ -189,6 +196,8 @@ static void dmi_normalize_vendor_field(char *buf, size_t buf_size) {
196
197
{"SAMSUNG ELECTRONICS CO., LTD.", "Samsung"},
198
199
+ {"SUN MICROSYSTEMS", "Sun"},
200
+
201
{"SuperMicro", "Supermicro"},
202
{"Supermicro Corporation", "Supermicro"},
203
@@ -1362,8 +1371,10 @@ void fill_dmi_info(DAEMON_STATUS_FILE *ds) {
1371
safecpy(ds->hw.sys.vendor, ds->hw.chassis.vendor);
1372
if(!ds->hw.sys.vendor[0])
1373
safecpy(ds->hw.sys.vendor, ds->hw.bios.vendor);
1365
- if(!ds->hw.sys.vendor[0] && strstr(ds->hw.product.name, "Raspberry") != NULL)
1374
+ if(!ds->hw.sys.vendor[0] && strstr(ds->hw.product.name, "Raspberry") != NULL) {
1375
safecpy(ds->hw.sys.vendor, "Raspberry");
1376
+ safecpy(ds->hw.chassis.type, "mini-pc");
1377
+ }
1378
if(!ds->hw.sys.vendor[0] && (strstr(ds->hw.product.name, "VirtualMac") != NULL || strstr(ds->hw.board.name, "Apple") != NULL))
1379
safecpy(ds->hw.sys.vendor, "Apple");
1380
if(!ds->hw.sys.vendor[0])
src/daemon/status-file.c
+1
-1
@@ -885,7 +885,7 @@ void daemon_status_file_init(void) {
885
mallocz_register_out_of_memory_cb(daemon_status_file_out_of_memory);
886
887
status_file_io_load(STATUS_FILENAME, status_file_load_and_parse, &last_session_status);
888
- if(last_session_status.v < 25)
888
+ if(last_session_status.v <= 26)
889
fill_dmi_info(&last_session_status);
890
891
daemon_status_file_migrate_once();