[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v4 PATCH 12/12] SMBIOS: Remove SeaBIOS compatibility quirk
From: |
Gabriel L. Somlo |
Subject: |
[Qemu-devel] [v4 PATCH 12/12] SMBIOS: Remove SeaBIOS compatibility quirks |
Date: |
Tue, 18 Mar 2014 19:23:29 -0400 |
- Replace some arbitrarily hardcoded fields with proper
"n/a" or "unknown" values;
- Use QEMU-supplied default manufacturer and version strings;
- Count CPUs starting with 0 instead of 1, to maintain uniformity
with other multiple-instance items.
Signed-off-by: Gabriel Somlo <address@hidden>
---
hw/i386/smbios.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index f7a9a92..999c400 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -492,8 +492,8 @@ static void smbios_build_type_4_table(unsigned instance)
SMBIOS_TABLE_SET_STR(4, processor_version_str, type4.version);
t->voltage = 0;
t->external_clock = 0; /* Unknown */
- t->max_speed = 2000; /* hardcoded in SeaBIOS (use 0/Unknown instead ?) */
- t->current_speed = 2000; /* hardcoded in SeaBIOS (use 0/Unknown ?) */
+ t->max_speed = 0; /* Unknown */
+ t->current_speed = 0; /* Unknown */
t->status = 0x41; /* Socket populated, CPU enabled */
t->processor_upgrade = 0x01; /* Other */
t->l1_cache_handle = 0xFFFF; /* N/A */
@@ -541,9 +541,9 @@ static void smbios_build_type_17_table(unsigned instance,
ram_addr_t size)
SMBIOS_BUILD_TABLE_PRE(17, 0x1100 + instance, true); /* required */
t->physical_memory_array_handle = 0x1000; /* Type 16 (Phys. Mem. Array) */
- t->memory_error_information_handle = 0; /* SeaBIOS, should be 0xFFFE(N/A)
*/
- t->total_width = 64; /* hardcoded in SeaBIOS */
- t->data_width = 64; /* hardcoded in SeaBIOS */
+ t->memory_error_information_handle = 0xFFFE; /* Not provided */
+ t->total_width = 0xFFFF; /* Unknown */
+ t->data_width = 0xFFFF; /* Unknown */
size_mb = QEMU_ALIGN_UP(size, ONE_MB) / ONE_MB;
if (size_mb < 0x7FFF) {
t->size = size_mb;
@@ -559,7 +559,7 @@ static void smbios_build_type_17_table(unsigned instance,
ram_addr_t size)
SMBIOS_TABLE_SET_STR(17, device_locator_str, loc_str);
SMBIOS_TABLE_SET_STR(17, bank_locator_str, type17.bank);
t->memory_type = 0x07; /* RAM */
- t->type_detail = 0; /* hardcoded in SeaBIOS */
+ t->type_detail = 0x02; /* Other */
t->speed = 0; /* Unknown */
SMBIOS_TABLE_SET_STR(17, manufacturer_str, type17.manufacturer);
SMBIOS_TABLE_SET_STR(17, serial_number_str, type17.serial);
@@ -655,7 +655,6 @@ void smbios_set_defaults(const char *manufacturer,
ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size)
{
- const char *manufacturer_compat = "Bochs"; /* SeaBIOS compatibility */
smbios_have_defaults = true;
assert(ram_size == below_4g_mem_size + above_4g_mem_size);
@@ -671,15 +670,11 @@ void smbios_set_defaults(const char *manufacturer,
SMBIOS_SET_DEFAULT(type2.manufacturer, manufacturer);
SMBIOS_SET_DEFAULT(type2.product, product);
SMBIOS_SET_DEFAULT(type2.version, version);
- SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer_compat);
- /* not set in SeaBIOS
+ SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer);
SMBIOS_SET_DEFAULT(type3.version, version);
- */
SMBIOS_SET_DEFAULT(type4.sock_pfx, "CPU");
- SMBIOS_SET_DEFAULT(type4.manufacturer, manufacturer_compat);
- /* not set in SeaBIOS
+ SMBIOS_SET_DEFAULT(type4.manufacturer, manufacturer);
SMBIOS_SET_DEFAULT(type4.version, version);
- */
SMBIOS_SET_DEFAULT(type17.loc_pfx, "DIMM");
SMBIOS_SET_DEFAULT(type17.manufacturer, manufacturer);
}
@@ -694,8 +689,7 @@ uint8_t *smbios_get_table(size_t *length)
smbios_build_type_2_table();
smbios_build_type_3_table();
for (i = 0; i < smp_cpus; i++) {
- /* count CPUs starting with 1, to minimize diff vs. SeaBIOS */
- smbios_build_type_4_table(i + 1);
+ smbios_build_type_4_table(i);
}
/* SeaBIOS expects tables compliant to smbios v2.4;
--
1.8.5.3
- [Qemu-devel] [v4 PATCH 02/12] SMBIOS: Use macro to set smbios defaults, (continued)
- [Qemu-devel] [v4 PATCH 02/12] SMBIOS: Use macro to set smbios defaults, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 01/12] SMBIOS: Rename smbios_set_type1_defaults() for more general use, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 03/12] SMBIOS: Use bitmaps to check for smbios table collisions, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 04/12] SMBIOS: Add code to build full smbios tables; build type 2 table, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 05/12] SMBIOS: Build full tables for types 0 and 1, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 06/12] SMBIOS: Remove unused code for passing individual fields to bios, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 07/12] SMBIOS: Build full type 3 table, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 08/12] SMBIOS: Build full type 4 tables, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 09/12] SMBIOS: Build full smbios memory tables (type 16, 17, 19, and 20), Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 10/12] SMBIOS: Build full tables for type 32 and 127, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] [v4 PATCH 12/12] SMBIOS: Remove SeaBIOS compatibility quirks,
Gabriel L. Somlo <=
- [Qemu-devel] [v4 PATCH 11/12] SMBIOS: Update all table definitions to smbios spec v2.3, Gabriel L. Somlo, 2014/03/18
- [Qemu-devel] E820 (Re: [v4 PATCH 00/12] SMBIOS: build full tables in QEMU), Gabriel L. Somlo, 2014/03/26