From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHpny-0004A5-A6 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHpnv-000063-F5 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:59:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHpnv-00005z-72 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:59:39 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B68CD80E4A for ; Tue, 28 Jun 2016 09:59:38 +0000 (UTC) From: Marcel Apfelbaum Date: Tue, 28 Jun 2016 12:59:28 +0300 Message-Id: <1467107968-10410-4-git-send-email-marcel@redhat.com> In-Reply-To: <1467107968-10410-1-git-send-email-marcel@redhat.com> References: <1467107968-10410-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V3 3/3] tests/acpi: add pxb/pxb-pcie tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, lersek@redhat.com, ehabkost@redhat.com Add an ivshmem device with 4G shared memory to pxb in order to check the ACPI code of 64bit MMIO allocation. Signed-off-by: Marcel Apfelbaum --- tests/acpi-test-data/pc/DSDT.pxb | Bin 0 -> 6329 bytes tests/acpi-test-data/q35/DSDT.pxb_pcie | Bin 0 -> 9098 bytes tests/bios-tables-test.c | 37 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 tests/acpi-test-data/pc/DSDT.pxb create mode 100644 tests/acpi-test-data/q35/DSDT.pxb_pcie diff --git a/tests/acpi-test-data/pc/DSDT.pxb b/tests/acpi-test-data/pc/DSDT.pxb new file mode 100644 index 0000000000000000000000000000000000000000..8c0dbf714e7fb7b7a7cdd32945f07f721d45d7d8 GIT binary patch literal 6329 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 D-{y{a literal 0 HcmV?d00001 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 92c90dd..3d87f9e 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -838,6 +838,41 @@ static void test_acpi_piix4_tcg_ipmi(void) free_test_data(&data); } +static void test_acpi_piix4_tcg_pxb(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".pxb"; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); + test_acpi_one("-machine accel=tcg" + " -device pxb,id=pxb,bus_nr=0x80,bus=pci.0" + " -object memory-backend-file,size=4G,mem-path=/tmp/shmem,share,id=mb" + " -device ivshmem-plain,memdev=mb,bus=pxb", + &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_pxb_pcie(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".pxb_pcie"; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types); + test_acpi_one("-machine q35,accel=tcg" + " -device pxb-pcie,id=pxb,bus_nr=0x80,bus=pcie.0" + " -device ioh3420,id=rp,bus=pxb,slot=1" + " -object memory-backend-file,size=4G,mem-path=/tmp/shmem,share,id=mb" + " -device ivshmem-plain,memdev=mb,bus=rp", + &data); + free_test_data(&data); +} + int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); @@ -856,6 +891,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/tcg/bridge", test_acpi_q35_tcg_bridge); qtest_add_func("acpi/piix4/tcg/ipmi", test_acpi_piix4_tcg_ipmi); qtest_add_func("acpi/q35/tcg/ipmi", test_acpi_q35_tcg_ipmi); + qtest_add_func("acpi/piix4/tcg/pxb", test_acpi_piix4_tcg_pxb); + qtest_add_func("acpi/q35/tcg/pxb-pcie", test_acpi_q35_tcg_pxb_pcie); } ret = g_test_run(); boot_sector_cleanup(disk); -- 2.4.3