Re: [Qemu-devel] [PATCH 1/4] tests: acpi: add CPU hotplug testcase

2016-06-30 Thread Marcel Apfelbaum 

On 06/30/2016 03:23 PM, Igor Mammedov wrote:

Test with:

 -smp 2,cores=3,sockets=2,maxcpus=6

to capture sparse APIC ID values that default
AMD CPU has in above configuration.

Signed-off-by: Igor Mammedov 
---
NOTE to maintainer:

following table blobs should be added to git tree as poart of this commit
after running ./tests/acpi-test-data/rebuild-expected-aml.sh

tests/acpi-test-data/q35/APIC.cphp
tests/acpi-test-data/q35/DSDT.cphp
tests/acpi-test-data/pc/APIC.cphp
tests/acpi-test-data/pc/DSDT.cphp
---
  tests/bios-tables-test.c | 28 
  1 file changed, 28 insertions(+)

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 92c90dd..de4019e 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -801,6 +801,32 @@ static void test_acpi_q35_tcg_bridge(void)
  free_test_data(&data);
  }

+static void test_acpi_piix4_tcg_cphp(void)
+{
+test_data data;
+
+memset(&data, 0, sizeof(data));
+data.machine = MACHINE_PC;
+data.variant = ".cphp";
+test_acpi_one("-machine accel=tcg"
+  " -smp 2,cores=3,sockets=2,maxcpus=6",
+  &data);
+free_test_data(&data);
+}
+
+static void test_acpi_q35_tcg_cphp(void)
+{
+test_data data;
+
+memset(&data, 0, sizeof(data));
+data.machine = MACHINE_Q35;
+data.variant = ".cphp";
+test_acpi_one("-machine q35,accel=tcg"
+  " -smp 2,cores=3,sockets=2,maxcpus=6",
+  &data);
+free_test_data(&data);
+}
+
  static uint8_t ipmi_required_struct_types[] = {
  0, 1, 3, 4, 16, 17, 19, 32, 38, 127
  };
@@ -856,6 +882,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/cpuhp", test_acpi_piix4_tcg_cphp);
+qtest_add_func("acpi/q35/tcg/cpuhp", test_acpi_q35_tcg_cphp);
  }
  ret = g_test_run();
  boot_sector_cleanup(disk);




Reviewed-by: Marcel Apfelbaum 

Thanks,
Marcel

[Qemu-devel] [PATCH 1/4] tests: acpi: add CPU hotplug testcase

2016-06-30 Thread Igor Mammedov 
Test with:

-smp 2,cores=3,sockets=2,maxcpus=6

to capture sparse APIC ID values that default
AMD CPU has in above configuration.

Signed-off-by: Igor Mammedov 
---
NOTE to maintainer:

following table blobs should be added to git tree as poart of this commit
after running ./tests/acpi-test-data/rebuild-expected-aml.sh

tests/acpi-test-data/q35/APIC.cphp
tests/acpi-test-data/q35/DSDT.cphp
tests/acpi-test-data/pc/APIC.cphp
tests/acpi-test-data/pc/DSDT.cphp
---
 tests/bios-tables-test.c | 28 
 1 file changed, 28 insertions(+)

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 92c90dd..de4019e 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -801,6 +801,32 @@ static void test_acpi_q35_tcg_bridge(void)
 free_test_data(&data);
 }
 
+static void test_acpi_piix4_tcg_cphp(void)
+{
+test_data data;
+
+memset(&data, 0, sizeof(data));
+data.machine = MACHINE_PC;
+data.variant = ".cphp";
+test_acpi_one("-machine accel=tcg"
+  " -smp 2,cores=3,sockets=2,maxcpus=6",
+  &data);
+free_test_data(&data);
+}
+
+static void test_acpi_q35_tcg_cphp(void)
+{
+test_data data;
+
+memset(&data, 0, sizeof(data));
+data.machine = MACHINE_Q35;
+data.variant = ".cphp";
+test_acpi_one("-machine q35,accel=tcg"
+  " -smp 2,cores=3,sockets=2,maxcpus=6",
+  &data);
+free_test_data(&data);
+}
+
 static uint8_t ipmi_required_struct_types[] = {
 0, 1, 3, 4, 16, 17, 19, 32, 38, 127
 };
@@ -856,6 +882,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/cpuhp", test_acpi_piix4_tcg_cphp);
+qtest_add_func("acpi/q35/tcg/cpuhp", test_acpi_q35_tcg_cphp);
 }
 ret = g_test_run();
 boot_sector_cleanup(disk);
-- 
1.8.3.1