From nobody Sun Nov 9 22:55:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552431860983480.90389305851613; Tue, 12 Mar 2019 16:04:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:34767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3qRP-000687-Pv for importer@patchew.org; Tue, 12 Mar 2019 19:04:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3qPD-00051D-4r for qemu-devel@nongnu.org; Tue, 12 Mar 2019 19:01:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3qPC-0000eZ-AV for qemu-devel@nongnu.org; Tue, 12 Mar 2019 19:01:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3qKK-0005ey-5e; Tue, 12 Mar 2019 18:56:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 66633307D90F; Tue, 12 Mar 2019 22:56:51 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-23.brq.redhat.com [10.40.204.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2432F60C1B; Tue, 12 Mar 2019 22:56:45 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 23:56:29 +0100 Message-Id: <20190312225632.29777-2-philmd@redhat.com> In-Reply-To: <20190312225632.29777-1-philmd@redhat.com> References: <20190312225632.29777-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 12 Mar 2019 22:56:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 1/4] hw/nvram/fw_cfg: Add fw_cfg_add_file_from_host() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , qemu-arm@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add a function to read the full content of file on the host, and add a new 'file' name item to the fw_cfg device. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: s/ptr/data, corrected documentation (Laszlo) v3: inverted the if() logic v4: does not return pointer to alloc'd data (Markus) --- hw/nvram/fw_cfg.c | 23 +++++++++++++++++++++++ include/hw/nvram/fw_cfg.h | 25 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 5c3a46ce6f..a8fb829162 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -825,6 +825,29 @@ void fw_cfg_add_file(FWCfgState *s, const char *filen= ame, fw_cfg_add_file_callback(s, filename, NULL, NULL, NULL, data, len, tru= e); } =20 +bool fw_cfg_add_file_from_host(FWCfgState *s, const char *filename, + const char *host_path, size_t *len, + Error **errp) +{ + GError *gerr =3D NULL; + gchar *data =3D NULL; + gsize contents_len =3D 0; + + if (!g_file_get_contents(host_path, &data, &contents_len, &gerr)) { + error_setg(errp, "%s", gerr->message); + g_error_free(gerr); + return false; + } + fw_cfg_add_file(s, filename, data, contents_len); + /* TODO g_free 'data' */ + + if (len) { + *len =3D contents_len; + } + + return true; +} + void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len) { diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index f5a6895a74..4c8cdd89bb 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -166,6 +166,31 @@ void fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint6= 4_t value); void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data, size_t len); =20 +/** + * fw_cfg_add_file_from_host: + * @s: fw_cfg device being modified + * @filename: name of new fw_cfg file item + * @host_path: path of the host file to read the data from + * @len: pointer to hold the length of the host file (optional) + * @errp: pointer to a NULL initialized error object + * + * Read the content of a host file as a raw "blob" then add a new NAMED + * fw_cfg item of the file size. If @len is provided, it will contain the + * total length read from the host file. The data read from the host + * filesystem is owned by the new fw_cfg entry, and is stored into the data + * structure of the fw_cfg device. + * The next available (unused) selector key starting at FW_CFG_FILE_FIRST + * will be used; also, a new entry will be added to the file directory + * structure residing at key value FW_CFG_FILE_DIR, containing the item na= me, + * data size, and assigned selector key value. + * + * Returns true on success, false on failure. In the latter case, + * an Error object is returned through @errp. + */ +bool fw_cfg_add_file_from_host(FWCfgState *s, const char *filename, + const char *host_path, size_t *len, + Error **errp); + /** * fw_cfg_add_file_callback: * @s: fw_cfg device being modified --=20 2.20.1