[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/19] smbios: in case of entry point is 'auto' try to build v2 t
From: |
Igor Mammedov |
Subject: |
[PATCH 14/19] smbios: in case of entry point is 'auto' try to build v2 tables 1st |
Date: |
Tue, 27 Feb 2024 16:47:44 +0100 |
QEMU for some time now uses SMBIOS 3.0 for PC/Q35 machines by
default, however Windows has a bug in locating SMBIOS 3.0
entrypoint and fails to find tables when booted on SeaBIOS
(on UEFI SMBIOS 3.0 tables work fine since firmware hands
over tables in another way)
Missing SMBIOS tables may lead to some issues for guest
though (worst are: possible reactiveation, inability to
get virtio drivers from 'Windows Update')
It's unclear at this point if MS will fix the issue on their
side. So instead of it (or rather in addition) this patch
will try to workaround the issue.
aka, use smbios-entry-point-type=auto to make QEMU try
generating conservative SMBIOS 2.0 tables and if that
fails (due to limits/requested configuration) fallback
to SMBIOS 3.0 tables.
With this in place majority of users will use SMBIOS 2.0
tables which work fine with (Windows + legacy BIOS).
The configurations that is not to possible to describe
with SMBIOS 2.0 will switch automatically to SMBIOS 3.0
(which will trigger Windows bug but there is nothing
QEMU can do here, so go and aks Microsoft to real fix).
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/smbios/smbios.c | 52 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 49 insertions(+), 3 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 5a791fd9eb..e54a9f21e6 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -959,7 +959,7 @@ static void smbios_entry_point_setup(SmbiosEntryPointType
ep_type)
}
}
-void smbios_get_tables(MachineState *ms,
+static bool smbios_get_tables_ep(MachineState *ms,
SmbiosEntryPointType ep_type,
const struct smbios_phys_mem_area *mem_array,
const unsigned int mem_array_size,
@@ -968,6 +968,7 @@ void smbios_get_tables(MachineState *ms,
Error **errp)
{
unsigned i, dimm_cnt, offset;
+ ERRP_GUARD();
assert(ep_type == SMBIOS_ENTRY_POINT_TYPE_32 ||
ep_type == SMBIOS_ENTRY_POINT_TYPE_64);
@@ -1052,11 +1053,56 @@ void smbios_get_tables(MachineState *ms,
abort();
}
- return;
+ return true;
err_exit:
g_free(smbios_tables);
smbios_tables = NULL;
- return;
+ return false;
+}
+
+void smbios_get_tables(MachineState *ms,
+ SmbiosEntryPointType ep_type,
+ const struct smbios_phys_mem_area *mem_array,
+ const unsigned int mem_array_size,
+ uint8_t **tables, size_t *tables_len,
+ uint8_t **anchor, size_t *anchor_len,
+ Error **errp)
+{
+ Error *local_err = NULL;
+ bool is_valid;
+ ERRP_GUARD();
+
+ switch (ep_type) {
+ case SMBIOS_ENTRY_POINT_TYPE_AUTO:
+ case SMBIOS_ENTRY_POINT_TYPE_32:
+ is_valid = smbios_get_tables_ep(ms, SMBIOS_ENTRY_POINT_TYPE_32,
+ mem_array, mem_array_size,
+ tables, tables_len,
+ anchor, anchor_len,
+ &local_err);
+ if (is_valid || ep_type != SMBIOS_ENTRY_POINT_TYPE_AUTO) {
+ break;
+ }
+ /*
+ * fall through in case AUTO endpoint is selected and
+ * SMBIOS 2.x tables can't be generated, to try if SMBIOS 3.x
+ * tables would work
+ */
+ case SMBIOS_ENTRY_POINT_TYPE_64:
+ error_free(local_err);
+ local_err = NULL;
+ is_valid = smbios_get_tables_ep(ms, SMBIOS_ENTRY_POINT_TYPE_64,
+ mem_array, mem_array_size,
+ tables, tables_len,
+ anchor, anchor_len,
+ &local_err);
+ break;
+ default:
+ abort();
+ }
+ if (!is_valid) {
+ error_propagate(errp, local_err);
+ }
}
static void save_opt(const char **dest, QemuOpts *opts, const char *name)
--
2.39.3
- Re: [PATCH 06/19] smbios: get rid of smbios_legacy global, (continued)
- [PATCH 10/19] smbios: handle errors consistently, Igor Mammedov, 2024/02/27
- [PATCH 09/19] smbios: build legacy mode code only for 'pc' machine, Igor Mammedov, 2024/02/27
- [PATCH 11/19] smbios: clear smbios_tables pointer after freeing, Igor Mammedov, 2024/02/27
- [PATCH 08/19] smbios: don't check type4 structures in legacy mode, Igor Mammedov, 2024/02/27
- [PATCH 12/19] get rid of global smbios_ep_type, Igor Mammedov, 2024/02/27
- [PATCH 13/19] smbios: extend smbios-entry-point-type with 'auto' value, Igor Mammedov, 2024/02/27
- [PATCH 15/19] smbios: error out when building type 4 table is not possible, Igor Mammedov, 2024/02/27
- [PATCH 07/19] smbios: avoid mangling user provided tables, Igor Mammedov, 2024/02/27
- [PATCH 14/19] smbios: in case of entry point is 'auto' try to build v2 tables 1st,
Igor Mammedov <=
- [PATCH 16/19] smbios: clear smbios_type4_count before building tables, Igor Mammedov, 2024/02/27
- [PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default, Igor Mammedov, 2024/02/27
- [PATCH 17/19] tests: acpi/smbios: whitelist expected blobs, Igor Mammedov, 2024/02/27
- [PATCH 19/19] tests: acpi: update expected SSDT.dimmpxm blob, Igor Mammedov, 2024/02/27
- Re: [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS, Michael S. Tsirkin, 2024/02/27
- Re: [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS, Fiona Ebner, 2024/02/29