From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0880C43461 for ; Wed, 9 Sep 2020 08:22:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F942215A4 for ; Wed, 9 Sep 2020 08:22:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K0vtvHIo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F942215A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFvMy-0008F6-DZ for qemu-devel@archiver.kernel.org; Wed, 09 Sep 2020 04:22:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFvJk-00039g-H5 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 04:19:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49841 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFvJi-0003wS-NA for qemu-devel@nongnu.org; Wed, 09 Sep 2020 04:19:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599639536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2w0joOLoL1PdMFat+IlgsE99sSR02zLxSLHYFbQskrc=; b=K0vtvHIoSc2MWmQ9UTIT6Fcbb/E+PwOCgkGvDr0fXRx86QPlAFpWHtqlJ6LfyK7/quY6jz IXRzDfGSggEKmFKlGrb9vY5aq5LCPoYGn3Ac1i8xmP3DgxKcShTyvAHGD8Rdp4n0q5eb5d RycZk8dq44YiU3yX9Vo5irB7XpIiMjE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-539-7ArDV-0rMcG4oBmCOtbZAA-1; Wed, 09 Sep 2020 04:18:54 -0400 X-MC-Unique: 7ArDV-0rMcG4oBmCOtbZAA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 911CE18BA283; Wed, 9 Sep 2020 08:18:53 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-82.ams2.redhat.com [10.36.114.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE9378246E; Wed, 9 Sep 2020 08:18:47 +0000 (UTC) Subject: Re: [PATCH 1/5] hw/smbios: support loading OEM strings values from a file To: =?UTF-8?Q?Daniel_P._Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20200908165438.1008942-1-berrange@redhat.com> <20200908165438.1008942-2-berrange@redhat.com> From: Laszlo Ersek Message-ID: Date: Wed, 9 Sep 2020 10:18:47 +0200 MIME-Version: 1.0 In-Reply-To: <20200908165438.1008942-2-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=207.211.31.120; envelope-from=lersek@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 03:05:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-arm@nongnu.org, Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 09/08/20 18:54, Daniel P. Berrangé wrote: > Some applications want to pass quite large values for the OEM strings > entries. Rather than having huge strings on the command line, it would > be better to load them from a file, as supported with -fw_cfg. > > This introduces the "valuefile" parameter allowing for: > > $ echo -n "thisthing" > mydata.txt > $ qemu-system-x86_64 \ > -smbios type=11,value=something \ > -smbios type=11,valuefile=mydata.txt \ > -smbios type=11,value=somemore \ > ...other args... > > Now in the guest > > $ dmidecide -t 11 > Getting SMBIOS data from sysfs. > SMBIOS 2.8 present. > > Handle 0x0E00, DMI type 11, 5 bytes > OEM Strings > String 1: something > String 2: thisthing > String 3: somemore > > Signed-off-by: Daniel P. Berrangé > --- > hw/smbios/smbios.c | 72 +++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 59 insertions(+), 13 deletions(-) (gearing up to test this / look into the edk2 problem, just one question in passing: could we / would we simplify this with g_file_get_contents()?) Thanks Laszlo > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > index 7cc950b41c..8450fad285 100644 > --- a/hw/smbios/smbios.c > +++ b/hw/smbios/smbios.c > @@ -110,7 +110,7 @@ static struct { > > static struct { > size_t nvalues; > - const char **values; > + char **values; > } type11; > > static struct { > @@ -314,6 +314,11 @@ static const QemuOptDesc qemu_smbios_type11_opts[] = { > .type = QEMU_OPT_STRING, > .help = "OEM string data", > }, > + { > + .name = "path", > + .type = QEMU_OPT_STRING, > + .help = "OEM string data from file", > + }, > }; > > static const QemuOptDesc qemu_smbios_type17_opts[] = { > @@ -641,6 +646,8 @@ static void smbios_build_type_11_table(void) > > for (i = 0; i < type11.nvalues; i++) { > SMBIOS_TABLE_SET_STR_LIST(11, type11.values[i]); > + g_free(type11.values[i]); > + type11.values[i] = NULL; > } > > SMBIOS_BUILD_TABLE_POST; > @@ -940,9 +947,8 @@ static void save_opt(const char **dest, QemuOpts *opts, const char *name) > > > struct opt_list { > - const char *name; > size_t *ndest; > - const char ***dest; > + char ***dest; > }; > > static int save_opt_one(void *opaque, > @@ -951,23 +957,61 @@ static int save_opt_one(void *opaque, > { > struct opt_list *opt = opaque; > > - if (!g_str_equal(name, opt->name)) { > - return 0; > + if (g_str_equal(name, "path")) { > + g_autoptr(GByteArray) data = g_byte_array_new(); > + g_autofree char *buf = g_new(char, 4096); > + ssize_t ret; > + int fd = qemu_open(value, O_RDONLY); > + if (fd < 0) { > + error_setg(errp, "Unable to open %s: %s", value, strerror(errno)); > + return -1; > + } > + > + while (1) { > + ret = read(fd, buf, 4096); > + if (ret == 0) { > + break; > + } > + if (ret < 0) { > + error_setg(errp, "Unable to read from %s: %s", > + value, strerror(errno)); > + return -1; > + } > + if (memchr(buf, '\0', ret)) { > + error_setg(errp, "NUL in OEM strings value in %s", value); > + return -1; > + } > + g_byte_array_append(data, (guint8 *)buf, ret); > + } > + > + close(fd); > + > + *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1); > + (*opt->dest)[*opt->ndest] = (char *)g_byte_array_free(data, FALSE); > + (*opt->ndest)++; > + data = NULL; > + } else if (g_str_equal(name, "value")) { > + *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1); > + (*opt->dest)[*opt->ndest] = g_strdup(value); > + (*opt->ndest)++; > + } else if (!g_str_equal(name, "type")) { > + error_setg(errp, "Unexpected option %s", name); > + return -1; > } > > - *opt->dest = g_renew(const char *, *opt->dest, (*opt->ndest) + 1); > - (*opt->dest)[*opt->ndest] = value; > - (*opt->ndest)++; > return 0; > } > > -static void save_opt_list(size_t *ndest, const char ***dest, > - QemuOpts *opts, const char *name) > +static bool save_opt_list(size_t *ndest, char ***dest, QemuOpts *opts, > + Error **errp) > { > struct opt_list opt = { > - name, ndest, dest, > + ndest, dest, > }; > - qemu_opt_foreach(opts, save_opt_one, &opt, NULL); > + if (!qemu_opt_foreach(opts, save_opt_one, &opt, errp)) { > + return false; > + } > + return true; > } > > void smbios_entry_add(QemuOpts *opts, Error **errp) > @@ -1149,7 +1193,9 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) > if (!qemu_opts_validate(opts, qemu_smbios_type11_opts, errp)) { > return; > } > - save_opt_list(&type11.nvalues, &type11.values, opts, "value"); > + if (!save_opt_list(&type11.nvalues, &type11.values, opts, errp)) { > + return; > + } > return; > case 17: > if (!qemu_opts_validate(opts, qemu_smbios_type17_opts, errp)) { >