[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/24] smbios: add smbios_add_usr_blob_size() helper
From: |
Michael S. Tsirkin |
Subject: |
[PULL 12/24] smbios: add smbios_add_usr_blob_size() helper |
Date: |
Mon, 18 Mar 2024 12:16:11 -0400 |
From: Igor Mammedov <imammedo@redhat.com>
it will be used by follow up patch when legacy handling
is moved out into a separate file.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Message-Id: <20240314152302.2324164-10-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/smbios/smbios.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 30196d2911..090a6eb018 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -1411,6 +1411,14 @@ static bool save_opt_list(size_t *ndest, char ***dest,
QemuOpts *opts,
return true;
}
+static void smbios_add_usr_blob_size(size_t size)
+{
+ if (!usr_blobs_sizes) {
+ usr_blobs_sizes = g_array_new(false, false, sizeof(size_t));
+ }
+ g_array_append_val(usr_blobs_sizes, size);
+}
+
void smbios_entry_add(QemuOpts *opts, Error **errp)
{
const char *val;
@@ -1458,10 +1466,12 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
smbios_type4_count++;
}
- if (!usr_blobs_sizes) {
- usr_blobs_sizes = g_array_new(false, false, sizeof(size_t));
- }
- g_array_append_val(usr_blobs_sizes, size);
+ /*
+ * preserve blob size for legacy mode so it could build its
+ * blobs flavor from 'usr_blobs'
+ */
+ smbios_add_usr_blob_size(size);
+
usr_blobs_len += size;
if (size > usr_table_max) {
usr_table_max = size;
--
MST
- [PULL 03/24] docs/specs/pvpanic: mark shutdown event as not implemented, (continued)
- [PULL 03/24] docs/specs/pvpanic: mark shutdown event as not implemented, Michael S. Tsirkin, 2024/03/18
- [PULL 02/24] qapi: document PCIe Gen5/Gen6 speeds since 9.0, Michael S. Tsirkin, 2024/03/18
- [PULL 04/24] tests: smbios: make it possible to write SMBIOS only test, Michael S. Tsirkin, 2024/03/18
- [PULL 06/24] tests: smbios: add test for legacy mode CLI options, Michael S. Tsirkin, 2024/03/18
- [PULL 05/24] tests: smbios: add test for -smbios type=11 option, Michael S. Tsirkin, 2024/03/18
- [PULL 07/24] smbios: cleanup smbios_get_tables() from legacy handling, Michael S. Tsirkin, 2024/03/18
- [PULL 08/24] smbios: get rid of smbios_smp_sockets global, Michael S. Tsirkin, 2024/03/18
- [PULL 10/24] smbios: avoid mangling user provided tables, Michael S. Tsirkin, 2024/03/18
- [PULL 11/24] smbios: don't check type4 structures in legacy mode, Michael S. Tsirkin, 2024/03/18
- [PULL 09/24] smbios: get rid of smbios_legacy global, Michael S. Tsirkin, 2024/03/18
- [PULL 12/24] smbios: add smbios_add_usr_blob_size() helper,
Michael S. Tsirkin <=
- [PULL 13/24] smbios: rename/expose structures/bitmaps used by both legacy and modern code, Michael S. Tsirkin, 2024/03/18
- [PULL 14/24] smbios: build legacy mode code only for 'pc' machine, Michael S. Tsirkin, 2024/03/18
- [PULL 15/24] smbios: handle errors consistently, Michael S. Tsirkin, 2024/03/18
- [PULL 16/24] smbios: get rid of global smbios_ep_type, Michael S. Tsirkin, 2024/03/18
- [PULL 18/24] smbios: extend smbios-entry-point-type with 'auto' value, Michael S. Tsirkin, 2024/03/18
- [PULL 19/24] smbios: in case of entry point is 'auto' try to build v2 tables 1st, Michael S. Tsirkin, 2024/03/18
- [PULL 17/24] smbios: clear smbios_type4_count before building tables, Michael S. Tsirkin, 2024/03/18
- [PULL 20/24] smbios: error out when building type 4 table is not possible, Michael S. Tsirkin, 2024/03/18
- [PULL 21/24] tests: acpi/smbios: whitelist expected blobs, Michael S. Tsirkin, 2024/03/18
- [PULL 22/24] pc/q35: set SMBIOS entry point type to 'auto' by default, Michael S. Tsirkin, 2024/03/18