| Message ID | 1525936711-24538-3-git-send-email-suhang16@mails.ucas.ac.cn |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Thu, May 10, 2018 at 03:18:31PM +0800, Su Hang wrote: > '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 <suhang16@mails.ucas.ac.cn> > --- > MAINTAINERS | 6 ++++ > tests/Makefile.include | 2 ++ > tests/hex-loader-check-data/test.hex | 12 ++++++++ > tests/hexloader-test.c | 56 ++++++++++++++++++++++++++++++++++++ > 4 files changed, 76 insertions(+) > create mode 100644 tests/hex-loader-check-data/test.hex > create mode 100644 tests/hexloader-test.c Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 10.05.2018 09:18, Su Hang wrote: Hi, this will be my first comment on devel as part of my GSoC participation this year. > + > + QTestState *s = qtest_startf( > + "-M versatilepb -m 128M -nographic -kernel ../tests/hex-loader-check-data/test.hex"); > + The test binary "text.hex" is not being copied to out-of-tree builds at the moment and the test run will therefore fail. The acpi tests also use a fixture (acpi-test-data) which is being copied to the out-of-tree build in ./configure:L7181 . This might also be an option for your test.
On Mon, May 14, 2018 at 08:57:48AM +0200, Steffen Görtz wrote: > On 10.05.2018 09:18, Su Hang wrote: > > + > > + QTestState *s = qtest_startf( > > + "-M versatilepb -m 128M -nographic -kernel ../tests/hex-loader-check-data/test.hex"); > > + > > The test binary "text.hex" is not being copied to out-of-tree builds at > the moment and the test run will therefore fail. > The acpi tests also use a fixture (acpi-test-data) which is being copied > to the out-of-tree build in ./configure:L7181 . > This might also be an option for your test. To explain how out-of-tree builds work for anyone who hasn't seen them before: $ mkdir /var/tmp/build-dir $ cd /var/tmp/build-dir $ ~/qemu/configure ... && make The .o files and other build output will be located in /var/tmp/build-dir (away from the source code in ~/qemu/). The build system must ensure that data files are available to the test program in /var/tmp/build-dir/ if an out-of-tree build is being done. In the acpi-test-data case that Steffen mentioned the ./configure script sets up symlinks: for test_file in $(find $source_path/tests/acpi-test-data -type f) do FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')" done ... symlink "$source_path/$f" "$f" Please add hex-loader-check-data in the same way. Stefan
Great! Thanks for your suggestion! Best, SU Hang "Steffen Görtz" <qemu.ml@steffen-goertz.de>wrote: > On 10.05.2018 09:18, Su Hang wrote: > > Hi, > this will be my first comment on devel as part of my GSoC participation > this year. > > > + > > + QTestState *s = qtest_startf( > > + "-M versatilepb -m 128M -nographic -kernel ../tests/hex-loader-check-data/test.hex"); > > + > > The test binary "text.hex" is not being copied to out-of-tree builds at > the moment and the test run will therefore fail. > The acpi tests also use a fixture (acpi-test-data) which is being copied > to the out-of-tree build in ./configure:L7181 . > This might also be an option for your test.
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 <suhang16@mails.ucas.ac.cn> +S: Maintained +F: tests/hexloader-test.c +F: tests/hex-loader-check-data/test.hex + CHRP NVRAM M: Thomas Huth <thuth@redhat.com> 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..7e99b452f5cc --- /dev/null +++ b/tests/hex-loader-check-data/test.hex @@ -0,0 +1,12 @@ +:020000040001F9 +: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 <suhang16@mails.ucas.ac.cn> 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; +}
'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 <suhang16@mails.ucas.ac.cn> --- MAINTAINERS | 6 ++++ tests/Makefile.include | 2 ++ tests/hex-loader-check-data/test.hex | 12 ++++++++ tests/hexloader-test.c | 56 ++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 tests/hex-loader-check-data/test.hex create mode 100644 tests/hexloader-test.c