qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Isaku Yamahata <isaku.yamahata@intel.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [PULL 13/17] acpi: add test case for smm unsupported -machine smm=off
Date: Tue, 23 Feb 2021 11:04:12 -0500	[thread overview]
Message-ID: <20210223160144.1507082-14-mst@redhat.com> (raw)
In-Reply-To: <20210223160144.1507082-1-mst@redhat.com>

From: Isaku Yamahata <isaku.yamahata@intel.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Message-Id: <22f774a51255af1608b07b00b257af426adcf4ab.1613615732.git.isaku.yamahata@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/qtest/bios-tables-test.c | 76 ++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 77053975aa..93d037c29d 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -973,6 +973,39 @@ static void test_acpi_piix4_tcg_memhp(void)
     free_test_data(&data);
 }
 
+static void test_acpi_piix4_tcg_nosmm(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".nosmm";
+    test_acpi_one("-machine smm=off", &data);
+    free_test_data(&data);
+}
+
+static void test_acpi_piix4_tcg_smm_compat(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".smm-compat";
+    test_acpi_one("-global PIIX4_PM.smm-compat=on", &data);
+    free_test_data(&data);
+}
+
+static void test_acpi_piix4_tcg_smm_compat_nosmm(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".smm-compat-nosmm";
+    test_acpi_one("-global PIIX4_PM.smm-compat=on -machine smm=off", &data);
+    free_test_data(&data);
+}
+
 static void test_acpi_q35_tcg_numamem(void)
 {
     test_data data;
@@ -985,6 +1018,39 @@ static void test_acpi_q35_tcg_numamem(void)
     free_test_data(&data);
 }
 
+static void test_acpi_q35_tcg_nosmm(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_Q35;
+    data.variant = ".nosmm";
+    test_acpi_one("-machine smm=off", &data);
+    free_test_data(&data);
+}
+
+static void test_acpi_q35_tcg_smm_compat(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_Q35;
+    data.variant = ".smm-compat";
+    test_acpi_one("-global ICH9-LPC.smm-compat=on", &data);
+    free_test_data(&data);
+}
+
+static void test_acpi_q35_tcg_smm_compat_nosmm(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_Q35;
+    data.variant = ".smm-compat-nosmm";
+    test_acpi_one("-global ICH9-LPC.smm-compat=on -machine smm=off", &data);
+    free_test_data(&data);
+}
+
 static void test_acpi_piix4_tcg_numamem(void)
 {
     test_data data;
@@ -1445,6 +1511,16 @@ int main(int argc, char *argv[])
         qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp);
         qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem);
         qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
+        qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_nosmm);
+        qtest_add_func("acpi/piix4/smm-compat",
+                       test_acpi_piix4_tcg_smm_compat);
+        qtest_add_func("acpi/piix4/smm-compat-nosmm",
+                       test_acpi_piix4_tcg_smm_compat_nosmm);
+        qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm);
+        qtest_add_func("acpi/q35/smm-compat",
+                       test_acpi_q35_tcg_smm_compat);
+        qtest_add_func("acpi/q35/smm-compat-nosmm",
+                       test_acpi_q35_tcg_smm_compat_nosmm);
         qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
         qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
         qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat);
-- 
MST



  parent reply	other threads:[~2021-02-23 16:09 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-23 16:03 [PULL 00/17] pc,virtio,pci: fixes, tests Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 01/17] pci: cleanup failover sanity check Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 02/17] virtio-net: add missing object_unref() Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 03/17] failover: really display a warning when the primary device is not found Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 04/17] pcie: don't set link state active if the slot is empty Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 05/17] acpi: Allow pxb DSDT acpi table changes Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 06/17] acpi/gpex: Fix cca attribute check for pxb device Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 07/17] tests/data/acpi/virt/DSDT.pxb: update with _CCA Michael S. Tsirkin
2021-02-23 16:03 ` [PULL 08/17] checkpatch: don't emit warning on newly created acpi data files Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 09/17] qtest: update tests/qtest/bios-tables-test-allowed-diff.h Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 10/17] ich9, piix4: add property, smm-compat, to keep compatibility of SMM Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 11/17] acpi/core: always set SCI_EN when SMM isn't supported Michael S. Tsirkin
2021-02-23 16:04 ` Michael S. Tsirkin [this message]
2021-02-23 16:04 ` [PULL 14/17] hw/i386: declare ACPI mother board resource for MMCONFIG region Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 15/17] i386: acpi: Don't build HPET ACPI entry if HPET is disabled Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 16/17] acpi: add test case for -no-hpet Michael S. Tsirkin
2021-02-23 16:04 ` [PULL 17/17] qtest/acpi/bios-tables-test: update acpi tables Michael S. Tsirkin
2021-02-23 16:05 ` [PULL 12/17] acpi: set fadt.smi_cmd to zero when SMM is not supported Michael S. Tsirkin
2021-02-25 19:07 ` [PULL 00/17] pc,virtio,pci: fixes, tests Peter Maydell

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=20210223160144.1507082-14-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=isaku.yamahata@intel.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).