From nobody Wed Oct 29 16:21:36 2025 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513597629262206.78396761636554; Mon, 18 Dec 2017 03:47:09 -0800 (PST) Received: from localhost ([::1]:58089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtsk-0003MB-Va for importer@patchew.org; Mon, 18 Dec 2017 06:46:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtnG-0006u9-ER for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQtnF-0001cV-Cg for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQtnF-0001bC-4l; Mon, 18 Dec 2017 06:41:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36DD3356F1; Mon, 18 Dec 2017 11:41:12 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75EC96EE43; Mon, 18 Dec 2017 11:41:08 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Mon, 18 Dec 2017 12:40:50 +0100 Message-Id: <1513597251-21942-4-git-send-email-thuth@redhat.com> In-Reply-To: <1513597251-21942-1-git-send-email-thuth@redhat.com> References: <1513597251-21942-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 18 Dec 2017 11:41:12 +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 v2 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: Daniel Barboza , 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". Reviewed-by: Daniel Barboza Tested-by: Daniel Barboza Signed-off-by: Thomas Huth --- 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 a485dd0..9ec7a38 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -333,6 +333,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 1e622cb..a306340 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; @@ -164,6 +186,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 g_strdup("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(); @@ -172,6 +220,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