From patchwork Thu Sep 17 10:09:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1366033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=anisinha-ca.20150623.gappssmtp.com header.i=@anisinha-ca.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=QgwjkSzP; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BsXzN0QDjz9sTS for ; Thu, 17 Sep 2020 20:20:31 +1000 (AEST) Received: from localhost ([::1]:50010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIr1h-0003kT-GA for incoming@patchwork.ozlabs.org; Thu, 17 Sep 2020 06:20:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIqsI-0000dg-9l for qemu-devel@nongnu.org; Thu, 17 Sep 2020 06:10:46 -0400 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:53081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIqsG-0003Xz-Io for qemu-devel@nongnu.org; Thu, 17 Sep 2020 06:10:46 -0400 Received: by mail-pj1-x1041.google.com with SMTP id o16so1028056pjr.2 for ; Thu, 17 Sep 2020 03:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L+Ojah340YEaZaT0z94cZhpdvD+/mEogBpV/DpUZFRs=; b=QgwjkSzP6voNhdEElmBQFdeeJw8/Z17VVW65PFz0f3YuSYJSp8GJs9MjPhCsN0hQVA 00C/4fAxVx4k92a1CDatabtuoxr3xj99rcMoQXTED7F+agk+KWNT58srwiAMUc/B4WRN IQLvQ3KxGMP884zcMTu/jTJl5kjFfNcevtLcU34ZtXJBuVvKI+MzeFwez6zapqlrfPMO YXznrMBo/rESoWLvoFmEcFNJ1oxC610V+P+tHuqzmnZXYBLXuXBZWkuKpPq6xPMY2oPe wnvPZcK21YTn8Krlo9hkhoZVjWhBVcvvle76F3i1BTiM0kEViFsoLplXEsPUZ3DHIrjX xDfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L+Ojah340YEaZaT0z94cZhpdvD+/mEogBpV/DpUZFRs=; b=EkM6h/oPbJ2T0/o8nTbo1eduBAX4g7yGeyATOupqm3RDu/NMNY0egOM2sJo+ZJV3RO uJn6o2HipxekqKqgsFjtT2co09N7P5Fvn2Gexk/GWxDV5aRmGRyvNo5UdwBkNyEJx15m 0ntY0RlCmKvMHD9DtGz32FQKttVmTYtfeT1xi+PnF6NoYDOhfEUBRiuptWCbLAkE4i+a PX0OmCKd3tglwwnQIlP9XX7s6dQkN74BR4djqN3c79PA9gkSUBTpoK6Rwxe1uFPEF+jo BESFGIP6E+jjxHSxOBVo1ZWibGgubeQxJQYh5dOI2faOL7/VK1+/TlXfS1ORzh15cX5n yrow== X-Gm-Message-State: AOAM533sZcOUicPldCEjX0UNuyNHxKCWq+5YHuR5zn7OnGzhO2tS/YxN p/ftOQ4mQ+BjZQCs8O4e40g/7ycqPWD79n88 X-Google-Smtp-Source: ABdhPJxXdeGEL+j4oNK3Aa18Zef/dGYiiXLSxFnDdriZNh1q9JfsQ8XtjCvk1WZ7pDPYbDgUzPXVJQ== X-Received: by 2002:a17:90b:611:: with SMTP id gb17mr7691876pjb.71.1600337442924; Thu, 17 Sep 2020 03:10:42 -0700 (PDT) Received: from localhost.localdomain ([115.96.122.113]) by smtp.googlemail.com with ESMTPSA id d20sm5241559pjv.39.2020.09.17.03.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 03:10:42 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH v7 11/12] tests/acpi: unit test exercising global pci hotplug off for i440fx Date: Thu, 17 Sep 2020 15:39:46 +0530 Message-Id: <20200917100947.21106-12-ani@anisinha.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200917100947.21106-1-ani@anisinha.ca> References: <20200917100947.21106-1-ani@anisinha.ca> Received-SPF: none client-ip=2607:f8b0:4864:20::1041; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1041.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , jusual@redhat.com, Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This change adds a unit test to exercise the case when hotplug is disabled both for pci root bus and the pci bridges by passing the following two switches to qemu: -global PIIX4_PM.acpi-root-pci-hotplug=off -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off bios-tables-test-allowed-diff.h documents the fact that a new DSDT acpi gold master binary blob we need to be added to test this. We will do the actual addition in the next patch in the series. Signed-off-by: Ani Sinha Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/qtest/bios-tables-test.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..dea61d94f1 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/DSDT.hpbrroot", diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c970556795..3f7f1a8107 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -768,6 +768,21 @@ static void test_acpi_piix4_no_bridge_hotplug(void) free_test_data(&data); } +static void test_acpi_piix4_no_acpi_pci_hotplug(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".hpbrroot"; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); + test_acpi_one("-global PIIX4_PM.acpi-root-pci-hotplug=off " + "-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off " + "-device pci-bridge,chassis_nr=1", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg(void) { test_data data; @@ -1176,6 +1191,8 @@ int main(int argc, char *argv[]) test_acpi_piix4_no_root_hotplug); qtest_add_func("acpi/piix4/pci-hotplug/no_bridge_hotplug", test_acpi_piix4_no_bridge_hotplug); + qtest_add_func("acpi/piix4/pci-hotplug/off", + test_acpi_piix4_no_acpi_pci_hotplug); qtest_add_func("acpi/q35", test_acpi_q35_tcg); qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge); qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);