From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, Ani Sinha <anisinha@redhat.com>
Subject: [PATCH v4 09/21] smbios: add smbios_add_usr_blob_size() helper
Date: Thu, 14 Mar 2024 16:22:50 +0100 [thread overview]
Message-ID: <20240314152302.2324164-10-imammedo@redhat.com> (raw)
In-Reply-To: <20240314152302.2324164-1-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>
---
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 a96e5cd839..d530667a9d 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;
--
2.39.3
next prev parent reply other threads:[~2024-03-14 15:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-14 15:22 [PATCH v4 00/21] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 01/21] tests: smbios: make it possible to write SMBIOS only test Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 02/21] tests: smbios: add test for -smbios type=11 option Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 03/21] tests: smbios: add test for legacy mode CLI options Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 04/21] smbios: cleanup smbios_get_tables() from legacy handling Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 05/21] smbios: get rid of smbios_smp_sockets global Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 06/21] smbios: get rid of smbios_legacy global Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 07/21] smbios: avoid mangling user provided tables Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 08/21] smbios: don't check type4 structures in legacy mode Igor Mammedov
2024-03-14 15:22 ` Igor Mammedov [this message]
2024-03-14 15:22 ` [PATCH v4 10/21] smbios: rename/expose structures/bitmaps used by both legacy and modern code Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 11/21] smbios: build legacy mode code only for 'pc' machine Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 12/21] smbios: handle errors consistently Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 13/21] smbios: get rid of global smbios_ep_type Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 14/21] smbios: clear smbios_type4_count before building tables Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 15/21] smbios: extend smbios-entry-point-type with 'auto' value Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 16/21] smbios: in case of entry point is 'auto' try to build v2 tables 1st Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 17/21] smbios: error out when building type 4 table is not possible Igor Mammedov
2024-03-14 15:22 ` [PATCH v4 18/21] tests: acpi/smbios: whitelist expected blobs Igor Mammedov
2024-03-14 15:23 ` [PATCH v4 19/21] pc/q35: set SMBIOS entry point type to 'auto' by default Igor Mammedov
2024-03-14 15:23 ` [PATCH v4 20/21] tests: acpi: update expected SSDT.dimmpxm blob Igor Mammedov
2024-03-14 15:23 ` [PATCH v4 21/21] smbios: add extra comments to smbios_get_table_legacy() Igor Mammedov
2024-03-14 15:30 ` [PATCH v4 00/21] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240314152302.2324164-10-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=anisinha@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).