From nobody Tue May 7 04:15:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508248539216424.1798616467536; Tue, 17 Oct 2017 06:55:39 -0700 (PDT) Received: from localhost ([::1]:39586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4SLA-0006Xq-AV for importer@patchew.org; Tue, 17 Oct 2017 09:55:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4RzT-0006FC-6o for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4RzQ-0003V6-J7 for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50808) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4RzQ-0003UQ-9U; Tue, 17 Oct 2017 09:33:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EF2B4E02B; Tue, 17 Oct 2017 13:32:59 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26F6363752; Tue, 17 Oct 2017 13:32:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2EF2B4E02B Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Tue, 17 Oct 2017 15:32:25 +0200 Message-Id: <1508247148-25240-2-git-send-email-thuth@redhat.com> In-Reply-To: <1508247148-25240-1-git-send-email-thuth@redhat.com> References: <1508247148-25240-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 17 Oct 2017 13:32:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] tests: Rename pc-cpu-test.c to cpu-plug-test.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, david@redhat.com, qemu-ppc@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The test will be extended to work on other architectures, too, so let's use a more generic name for the file and the functions in here first. Signed-off-by: Thomas Huth Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 4 ++-- tests/{pc-cpu-test.c =3D> cpu-plug-test.c} | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) rename tests/{pc-cpu-test.c =3D> cpu-plug-test.c} (87%) diff --git a/tests/Makefile.include b/tests/Makefile.include index 4ca15e6..3d7e814 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -276,7 +276,7 @@ gcov-files-i386-y +=3D hw/usb/dev-hid.c gcov-files-i386-y +=3D hw/usb/dev-storage.c check-qtest-i386-y +=3D tests/usb-hcd-xhci-test$(EXESUF) gcov-files-i386-y +=3D hw/usb/hcd-xhci.c -check-qtest-i386-y +=3D tests/pc-cpu-test$(EXESUF) +check-qtest-i386-y +=3D tests/cpu-plug-test$(EXESUF) check-qtest-i386-y +=3D tests/q35-test$(EXESUF) check-qtest-i386-y +=3D tests/vmgenid-test$(EXESUF) gcov-files-i386-y +=3D hw/pci-host/q35.c @@ -780,7 +780,7 @@ tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-te= st.o $(libqos-usb-obj-y) tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-o= bj-y) tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-o= bj-y) tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-o= bj-y) -tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o +tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o tests/postcopy-test$(EXESUF): tests/postcopy-test.o tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y)= \ $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y)= \ diff --git a/tests/pc-cpu-test.c b/tests/cpu-plug-test.c similarity index 87% rename from tests/pc-cpu-test.c rename to tests/cpu-plug-test.c index 11d3e81..4579119 100644 --- a/tests/pc-cpu-test.c +++ b/tests/cpu-plug-test.c @@ -1,5 +1,5 @@ /* - * QTest testcase for PC CPUs + * QTest testcase for CPU plugging * * Copyright (c) 2015 SUSE Linux GmbH * @@ -13,7 +13,7 @@ #include "libqtest.h" #include "qapi/qmp/types.h" =20 -struct PCTestData { +struct PlugTestData { char *machine; const char *cpu_model; unsigned sockets; @@ -21,11 +21,11 @@ struct PCTestData { unsigned threads; unsigned maxcpus; }; -typedef struct PCTestData PCTestData; +typedef struct PlugTestData PlugTestData; =20 -static void test_pc_with_cpu_add(gconstpointer data) +static void test_plug_with_cpu_add(gconstpointer data) { - const PCTestData *s =3D data; + const PlugTestData *s =3D data; char *args; QDict *response; unsigned int i; @@ -48,9 +48,9 @@ static void test_pc_with_cpu_add(gconstpointer data) g_free(args); } =20 -static void test_pc_without_cpu_add(gconstpointer data) +static void test_plug_without_cpu_add(gconstpointer data) { - const PCTestData *s =3D data; + const PlugTestData *s =3D data; char *args; QDict *response; =20 @@ -73,7 +73,7 @@ static void test_pc_without_cpu_add(gconstpointer data) =20 static void test_data_free(gpointer data) { - PCTestData *pc =3D data; + PlugTestData *pc =3D data; =20 g_free(pc->machine); g_free(pc); @@ -82,12 +82,12 @@ static void test_data_free(gpointer data) static void add_pc_test_case(const char *mname) { char *path; - PCTestData *data; + PlugTestData *data; =20 if (!g_str_has_prefix(mname, "pc-")) { return; } - data =3D g_new(PCTestData, 1); + data =3D g_new(PlugTestData, 1); data->machine =3D g_strdup(mname); data->cpu_model =3D "Haswell"; /* 1.3+ theoretically */ data->sockets =3D 1; @@ -108,14 +108,14 @@ static void add_pc_test_case(const char *mname) path =3D g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=3D%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_pc_without_cpu_add, + qtest_add_data_func_full(path, data, test_plug_without_cpu_add, test_data_free); g_free(path); } else { path =3D g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=3D%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_pc_with_cpu_add, + qtest_add_data_func_full(path, data, test_plug_with_cpu_add, test_data_free); g_free(path); } --=20 1.8.3.1 From nobody Tue May 7 04:15:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 150824737069956.32915333768631; Tue, 17 Oct 2017 06:36:10 -0700 (PDT) Received: from localhost ([::1]:39329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S2J-0008C4-PK for importer@patchew.org; Tue, 17 Oct 2017 09:35:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S0D-0006nD-3M for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4S03-0003n7-6j for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36277) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4S02-0003mj-UL; Tue, 17 Oct 2017 09:33:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DB6F83D09; Tue, 17 Oct 2017 13:33:37 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64A3E66D39; Tue, 17 Oct 2017 13:32:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DB6F83D09 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Tue, 17 Oct 2017 15:32:26 +0200 Message-Id: <1508247148-25240-3-git-send-email-thuth@redhat.com> In-Reply-To: <1508247148-25240-1-git-send-email-thuth@redhat.com> References: <1508247148-25240-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 17 Oct 2017 13:33:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] tests/cpu-plug-test: Check the CPU hot-plugging with device_add, too X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, david@redhat.com, qemu-ppc@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using 'device_add' instead of 'cpu-add' is the new way for hot-plugging CPUs, so we should test this regularly, too. Signed-off-by: Thomas Huth Reviewed-by: David Hildenbrand --- tests/cpu-plug-test.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 4579119..5fef297 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -16,6 +16,7 @@ struct PlugTestData { char *machine; const char *cpu_model; + const char *device_model; unsigned sockets; unsigned cores; unsigned threads; @@ -71,6 +72,34 @@ static void test_plug_without_cpu_add(gconstpointer data) g_free(args); } =20 +static void test_plug_with_device_add_x86(gconstpointer data) +{ + const PlugTestData *td =3D data; + char *args; + unsigned int s, c, t; + + args =3D g_strdup_printf("-machine %s -cpu %s " + "-smp sockets=3D%u,cores=3D%u,threads=3D%u,maxc= pus=3D%u", + td->machine, td->cpu_model, + td->sockets, td->cores, td->threads, td->maxcpu= s); + qtest_start(args); + + for (s =3D td->sockets; s < td->maxcpus / td->cores / td->threads; s++= ) { + for (c =3D 0; c < td->cores; c++) { + for (t =3D 0; t < td->threads; t++) { + char *id =3D g_strdup_printf("id-%i-%i-%i", s, c, t); + qtest_qmp_device_add(td->device_model, id, "'socket-id':'%= i', " + "'core-id':'%i', 'thread-id':'%i'", + s, c, t); + g_free(id); + } + } + } + + qtest_end(); + g_free(args); +} + static void test_data_free(gpointer data) { PlugTestData *pc =3D data; @@ -90,6 +119,7 @@ static void add_pc_test_case(const char *mname) data =3D g_new(PlugTestData, 1); data->machine =3D g_strdup(mname); data->cpu_model =3D "Haswell"; /* 1.3+ theoretically */ + data->device_model =3D "Haswell-x86_64-cpu"; data->sockets =3D 1; data->cores =3D 3; data->threads =3D 2; @@ -105,19 +135,27 @@ static void add_pc_test_case(const char *mname) (strcmp(mname, "pc-0.12") =3D=3D 0) || (strcmp(mname, "pc-0.11") =3D=3D 0) || (strcmp(mname, "pc-0.10") =3D=3D 0)) { - path =3D g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=3D%u", + path =3D g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=3D%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); qtest_add_data_func_full(path, data, test_plug_without_cpu_add, test_data_free); g_free(path); } else { - path =3D g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=3D%u", + PlugTestData *data2 =3D g_memdup(data, sizeof(PlugTestData)); + data2->machine =3D g_strdup(mname); + path =3D g_strdup_printf("cpu-plug/%s/cpu-add/%ux%ux%u&maxcpus=3D%= 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 =3D g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus= =3D%u", + mname, data2->sockets, data2->cores, + data2->threads, data2->maxcpus); + qtest_add_data_func_full(path, data2, test_plug_with_device_add_x8= 6, + test_data_free); + g_free(path); } } =20 --=20 1.8.3.1 From nobody Tue May 7 04:15:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508247752653588.8007045385783; Tue, 17 Oct 2017 06:42:32 -0700 (PDT) Received: from localhost ([::1]:39445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S8Y-0005MK-Uy for importer@patchew.org; Tue, 17 Oct 2017 09:42:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S0A-0006m9-65 for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4S06-0003p0-2D for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59566) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4S05-0003oT-QD; Tue, 17 Oct 2017 09:33:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E18333E2C8; Tue, 17 Oct 2017 13:33:40 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28E9163741; Tue, 17 Oct 2017 13:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E18333E2C8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Tue, 17 Oct 2017 15:32:27 +0200 Message-Id: <1508247148-25240-4-git-send-email-thuth@redhat.com> In-Reply-To: <1508247148-25240-1-git-send-email-thuth@redhat.com> References: <1508247148-25240-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 17 Oct 2017 13:33:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] tests/cpu-plug-test: Check CPU hot-plugging on ppc64, too X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, david@redhat.com, qemu-ppc@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hot plugging on ppc64 is possible via "device_add", too. Unlike x86, we must not specify a 'socket-id' and 'thread-id' here, so this needs to be done with a separate function that just specifies the 'core-id' during the "device_add". Signed-off-by: Thomas Huth Reviewed-by: Daniel Barboza Tested-by: Daniel Barboza --- tests/Makefile.include | 1 + tests/cpu-plug-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 51 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3d7e814..cbec19f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -332,6 +332,7 @@ check-qtest-ppc64-$(CONFIG_POSIX) +=3D tests/test-filte= r-redirector$(EXESUF) check-qtest-ppc64-y +=3D tests/display-vga-test$(EXESUF) check-qtest-ppc64-y +=3D tests/numa-test$(EXESUF) check-qtest-ppc64-$(CONFIG_IVSHMEM) +=3D tests/ivshmem-test$(EXESUF) +check-qtest-ppc64-y +=3D tests/cpu-plug-test$(EXESUF) =20 check-qtest-sh4-y =3D tests/endianness-test$(EXESUF) =20 diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 5fef297..714a69c 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -100,6 +100,28 @@ static void test_plug_with_device_add_x86(gconstpointe= r data) g_free(args); } =20 +static void test_plug_with_device_add_coreid(gconstpointer data) +{ + const PlugTestData *td =3D data; + char *args; + unsigned int c; + + args =3D g_strdup_printf("-machine %s -cpu %s " + "-smp 1,sockets=3D%u,cores=3D%u,threads=3D%u,ma= xcpus=3D%u", + td->machine, td->cpu_model, + td->sockets, td->cores, td->threads, td->maxcpu= s); + qtest_start(args); + + for (c =3D td->cores; c < td->maxcpus / td->sockets / td->threads; c++= ) { + char *id =3D g_strdup_printf("id-%i", c); + qtest_qmp_device_add(td->device_model, id, "'core-id':'%i'", c); + g_free(id); + } + + qtest_end(); + g_free(args); +} + static void test_data_free(gpointer data) { PlugTestData *pc =3D data; @@ -159,6 +181,32 @@ static void add_pc_test_case(const char *mname) } } =20 +static void add_pseries_test_case(const char *mname) +{ + char *path; + PlugTestData *data; + + if (!g_str_has_prefix(mname, "pseries-") || + (g_str_has_prefix(mname, "pseries-2.") && atoi(&mname[10]) < 7)) { + return; + } + data =3D g_new(PlugTestData, 1); + data->machine =3D g_strdup(mname); + data->cpu_model =3D "POWER8_v2.0"; + data->device_model =3D "power8_v2.0-spapr-cpu-core"; + data->sockets =3D 2; + data->cores =3D 3; + data->threads =3D 1; + data->maxcpus =3D data->sockets * data->cores * data->threads * 2; + + path =3D g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=3D%u= ", + mname, data->sockets, data->cores, + data->threads, data->maxcpus); + qtest_add_data_func_full(path, data, test_plug_with_device_add_coreid, + test_data_free); + g_free(path); +} + int main(int argc, char **argv) { const char *arch =3D qtest_get_arch(); @@ -167,6 +215,8 @@ int main(int argc, char **argv) =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { 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); } =20 return g_test_run(); --=20 1.8.3.1 From nobody Tue May 7 04:15:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508247590735827.3118320165637; Tue, 17 Oct 2017 06:39:50 -0700 (PDT) Received: from localhost ([::1]:39401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S5n-0002tb-Gi for importer@patchew.org; Tue, 17 Oct 2017 09:39:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S0C-0006mg-0n for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4S0A-0003s2-UZ for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:33:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4S0A-0003rb-Mi; Tue, 17 Oct 2017 09:33:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 975F6C058EB4; Tue, 17 Oct 2017 13:33:45 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35FDD6683E; Tue, 17 Oct 2017 13:33:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 975F6C058EB4 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Tue, 17 Oct 2017 15:32:28 +0200 Message-Id: <1508247148-25240-5-git-send-email-thuth@redhat.com> In-Reply-To: <1508247148-25240-1-git-send-email-thuth@redhat.com> References: <1508247148-25240-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 17 Oct 2017 13:33:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] tests/cpu-plug-test: Test CPU hot-plugging on s390x X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, david@redhat.com, qemu-ppc@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" CPU hot-plugging on s390x is possible with both, "cpu-add" and "device_add", so test both. Signed-off-by: Thomas Huth Reviewed-by: David Hildenbrand --- tests/Makefile.include | 1 + tests/cpu-plug-test.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index cbec19f..85cf9ea 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -368,6 +368,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/test-netfi= lter$(EXESUF) check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-redirector$(EXESU= F) check-qtest-s390x-y +=3D tests/drive_del-test$(EXESUF) +check-qtest-s390x-y +=3D tests/cpu-plug-test$(EXESUF) =20 check-qtest-generic-y +=3D tests/qom-test$(EXESUF) check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 714a69c..58edaf6 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -207,6 +207,42 @@ static void add_pseries_test_case(const char *mname) g_free(path); } =20 +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 =3D g_new(PlugTestData, 1); + data->machine =3D g_strdup(mname); + data->cpu_model =3D "qemu"; + data->device_model =3D "qemu-s390-cpu"; + data->sockets =3D 1; + data->cores =3D 3; + data->threads =3D 1; + data->maxcpus =3D data->sockets * data->cores * data->threads * 2; + + data2 =3D g_memdup(data, sizeof(PlugTestData)); + data2->machine =3D g_strdup(mname); + + path =3D g_strdup_printf("cpu-plug/%s/cpu-add/%ux%ux%u&maxcpus=3D%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 =3D g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=3D%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 =3D qtest_get_arch(); @@ -217,6 +253,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); } =20 return g_test_run(); --=20 1.8.3.1