From patchwork Mon Apr 9 03:39:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Hang X-Patchwork-Id: 10330305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0069660236 for ; Mon, 9 Apr 2018 03:42:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6471288CB for ; Mon, 9 Apr 2018 03:42:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA44028972; Mon, 9 Apr 2018 03:42:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 142CE288CB for ; Mon, 9 Apr 2018 03:42:04 +0000 (UTC) Received: from localhost ([::1]:54949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5Ngx-0005xc-B5 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 08 Apr 2018 23:42:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5NeU-0003sJ-FY for qemu-devel@nongnu.org; Sun, 08 Apr 2018 23:39:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5NeP-0003It-Ga for qemu-devel@nongnu.org; Sun, 08 Apr 2018 23:39:30 -0400 Received: from smtp17.cstnet.cn ([159.226.251.17]:36435 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5NeO-0003Ei-Sm for qemu-devel@nongnu.org; Sun, 08 Apr 2018 23:39:25 -0400 Received: from Water.lan (unknown [124.16.136.100]) by APP-09 (Coremail) with SMTP id swCowAA3Ptpm4MpanlA9AA--.63252S5; Mon, 09 Apr 2018 11:39:18 +0800 (CST) From: Su Hang To: qemu-devel@nongnu.org Date: Mon, 9 Apr 2018 11:39:18 +0800 Message-Id: <1523245158-16443-3-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523245158-16443-1-git-send-email-suhang16@mails.ucas.ac.cn> References: <1523245158-16443-1-git-send-email-suhang16@mails.ucas.ac.cn> X-CM-TRANSID: swCowAA3Ptpm4MpanlA9AA--.63252S5 X-Coremail-Antispam: 1UD129KBjvJXoWxAw1UZw17GFy7WrWxGrykZrb_yoW7JF4rpa nIyrWFkFWxtF1fAa1xKrnrGF1rCrZ7A3Z8CFW3Jr18uFWfZryDAr1fKryUJr4fGa1qvrWf AasYqr1SkFn7XaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv 6xkF7I0E14v26r4UJVWxJr1lnxkEFVAIw20F6cxK64vIFxWle2I262IYc4CY6c8Ij28IcV AaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0E x4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02 Avz4vE14v_Gr4l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU kSksDUUUU X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.17 Subject: [Qemu-devel] [PATCH v4 2/2] Add QTest testcase for the Intel Hexadecimal Object File Loader. 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: stefanha@gmail.com, jim@groklearning.com, joel@jms.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 'test.hex' file is a bare metal ARM software stored in Hexadecimal Object Format. When it's loaded by QEMU, it will print "Hello world!\n" on console. `pre_store` array in 'hexloader-test.c' file, stores the binary format of 'test.hex' file, which is used to verify correctness. Signed-off-by: Su Hang --- MAINTAINERS | 6 ++++ tests/Makefile.include | 2 ++ tests/hex-loader-check-data/test.hex | 11 +++++++ tests/hexloader-test.c | 56 ++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 tests/hex-loader-check-data/test.hex create mode 100644 tests/hexloader-test.c diff --git a/MAINTAINERS b/MAINTAINERS index 24b70169bc37..3d37d04c3345 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1291,6 +1291,12 @@ F: hw/core/generic-loader.c F: include/hw/core/generic-loader.h F: docs/generic-loader.txt +Intel Hexadecimal Object File Loader +M: Su Hang +S: Maintained +F: tests/hexloader-test.c +F: tests/hex-loader-check-data/test.hex + CHRP NVRAM M: Thomas Huth S: Maintained diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2c2..f4a3e71f34ee 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -380,6 +380,7 @@ check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF) gcov-files-arm-y += hw/timer/arm_mptimer.c check-qtest-arm-y += tests/boot-serial-test$(EXESUF) check-qtest-arm-y += tests/sdhci-test$(EXESUF) +check-qtest-arm-y += tests/hexloader-test$(EXESUF) check-qtest-aarch64-y = tests/numa-test$(EXESUF) check-qtest-aarch64-y += tests/sdhci-test$(EXESUF) @@ -755,6 +756,7 @@ tests/qmp-test$(EXESUF): tests/qmp-test.o tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o +tests/hexloader-test$(EXESUF): tests/hexloader-test.o tests/endianness-test$(EXESUF): tests/endianness-test.o tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y) tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) diff --git a/tests/hex-loader-check-data/test.hex b/tests/hex-loader-check-data/test.hex new file mode 100644 index 000000000000..59b96e3e6fa7 --- /dev/null +++ b/tests/hex-loader-check-data/test.hex @@ -0,0 +1,11 @@ +:1000000004D09FE5160000EBFEFFFFEA9810010008 +:1000100004B02DE500B08DE20CD04DE208000BE5F8 +:10002000060000EA08301BE50020D3E52C309FE5F0 +:10003000002083E508301BE5013083E208300BE542 +:1000400008301BE50030D3E5000053E3F4FFFF1A4E +:100050000000A0E100D08BE204B09DE41EFF2FE180 +:1000600000101F1000482DE904B08DE208009FE544 +:10007000E6FFFFEB0000A0E10088BDE8840001007E +:1000800000101F1048656C6C6F20776F726C6421D4 +:020090000A0064 +:00000001FF diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c new file mode 100644 index 000000000000..70f99ac03c6b --- /dev/null +++ b/tests/hexloader-test.c @@ -0,0 +1,56 @@ +/* + * QTest testcase for the Intel Hexadecimal Object File Loader + * + * Authors: + * Su Hang 2018 + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +#define BIN_SIZE 146 + +static unsigned char pre_store[BIN_SIZE] = { + 4, 208, 159, 229, 22, 0, 0, 235, 254, 255, 255, 234, 152, 16, 1, + 0, 4, 176, 45, 229, 0, 176, 141, 226, 12, 208, 77, 226, 8, 0, + 11, 229, 6, 0, 0, 234, 8, 48, 27, 229, 0, 32, 211, 229, 44, + 48, 159, 229, 0, 32, 131, 229, 8, 48, 27, 229, 1, 48, 131, 226, + 8, 48, 11, 229, 8, 48, 27, 229, 0, 48, 211, 229, 0, 0, 83, + 227, 244, 255, 255, 26, 0, 0, 160, 225, 0, 208, 139, 226, 4, 176, + 157, 228, 30, 255, 47, 225, 0, 16, 31, 16, 0, 72, 45, 233, 4, + 176, 141, 226, 8, 0, 159, 229, 230, 255, 255, 235, 0, 0, 160, 225, + 0, 136, 189, 232, 132, 0, 1, 0, 0, 16, 31, 16, 72, 101, 108, + 108, 111, 32, 119, 111, 114, 108, 100, 33, 10, 0}; + +/* success if no crash or abort */ +static void hex_loader_test(void) +{ + unsigned int i; + unsigned char memory_content[BIN_SIZE]; + const unsigned int base_addr = 0x00010000; + + QTestState *s = qtest_startf( + "-M versatilepb -m 128M -nographic -kernel ../tests/hex-loader-check-data/test.hex"); + + for (i = 0; i < BIN_SIZE; ++i) { + memory_content[i] = qtest_readb(s, base_addr + i); + g_assert_cmpuint(memory_content[i], ==, pre_store[i]); + } + qtest_quit(s); +} + +int main(int argc, char **argv) +{ + int ret; + + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/tmp/hex_loader", hex_loader_test); + ret = g_test_run(); + + return ret; +}