From patchwork Thu Jun 30 19:07:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 642738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rgTbw1DCQz9sCg for ; Fri, 1 Jul 2016 05:09:00 +1000 (AEST) Received: from localhost ([::1]:52210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIhKb-0007j2-V7 for incoming@patchwork.ozlabs.org; Thu, 30 Jun 2016 15:08:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIhJC-0006TA-Iu for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIhJ9-0000Uk-3K for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIhJ8-0000Ug-Tr for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:27 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 9AB6E1176D7 for ; Thu, 30 Jun 2016 19:07:26 +0000 (UTC) Received: from work.redhat.com (vpn-201-140.tlv.redhat.com [10.35.201.140]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5UJ7LFa026070; Thu, 30 Jun 2016 15:07:24 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 30 Jun 2016 22:07:15 +0300 Message-Id: <1467313640-29605-2-git-send-email-marcel@redhat.com> In-Reply-To: <1467313640-29605-1-git-send-email-marcel@redhat.com> References: <1467313640-29605-1-git-send-email-marcel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 30 Jun 2016 19:07:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V4 1/6] tests/acpi: add pxb/pxb-pcie tests 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: ehabkost@redhat.com, mst@redhat.com, imammedo@redhat.com, marcel@redhat.com, pbonzini@redhat.com, lersek@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add an ivshmem device with 4G shared memory to pxb in order to check the ACPI code of 64bit MMIO allocation. Suggested-by: Igor Mammedov Signed-off-by: Marcel Apfelbaum --- tests/bios-tables-test.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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);