[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] tests/cpu-plug-test: Test CPU hot-plugging on s3
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 4/9] tests/cpu-plug-test: Test CPU hot-plugging on s390x |
Date: |
Mon, 22 Jan 2018 12:27:01 +0100 |
CPU hot-plugging on s390x is possible with both, "cpu-add"
and "device_add", so test both.
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/Makefile.include | 1 +
tests/cpu-plug-test.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 092ad5f..851aafe 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -380,6 +380,7 @@ check-qtest-s390x-y += tests/drive_del-test$(EXESUF)
check-qtest-s390x-y += tests/virtio-balloon-test$(EXESUF)
check-qtest-s390x-y += tests/virtio-console-test$(EXESUF)
check-qtest-s390x-y += tests/virtio-serial-test$(EXESUF)
+check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)
check-qtest-generic-y += tests/qom-test$(EXESUF)
check-qtest-generic-y += tests/test-hmp$(EXESUF)
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index a306340..05d82f7 100644
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -212,6 +212,43 @@ static void add_pseries_test_case(const char *mname)
g_free(path);
}
+static void add_s390x_test_case(const char *mname)
+{
+ char *path;
+ PlugTestData *data, *data2;
+
+ if (!g_str_has_prefix(mname, "s390-ccw-virtio-")) {
+ return;
+ }
+
+ data = g_new(PlugTestData, 1);
+ data->machine = g_strdup(mname);
+ data->cpu_model = "qemu";
+ data->device_model = g_strdup("qemu-s390x-cpu");
+ data->sockets = 1;
+ data->cores = 3;
+ data->threads = 1;
+ data->maxcpus = data->sockets * data->cores * data->threads * 2;
+
+ data2 = g_memdup(data, sizeof(PlugTestData));
+ data2->machine = g_strdup(data->machine);
+ data2->device_model = g_strdup(data->device_model);
+
+ path = g_strdup_printf("cpu-plug/%s/cpu-add/%ux%ux%u&maxcpus=%u",
+ mname, data->sockets, data->cores,
+ data->threads, data->maxcpus);
+ qtest_add_data_func_full(path, data, test_plug_with_cpu_add,
+ test_data_free);
+ g_free(path);
+
+ path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u",
+ mname, data2->sockets, data2->cores,
+ data2->threads, data2->maxcpus);
+ qtest_add_data_func_full(path, data2, test_plug_with_device_add_coreid,
+ test_data_free);
+ g_free(path);
+}
+
int main(int argc, char **argv)
{
const char *arch = qtest_get_arch();
@@ -222,6 +259,8 @@ int main(int argc, char **argv)
qtest_cb_for_every_machine(add_pc_test_case);
} else if (g_str_equal(arch, "ppc64")) {
qtest_cb_for_every_machine(add_pseries_test_case);
+ } else if (g_str_equal(arch, "s390x")) {
+ qtest_cb_for_every_machine(add_s390x_test_case);
}
return g_test_run();
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] CPU hotplug test, __FUNCTION__ and some fprintf patches, Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 2/9] tests/cpu-plug-test: Check the CPU hot-plugging with device_add, too, Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 3/9] tests/cpu-plug-test: Check CPU hot-plugging on ppc64, too, Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 1/9] tests: Rename pc-cpu-test.c to cpu-plug-test.c, Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 4/9] tests/cpu-plug-test: Test CPU hot-plugging on s390x,
Thomas Huth <=
- [Qemu-devel] [PULL 6/9] Fixes after renaming __FUNCTION__ to __func__, Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 9/9] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 8/9] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report(), Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 7/9] hw/bt: Replace fprintf(stderr, "*\n" with error_report(), Thomas Huth, 2018/01/22
- [Qemu-devel] [PULL 5/9] Replace all occurances of __FUNCTION__ with __func__, Thomas Huth, 2018/01/22
- Re: [Qemu-devel] [PULL 0/9] CPU hotplug test, __FUNCTION__ and some fprintf patches, Peter Maydell, 2018/01/23