From nobody Wed Oct 29 16:14:09 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1513597771941324.8972503001431; Mon, 18 Dec 2017 03:49:31 -0800 (PST) Received: from localhost ([::1]:58101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtv1-0005A6-Og for importer@patchew.org; Mon, 18 Dec 2017 06:49:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtnN-00071w-Mx for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQtnM-0001jK-Jx for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59966) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQtnM-0001iJ-BM; Mon, 18 Dec 2017 06:41:20 -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 73DBC4A6E6; Mon, 18 Dec 2017 11:41:19 +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 A6B156EE43; Mon, 18 Dec 2017 11:41:12 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Mon, 18 Dec 2017 12:40:51 +0100 Message-Id: <1513597251-21942-5-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.38]); Mon, 18 Dec 2017 11:41:19 +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 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: 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_6 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. Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- 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 9ec7a38..c0a189d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -372,6 +372,7 @@ check-qtest-s390x-y +=3D tests/drive_del-test$(EXESUF) check-qtest-s390x-y +=3D tests/virtio-balloon-test$(EXESUF) check-qtest-s390x-y +=3D tests/virtio-console-test$(EXESUF) check-qtest-s390x-y +=3D tests/virtio-serial-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 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); } =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 g_strdup("qemu-s390x-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(data->machine); + data2->device_model =3D g_strdup(data->device_model); + + 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(); @@ -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); } =20 return g_test_run(); --=20 1.8.3.1