From nobody Fri Nov 7 10:17:12 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; dkim=fail; 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=163.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547968587079186.2936991069846; Sat, 19 Jan 2019 23:16:27 -0800 (PST) Received: from localhost ([127.0.0.1]:36526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7LF-0005Kn-Ts for importer@patchew.org; Sun, 20 Jan 2019 02:16:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7Jk-0004f9-5m for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gl7Jj-0004OL-DM for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:52 -0500 Received: from m12-15.163.com ([220.181.12.15]:59702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7Ji-0004Mu-KA for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:51 -0500 Received: from localhost.localdomain (unknown [115.192.69.226]) by smtp11 (Coremail) with SMTP id D8CowAC3BcvjH0RcbjcZCA--.12038S3; Sun, 20 Jan 2019 15:14:48 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=7WOokvmKP3rrAYRS6p Pnd8e6JPl7pCvTddRMyv27S1o=; b=MAHYEPRjwk4L/GLW/kC12ZlAV/786WEOWo EtvAr0Bdys7cEiC3Hp6CdWrmJ142mG75hgIXe2qDO6OQNLHQ4C96d4qJQF7Ze2ME aD65jy6mDNyaLdOfOEovO9L/07IkpLj1wg/Dx9cEMmfQ/leeLOFb4EiEGOU9d1dy CgE7gQCdw= From: Li Qiang To: philmd@redhat.com, lersek@redhat.com, kraxel@redhat.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Date: Sat, 19 Jan 2019 23:13:36 -0800 Message-Id: <20190120071337.55595-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120071337.55595-1-liq3ea@163.com> References: <20190120071337.55595-1-liq3ea@163.com> X-CM-TRANSID: D8CowAC3BcvjH0RcbjcZCA--.12038S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tFW8Kw1kXr15Ww1UtFWkWFg_yoW8KFWxpF 9xAF13trZxG3WfKr9xJw13J3ZxKryvqr1UW3y3ZFWYyw17Zr98Ja1a93yF9ryUXryUZF45 Aw4vvFyakFn7XaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jVSoJUUUUU= X-Originating-IP: [115.192.69.226] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiTwhCbVsGNqKgSwAAsK X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.15 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 , liq3ea@gmail.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 about fw_cfg file entry. Signed-off-by: Li Qiang --- tests/libqos/fw_cfg.c | 33 +++++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 2 files changed, 35 insertions(+) diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index d0889d1e22..e2b0cae7cd 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,38 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) return le64_to_cpu(value); } =20 +size_t 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; + size_t filesize =3D 0; + + 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 + sizeof(uint32_t)); + 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); + filesize =3D len; + if (len > buflen) { + len =3D buflen; + } + qfw_cfg_get(fw_cfg, sel, data, len); + break; + } + } + g_free(filesbuf); + return filesize; +} + 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..de73722e67 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); +size_t 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 From nobody Fri Nov 7 10:17:12 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; dkim=fail; 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=163.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547968694228976.5321230128634; Sat, 19 Jan 2019 23:18:14 -0800 (PST) Received: from localhost ([127.0.0.1]:36538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7Mz-0006Mz-A9 for importer@patchew.org; Sun, 20 Jan 2019 02:18:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7Jl-0004fG-ED for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gl7Jk-0004QZ-Of for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:53 -0500 Received: from m12-15.163.com ([220.181.12.15]:59836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gl7Jj-0004Nl-VV for qemu-devel@nongnu.org; Sun, 20 Jan 2019 02:14:52 -0500 Received: from localhost.localdomain (unknown [115.192.69.226]) by smtp11 (Coremail) with SMTP id D8CowAC3BcvjH0RcbjcZCA--.12038S4; Sun, 20 Jan 2019 15:14:49 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=LxEfvVL2+K21Ejw+WC 6HMYqqj05tAr+hd+elY9NOf6o=; b=ctV0SwkyIzExIu8GOd6FR0RwIPXZlCT2hn AcJ1tj+2Zof8DiqP55QSSXMh9holL5U+tiyDA0GyTCDBqu1QOUyWyuyQy8LVOElF PbyLq4mh3FrCv0yTIky9Ku6ctCqHXc0E2aKGhWyQ2ZBnXtPKqwsNUD7HNBmT8veJ bOGxNmrF8= From: Li Qiang To: philmd@redhat.com, lersek@redhat.com, kraxel@redhat.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Date: Sat, 19 Jan 2019 23:13:37 -0800 Message-Id: <20190120071337.55595-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120071337.55595-1-liq3ea@163.com> References: <20190120071337.55595-1-liq3ea@163.com> X-CM-TRANSID: D8CowAC3BcvjH0RcbjcZCA--.12038S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw1fJw1kKFyDAr4kXFW3trb_yoW8GF1Dpr yj9FnFkrZ5JF4aqr13GrnrXr4fKr9rCw48CF4qqr40yw1UCr1qqa18CasYg3WDWFWIvFs8 Z3WvqF13Kr4DJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jn73kUUUUU= X-Originating-IP: [115.192.69.226] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbitAlCbVSIaZ9yRgAAsM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.15 Subject: [Qemu-devel] [PATCH 2/2] tests: fw_cfg: add reboot_timeout test case 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 , liq3ea@gmail.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" Signed-off-by: Li Qiang --- tests/fw_cfg-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 1c5103fe1c..c28e6c3fb5 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), =3D=3D, boo= t_menu); } =20 +static void test_fw_cfg_reboot_timeout(void) +{ + uint32_t reboot_timeout; + + qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", + &reboot_timeout, sizeof(reboot_timeout)); + g_assert_cmpint(reboot_timeout, =3D=3D, 15); +} + int main(int argc, char **argv) { QTestState *s; @@ -106,7 +115,8 @@ int main(int argc, char **argv) =20 g_test_init(&argc, &argv, NULL); =20 - s =3D qtest_init("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8"); + s =3D qtest_init("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 " + "-boot reboot-timeout=3D15"); =20 fw_cfg =3D pc_fw_cfg_init(s); =20 @@ -125,6 +135,7 @@ int main(int argc, char **argv) qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus); qtest_add_func("fw_cfg/numa", test_fw_cfg_numa); qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu); + qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout); =20 ret =3D g_test_run(); =20 --=20 2.17.1