From nobody Thu Nov 6 10:37:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540730545404460.50914819837067; Sun, 28 Oct 2018 05:42:25 -0700 (PDT) Received: from localhost ([::1]:40012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOZ-0008DF-4F for importer@patchew.org; Sun, 28 Oct 2018 08:42:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkMh-0006pY-2x for qemu-devel@nongnu.org; Sun, 28 Oct 2018 08:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkMb-0002GR-Tn for qemu-devel@nongnu.org; Sun, 28 Oct 2018 08:40:21 -0400 Received: from m12-12.163.com ([220.181.12.12]:34755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkMb-00027S-5o for qemu-devel@nongnu.org; Sun, 28 Oct 2018 08:40:17 -0400 Received: from ubuntu.localdomain (unknown [183.159.66.97]) by smtp8 (Coremail) with SMTP id DMCowABXB4MnrtVbZkS8WA--.19674S3; Sun, 28 Oct 2018 20:40:08 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=X1TqNVgNdun5xp0LXu wBHx9GNo1O7c8CyjSB9el2vdg=; b=YK7PQDPisoop9VFtPn62zyFJPfv50DpA41 2RYFHfKjPp83mJbfQN8fmErMgMI0ImlTlS9iixi3FVy8wKUib/qz2i2YzOYMHJkS irIrKLOG4ovKXvIvCjF0Dm5g7HJR54f21sz59sUGvd8I43V+yyyPgrwsnWZhlRcu 0D/9A+/1M= From: Li Qiang To: pbonzini@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Sun, 28 Oct 2018 05:40:03 -0700 Message-Id: <20181028124004.30494-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124004.30494-1-liq3ea@163.com> References: <20181028124004.30494-1-liq3ea@163.com> X-CM-TRANSID: DMCowABXB4MnrtVbZkS8WA--.19674S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7KF1xGryDurWktF45Xry3CFg_yoW8KrWDpF 9xAF13trZ3JF1fKrnxJw15J3ZxKryvqr1UW3yfuFWYyw17ZryDJa1a934F9r1UXryUZF45 A3yv9FyakFn7XFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jbzVbUUUUU= X-Originating-IP: [183.159.66.97] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKQjtbVXloYtaTwAAsu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH 1/2] tests: fw_cfg: add a function to get the fw_cfg file entry 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: Li Qiang , philmd@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is useful to write qtest abount fw_cfg file entry. Signed-off-by: Li Qiang --- tests/libqos/fw_cfg.c | 30 ++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 2 files changed, 32 insertions(+) diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index d0889d1e22..2dd7a498ab 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -16,6 +16,7 @@ #include "libqos/fw_cfg.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "standard-headers/linux/qemu_fw_cfg.h" =20 void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key) { @@ -54,6 +55,35 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) return le64_to_cpu(value); } =20 +void qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename, + void *data, size_t buflen) +{ + uint32_t count; + uint32_t i; + unsigned char *filesbuf =3D NULL; + uint32_t dsize; + struct fw_cfg_file *p; + + qfw_cfg_get(fw_cfg, FW_CFG_FILE_DIR, &count, sizeof(count)); + count =3D be32_to_cpu(count); + dsize =3D sizeof(uint32_t) + count * sizeof(struct fw_cfg_file); + filesbuf =3D g_malloc0(dsize); + qfw_cfg_get(fw_cfg, FW_CFG_FILE_DIR, filesbuf, dsize); + p =3D (struct fw_cfg_file *)(filesbuf + 4); + for (i =3D 0; i < count; ++i, ++p) { + if (!strcmp(p->name, filename)) { + uint32_t len =3D be32_to_cpu(p->size); + uint16_t sel =3D be16_to_cpu(p->select); + void *buf =3D g_malloc0(len); + qfw_cfg_get(fw_cfg, sel, buf, len); + memcpy(data, buf, buflen); + g_free(buf); + break; + } + } + g_free(filesbuf); +} + static void mm_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) { qtest_writew(fw_cfg->qts, fw_cfg->base, key); diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 0353416af0..50e4227638 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -31,6 +31,8 @@ void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data= , size_t len); uint16_t qfw_cfg_get_u16(QFWCFG *fw_cfg, uint16_t key); uint32_t qfw_cfg_get_u32(QFWCFG *fw_cfg, uint16_t key); uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key); +void qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename, + void *data, size_t buflen); =20 QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base); QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base); --=20 2.17.1