From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: "Andrew Jones" <drjones@redhat.com>, "Ben Warren" <ben@skyportsystems.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Laszlo Ersek" <lersek@redhat.com>, "Shameer Kolothum" <shameerali.kolothum.thodi@huawei.com>, "Shannon Zhao" <shannon.zhaosl@gmail.com>, Gonglei <arei.gonglei@huawei.com>, "Wei Yang" <richardw.yang@linux.intel.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PATCH v6 2/2] tests: acpi: add simple arm/virt testcase Date: Mon, 3 Jun 2019 13:22:09 +0200 [thread overview] Message-ID: <1559560929-260254-3-git-send-email-imammedo@redhat.com> (raw) In-Reply-To: <1559560929-260254-1-git-send-email-imammedo@redhat.com> adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted. * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v6: * Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed * add aarch64 to rebuild script list v4: * force test to use TCG accelerator v3: * use firmware blobs directly from pc-bios directory * use bios-tables-test.aarch64.iso.qcow2 as test boot image * drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo) * add Makefile rule to include bios-tables-test into check-qtest-aarch64 target v2: * specify in test_data where board's RAM starts and RAM size tests/Makefile.include | 4 ++++ tests/bios-tables-test.c | 18 ++++++++++++++++++ tests/data/acpi/rebuild-expected-aml.sh | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 1865f6b..2334969 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF) check-qtest-aarch64-y = tests/numa-test$(EXESUF) check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF) check-qtest-aarch64-y += tests/migration-test$(EXESUF) +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional +ifneq ($(ARCH),arm) +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF) +endif check-qtest-microblazeel-y += $(check-qtest-microblaze-y) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 28d7d42..1242d63 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } +static void test_acpi_virt_tcg(void) +{ + test_data data = { + .machine = "virt", + .accel = "tcg", + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", + .ram_start = 0x40000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + test_acpi_one("-cpu cortex-a57", &data); + free_test_data(&data); +} + int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); @@ -858,6 +874,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); + } else if (strcmp(arch, "aarch64") == 0) { + qtest_add_func("acpi/virt", test_acpi_virt_tcg); } ret = g_test_run(); boot_sector_cleanup(disk); diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh index ff7e622..d285321 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. -qemu_bins="x86_64-softmmu/qemu-system-x86_64" +qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64" if [ ! -e "tests/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this script." -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Laurent Vivier <lvivier@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Igor Mammedov <imammedo@redhat.com> Subject: [Qemu-devel] [PULL v3 16/17] tests: acpi: add simple arm/virt testcase Date: Wed, 5 Jun 2019 16:00:48 -0400 [thread overview] Message-ID: <1559560929-260254-3-git-send-email-imammedo@redhat.com> (raw) Message-ID: <20190605200048.UjGag2FDaFO7f7BRZddN8_DGcPisXH3SuiH3EUASQEU@z> (raw) In-Reply-To: <20190605195913.12243-1-mst@redhat.com> From: Igor Mammedov <imammedo@redhat.com> adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted. * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <1559560929-260254-3-git-send-email-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- tests/bios-tables-test.c | 18 ++++++++++++++++++ tests/Makefile.include | 4 ++++ tests/data/acpi/rebuild-expected-aml.sh | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 70895e1014..d80ea7f7f3 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -832,6 +832,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } +static void test_acpi_virt_tcg(void) +{ + test_data data = { + .machine = "virt", + .accel = "tcg", + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", + .ram_start = 0x40000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + test_acpi_one("-cpu cortex-a57", &data); + free_test_data(&data); +} + int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); @@ -860,6 +876,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); + } else if (strcmp(arch, "aarch64") == 0) { + qtest_add_func("acpi/virt", test_acpi_virt_tcg); } ret = g_test_run(); boot_sector_cleanup(disk); diff --git a/tests/Makefile.include b/tests/Makefile.include index 1865f6b322..2334969f1f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF) check-qtest-aarch64-y = tests/numa-test$(EXESUF) check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF) check-qtest-aarch64-y += tests/migration-test$(EXESUF) +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional +ifneq ($(ARCH),arm) +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF) +endif check-qtest-microblazeel-y += $(check-qtest-microblaze-y) diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh index ff7e62249d..d2853218dd 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. -qemu_bins="x86_64-softmmu/qemu-system-x86_64" +qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64" if [ ! -e "tests/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this script." -- MST
next prev parent reply other threads:[~2019-06-03 11:23 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-03 11:22 [Qemu-devel] [PATCH v6 0/2] tests: acpi: ARM testing support Igor Mammedov 2019-06-03 11:22 ` [Qemu-devel] [PATCH v6 1/2] tests: add expected ACPI tables for arm/virt board Igor Mammedov 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 15/17] " Michael S. Tsirkin 2019-06-03 11:22 ` Igor Mammedov [this message] 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 16/17] tests: acpi: add simple arm/virt testcase Michael S. Tsirkin 2019-06-03 16:08 ` [Qemu-devel] [PATCH v6 2/2] " Laszlo Ersek 2019-06-04 11:51 ` Igor Mammedov 2019-06-04 17:13 ` Michael S. Tsirkin -- strict thread matches above, loose matches on Subject: below -- 2019-06-05 20:00 [Qemu-devel] [PULL v3 00/17] virtio, pci, pc: cleanups, features Michael S. Tsirkin 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 10/17] bios-tables-test: add diff allowed list Michael S. Tsirkin 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 14/17] bios-tables-test: list all tables that differ Michael S. Tsirkin 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 17/17] bios-tables-test: ignore identical binaries Michael S. Tsirkin 2019-06-06 13:08 ` [Qemu-devel] [PULL v3 00/17] virtio, pci, pc: cleanups, features Peter Maydell 2019-06-03 18:08 [Qemu-devel] [PULL v2 00/14] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 10/14] bios-tables-test: add diff allowed list Michael S. Tsirkin 2019-06-03 18:09 ` [Qemu-devel] [PULL v2 14/14] bios-tables-test: list all tables that differ Michael S. Tsirkin 2019-06-04 15:57 ` [Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features Peter Maydell 2019-06-04 16:48 ` Michael S. Tsirkin 2019-06-04 16:55 ` Peter Maydell 2019-06-04 17:09 ` Michael S. Tsirkin 2019-05-29 16:37 [Qemu-devel] [PULL 00/10] virtio, pci, pc: cleanups Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 01/10] bios-tables-test: add diff allowed list Michael S. Tsirkin 2019-05-29 22:02 ` [Qemu-devel] [PULL 00/10] virtio, pci, pc: cleanups Michael S. Tsirkin 2019-05-21 14:23 [Qemu-devel] [PATCH v2] docs: smbios: remove family=x from type2 entry description Igor Mammedov 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 06/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 06/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 07/10] " Michael S. Tsirkin 2019-05-21 6:28 [Qemu-devel] [PATCH v6 0/2] Extract build_mcfg Part 2 Wei Yang 2019-05-21 6:28 ` [Qemu-devel] [PATCH v6 1/2] hw/acpi: Consolidate build_mcfg to pci.c Wei Yang 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 01/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 01/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 02/10] " Michael S. Tsirkin 2019-05-22 9:11 ` [Qemu-devel] [PATCH v6 1/2] " Igor Mammedov 2019-05-21 6:28 ` [Qemu-devel] [PATCH v6 2/2] acpi: pci: use build_append_foo() API to construct MCFG Wei Yang 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 02/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 02/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 03/10] " Michael S. Tsirkin 2019-05-13 6:19 [Qemu-devel] [PATCH v4 0/5] Simplify some not-really-necessary PCI bus callbacks David Gibson 2019-05-13 6:19 ` [Qemu-devel] [PATCH v4 1/5] pcie: Remove redundant test in pcie_mmcfg_data_{read, write}() David Gibson 2019-05-13 6:19 ` [Qemu-devel] [PATCH v4 2/5] pci: Simplify pci_bus_is_root() David Gibson 2019-05-13 6:19 ` [Qemu-devel] [PATCH v4 3/5] pcie: Simplify pci_adjust_config_limit() David Gibson 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 03/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 03/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 04/10] " Michael S. Tsirkin 2019-05-13 6:19 ` [Qemu-devel] [PATCH v4 4/5] pci: Make is_bridge a bool David Gibson 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 04/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 04/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 05/10] " Michael S. Tsirkin 2019-05-13 6:19 ` [Qemu-devel] [PATCH v4 5/5] pci: Fold pci_get_bus_devfn() into its sole caller David Gibson 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 05/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 05/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 06/10] " Michael S. Tsirkin 2019-05-13 8:02 ` [Qemu-devel] [PATCH v4 5/5] " Greg Kurz 2019-04-30 7:15 [Qemu-devel] [PATCH] vhost: fix memory leak in vhost_user_scsi_realize Jie Wang 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 09/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 09/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 10/10] " Michael S. Tsirkin 2019-04-30 7:15 ` [Qemu-devel] [PATCH] " Jie Wang 2019-05-01 16:40 ` Stefan Hajnoczi 2019-05-29 12:12 ` [Qemu-devel] Ping " Jie Wang 2019-04-30 6:29 [Qemu-devel] [PATCH] vhost: fix incorrect print type Jie Wang 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 08/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 08/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 09/10] " Michael S. Tsirkin 2019-04-30 6:29 ` [Qemu-devel] [PATCH] " Jie Wang 2019-04-30 8:48 ` Philippe Mathieu-Daudé 2019-04-30 8:48 ` Philippe Mathieu-Daudé 2019-05-29 13:13 ` Philippe Mathieu-Daudé 2019-06-06 9:20 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier 2019-05-02 8:30 ` [Qemu-devel] " no-reply 2019-05-02 8:30 ` no-reply 2019-05-02 9:34 ` no-reply 2019-05-02 9:34 ` no-reply 2019-04-30 6:10 [Qemu-devel] [PATCH] vhost: remove the dead code Jie Wang 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 07/17] " Michael S. Tsirkin 2019-06-03 18:08 ` [Qemu-devel] [PULL v2 07/14] " Michael S. Tsirkin 2019-05-29 16:37 ` [Qemu-devel] [PULL 08/10] " Michael S. Tsirkin 2019-04-30 6:10 ` [Qemu-devel] [PATCH] " Jie Wang 2019-05-01 16:38 ` Stefan Hajnoczi 2019-05-01 16:38 ` Stefan Hajnoczi 2019-05-29 12:12 ` [Qemu-devel] Ping " Jie Wang 2019-04-16 12:59 [Qemu-devel] [PATCH v2 0/3] vhost-scsi: Support migration Liran Alon 2019-04-16 12:59 ` Liran Alon 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 1/3] vhost-scsi: The vhost backend should be stopped when the VM is not running Liran Alon 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 11/17] " Michael S. Tsirkin 2019-06-03 18:09 ` [Qemu-devel] [PULL v2 11/14] " Michael S. Tsirkin 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 1/3] " Liran Alon 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 2/3] vhost-scsi: Add VMState descriptor Liran Alon 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 12/17] " Michael S. Tsirkin 2019-06-03 18:09 ` [Qemu-devel] [PULL v2 12/14] " Michael S. Tsirkin 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 2/3] " Liran Alon 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 3/3] vhost-scsi: Allow user to enable migration Liran Alon 2019-06-05 20:00 ` [Qemu-devel] [PULL v3 13/17] " Michael S. Tsirkin 2019-06-03 18:09 ` [Qemu-devel] [PULL v2 13/14] " Michael S. Tsirkin 2019-04-16 12:59 ` [Qemu-devel] [PATCH v2 3/3] " Liran Alon 2019-04-18 9:41 ` [Qemu-devel] [PATCH v2 0/3] vhost-scsi: Support migration Stefan Hajnoczi 2019-04-18 9:41 ` Stefan Hajnoczi 2019-04-24 16:38 ` Liran Alon 2019-04-24 16:38 ` Liran Alon 2019-04-25 8:38 ` Stefan Hajnoczi 2019-04-25 8:38 ` Stefan Hajnoczi 2019-04-25 17:53 ` Michael S. Tsirkin 2019-04-25 17:53 ` Michael S. Tsirkin 2019-05-10 11:48 ` Liran Alon 2019-06-02 23:40 ` Liran Alon 2019-06-03 0:39 ` Michael S. Tsirkin 2019-06-12 15:26 ` Paolo Bonzini
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=1559560929-260254-3-git-send-email-imammedo@redhat.com \ --to=imammedo@redhat.com \ --cc=arei.gonglei@huawei.com \ --cc=ben@skyportsystems.com \ --cc=drjones@redhat.com \ --cc=lersek@redhat.com \ --cc=mst@redhat.com \ --cc=philmd@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=richardw.yang@linux.intel.com \ --cc=shameerali.kolothum.thodi@huawei.com \ --cc=shannon.zhaosl@gmail.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.