From: Li Qiang <liq3ea@163.com> To: philmd@redhat.com, lersek@redhat.com, kraxel@redhat.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Cc: qemu-devel@nongnu.org, liq3ea@gmail.com, Li Qiang <liq3ea@163.com> Subject: [Qemu-devel] [PATCH v2 4/5] tests: fw_cfg: add reboot_timeout test case Date: Wed, 24 Apr 2019 07:06:42 -0700 [thread overview] Message-ID: <20190424140643.62457-5-liq3ea@163.com> (raw) In-Reply-To: <20190424140643.62457-1-liq3ea@163.com> Signed-off-by: Li Qiang <liq3ea@163.com> --- Change since v1: Converting little endian reboot_timeout to cpu endian tests/fw_cfg-test.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index c22503619f..6c6add54db 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -15,6 +15,7 @@ #include "libqtest.h" #include "standard-headers/linux/qemu_fw_cfg.h" #include "libqos/fw_cfg.h" +#include "qemu/bswap.h" static uint64_t ram_size = 128 << 20; static uint16_t nb_cpus = 1; @@ -174,6 +175,25 @@ static void test_fw_cfg_boot_menu(void) qtest_quit(s); } +static void test_fw_cfg_reboot_timeout(void) +{ + QFWCFG *fw_cfg; + QTestState *s; + uint32_t reboot_timeout = 0; + size_t filesize; + + s = qtest_init("-boot reboot-timeout=15"); + fw_cfg = pc_fw_cfg_init(s); + + filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", + &reboot_timeout, sizeof(reboot_timeout)); + g_assert_cmpint(filesize, ==, sizeof(reboot_timeout)); + reboot_timeout = le32_to_cpu(reboot_timeout); + g_assert_cmpint(reboot_timeout, ==, 15); + pc_fw_cfg_uninit(fw_cfg); + qtest_quit(s); +} + int main(int argc, char **argv) { int ret; @@ -195,6 +215,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); ret = g_test_run(); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Li Qiang <liq3ea@163.com> To: philmd@redhat.com, lersek@redhat.com, kraxel@redhat.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Cc: Li Qiang <liq3ea@163.com>, liq3ea@gmail.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v2 4/5] tests: fw_cfg: add reboot_timeout test case Date: Wed, 24 Apr 2019 07:06:42 -0700 [thread overview] Message-ID: <20190424140643.62457-5-liq3ea@163.com> (raw) Message-ID: <20190424140642.nq3m4Bgn3N3ADupRP00zV7dSYtrqJpeDdcnE_qRiopM@z> (raw) In-Reply-To: <20190424140643.62457-1-liq3ea@163.com> Signed-off-by: Li Qiang <liq3ea@163.com> --- Change since v1: Converting little endian reboot_timeout to cpu endian tests/fw_cfg-test.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index c22503619f..6c6add54db 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -15,6 +15,7 @@ #include "libqtest.h" #include "standard-headers/linux/qemu_fw_cfg.h" #include "libqos/fw_cfg.h" +#include "qemu/bswap.h" static uint64_t ram_size = 128 << 20; static uint16_t nb_cpus = 1; @@ -174,6 +175,25 @@ static void test_fw_cfg_boot_menu(void) qtest_quit(s); } +static void test_fw_cfg_reboot_timeout(void) +{ + QFWCFG *fw_cfg; + QTestState *s; + uint32_t reboot_timeout = 0; + size_t filesize; + + s = qtest_init("-boot reboot-timeout=15"); + fw_cfg = pc_fw_cfg_init(s); + + filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait", + &reboot_timeout, sizeof(reboot_timeout)); + g_assert_cmpint(filesize, ==, sizeof(reboot_timeout)); + reboot_timeout = le32_to_cpu(reboot_timeout); + g_assert_cmpint(reboot_timeout, ==, 15); + pc_fw_cfg_uninit(fw_cfg); + qtest_quit(s); +} + int main(int argc, char **argv) { int ret; @@ -195,6 +215,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); ret = g_test_run(); -- 2.17.1
next prev parent reply other threads:[~2019-04-24 14:14 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-24 14:06 [Qemu-devel] [PATCH v2 0/5] fw_cfg_test refactor and add two test cases Li Qiang 2019-04-24 14:06 ` Li Qiang 2019-04-24 14:06 ` [Qemu-devel] [PATCH v2 1/5] tests: refactor fw_cfg_test Li Qiang 2019-04-24 14:06 ` Li Qiang 2019-04-24 14:06 ` [Qemu-devel] [PATCH v2 2/5] tests: fw_cfg: add a function to get the fw_cfg file Li Qiang 2019-04-24 14:06 ` Li Qiang 2019-04-24 14:06 ` [Qemu-devel] [PATCH v2 3/5] fw_cfg: reboot: store reboot-timeout as little endian Li Qiang 2019-04-24 14:06 ` Li Qiang 2019-04-24 14:06 ` Li Qiang [this message] 2019-04-24 14:06 ` [Qemu-devel] [PATCH v2 4/5] tests: fw_cfg: add reboot_timeout test case Li Qiang 2019-04-24 14:06 ` [Qemu-devel] [PATCH v2 5/5] tests: fw_cfg: add splash time " Li Qiang 2019-04-24 14:06 ` Li Qiang 2019-04-25 9:57 ` [Qemu-devel] [PATCH v2 0/5] fw_cfg_test refactor and add two test cases Thomas Huth 2019-04-25 9:57 ` Thomas Huth 2019-04-25 14:29 ` Li Qiang 2019-04-25 14:29 ` Li Qiang 2019-04-29 5:09 ` Li Qiang 2019-04-29 5:09 ` Li Qiang 2019-04-29 13:18 ` Thomas Huth 2019-04-29 13:18 ` Thomas Huth 2019-04-29 13:46 ` Li Qiang 2019-04-29 13:46 ` Li Qiang 2019-05-09 9:57 ` Li Qiang 2019-05-17 2:28 ` Li Qiang 2019-05-20 21:29 ` Philippe Mathieu-Daudé 2019-05-21 2:17 ` Li Qiang
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=20190424140643.62457-5-liq3ea@163.com \ --to=liq3ea@163.com \ --cc=kraxel@redhat.com \ --cc=lersek@redhat.com \ --cc=liq3ea@gmail.com \ --cc=lvivier@redhat.com \ --cc=pbonzini@redhat.com \ --cc=philmd@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=thuth@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.