|
@@ -669,7 +669,8 @@ static void smbios_build_type_3_table(void)
|
|
|
}
|
|
|
|
|
|
static void smbios_build_type_4_table(MachineState *ms, unsigned instance,
|
|
|
- SmbiosEntryPointType ep_type)
|
|
|
+ SmbiosEntryPointType ep_type,
|
|
|
+ Error **errp)
|
|
|
{
|
|
|
char sock_str[128];
|
|
|
size_t tbl_len = SMBIOS_TYPE_4_LEN_V28;
|
|
@@ -723,6 +724,12 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance,
|
|
|
if (tbl_len == SMBIOS_TYPE_4_LEN_V30) {
|
|
|
t->core_count2 = t->core_enabled2 = cpu_to_le16(cores_per_socket);
|
|
|
t->thread_count2 = cpu_to_le16(threads_per_socket);
|
|
|
+ } else if (t->core_count == 0xFF || t->thread_count == 0xFF) {
|
|
|
+ error_setg(errp, "SMBIOS 2.0 doesn't support number of processor "
|
|
|
+ "cores/threads more than 255, use "
|
|
|
+ "-machine smbios-entry-point-type=64 option to enable "
|
|
|
+ "SMBIOS 3.0 support");
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
SMBIOS_BUILD_TABLE_POST;
|
|
@@ -1111,7 +1118,10 @@ static bool smbios_get_tables_ep(MachineState *ms,
|
|
|
assert(ms->smp.sockets >= 1);
|
|
|
|
|
|
for (i = 0; i < ms->smp.sockets; i++) {
|
|
|
- smbios_build_type_4_table(ms, i, ep_type);
|
|
|
+ smbios_build_type_4_table(ms, i, ep_type, errp);
|
|
|
+ if (*errp) {
|
|
|
+ goto err_exit;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
smbios_build_type_8_table();
|