qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ani Sinha <ani@anisinha.ca>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	jusual@redhat.com, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Ani Sinha" <ani@anisinha.ca>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 10/11] tests/acpi: unit test exercizing hotplug off for pci root bus & bridge in i440fx
Date: Wed, 16 Sep 2020 11:43:34 +0530	[thread overview]
Message-ID: <20200916061335.14045-11-ani@anisinha.ca> (raw)
In-Reply-To: <20200916061335.14045-1-ani@anisinha.ca>

This change adds a unit test to exercize 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.

The following link contains the disassembly of the DSDT table after passing the above
two switches to qemu: https://pastebin.ubuntu.com/p/WvpYYjpPN8/

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 tests/qtest/bios-tables-test-allowed-diff.h |  1 +
 tests/qtest/bios-tables-test.c              | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

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 7632cfe1be..4c834474ad 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -768,6 +768,21 @@ static void test_acpi_piix4_bridge_hotplug(void)
     free_test_data(&data);
 }
 
+static void test_acpi_piix4_bridge_root_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;
@@ -1172,8 +1187,10 @@ int main(int argc, char *argv[])
         qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis);
         qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
         qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
-        qtest_add_func("acpi/piix4/hotplug", test_acpi_piix4_root_hotplug);
+        qtest_add_func("acpi/piix4/roothotplug", test_acpi_piix4_root_hotplug);
         qtest_add_func("acpi/piix4/brhotplug", test_acpi_piix4_bridge_hotplug);
+        qtest_add_func("acpi/piix4/disablehp",
+                       test_acpi_piix4_bridge_root_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);
-- 
2.17.1



  parent reply	other threads:[~2020-09-16  6:32 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-16  6:13 [PATCH v4 00/11] i440fx/acpi: addition of feature and bug fixes Ani Sinha
2020-09-16  6:13 ` [PATCH v4 01/11] tests/acpi: document addition of table DSDT.roothp for unit testing root pci hotplug on/off Ani Sinha
2020-09-16  6:13 ` [PATCH v4 02/11] tests/acpi: add a new unit test to test hotplug off/on feature on the root pci bus Ani Sinha
2020-09-16  6:35   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 03/11] tests/acpi: add a new ACPI table in order to test root pci hotplug on/off Ani Sinha
2020-09-16  6:36   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 04/11] Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus Ani Sinha
2020-09-16  6:41   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 05/11] i440fx/acpi: do not add hotplug related amls for cold plugged bridges Ani Sinha
2020-09-16  6:55   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 06/11] tests/acpi: list added acpi table binary file for pci bridge hotplug test Ani Sinha
2020-09-16  6:13 ` [PATCH v4 07/11] tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag Ani Sinha
2020-09-16  7:01   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 08/11] tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag Ani Sinha
2020-09-16  7:02   ` Igor Mammedov
2020-09-16  6:13 ` [PATCH v4 09/11] piix4: don't reserve hw resources when hotplug is off globally Ani Sinha
2020-09-16  6:13 ` Ani Sinha [this message]
2020-09-16  7:11   ` [PATCH v4 10/11] tests/acpi: unit test exercizing hotplug off for pci root bus & bridge in i440fx Igor Mammedov
2020-09-16  7:36   ` Igor Mammedov
2020-09-16  7:41   ` Thomas Huth
2020-09-16 10:57     ` Ani Sinha
2020-09-16  6:13 ` [PATCH v4 11/11] tests/acpi: add DSDT.hpbrroot DSDT table blob to test global i440fx hotplug Ani Sinha
2020-09-16  7:15 ` [PATCH v4 00/11] i440fx/acpi: addition of feature and bug fixes Igor Mammedov
2020-09-16  7:18   ` Ani Sinha

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=20200916061335.14045-11-ani@anisinha.ca \
    --to=ani@anisinha.ca \
    --cc=aleksandar.qemu.devel@gmail.com \
    --cc=aurelien@aurel32.net \
    --cc=ehabkost@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=imammedo@redhat.com \
    --cc=jusual@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).