qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Igor Mammedov <imammedo@redhat.com>,
	Ani Sinha <anisinha@redhat.com>
Subject: [PULL 12/24] smbios: add smbios_add_usr_blob_size() helper
Date: Mon, 18 Mar 2024 12:16:11 -0400	[thread overview]
Message-ID: <684b49fda6735fef7ee07bb2c628b37fa114ca1e.1710778506.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1710778506.git.mst@redhat.com>

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



  parent reply	other threads:[~2024-03-18 16:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-18 16:15 [PULL 00/24] virtio,pc,pci: bugfixes Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 01/24] SMBIOS: fix long lines Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 02/24] qapi: document PCIe Gen5/Gen6 speeds since 9.0 Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 03/24] docs/specs/pvpanic: mark shutdown event as not implemented Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 04/24] tests: smbios: make it possible to write SMBIOS only test Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 05/24] tests: smbios: add test for -smbios type=11 option Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 06/24] tests: smbios: add test for legacy mode CLI options Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 07/24] smbios: cleanup smbios_get_tables() from legacy handling Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 08/24] smbios: get rid of smbios_smp_sockets global Michael S. Tsirkin
2024-03-18 16:15 ` [PULL 09/24] smbios: get rid of smbios_legacy global Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 10/24] smbios: avoid mangling user provided tables Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 11/24] smbios: don't check type4 structures in legacy mode Michael S. Tsirkin
2024-03-18 16:16 ` Michael S. Tsirkin [this message]
2024-03-18 16:16 ` [PULL 13/24] smbios: rename/expose structures/bitmaps used by both legacy and modern code Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 14/24] smbios: build legacy mode code only for 'pc' machine Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 15/24] smbios: handle errors consistently Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 16/24] smbios: get rid of global smbios_ep_type Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 17/24] smbios: clear smbios_type4_count before building tables Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 18/24] smbios: extend smbios-entry-point-type with 'auto' value Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 19/24] smbios: in case of entry point is 'auto' try to build v2 tables 1st Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 20/24] smbios: error out when building type 4 table is not possible Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 21/24] tests: acpi/smbios: whitelist expected blobs Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 22/24] pc/q35: set SMBIOS entry point type to 'auto' by default Michael S. Tsirkin
2024-03-18 16:16 ` [PULL 23/24] tests: acpi: update expected SSDT.dimmpxm blob Michael S. Tsirkin
2024-03-18 16:17 ` [PULL 24/24] smbios: add extra comments to smbios_get_table_legacy() Michael S. Tsirkin
2024-03-19 14:25 ` [PULL 00/24] virtio,pc,pci: bugfixes Peter Maydell

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=684b49fda6735fef7ee07bb2c628b37fa114ca1e.1710778506.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=anisinha@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).