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 1513597381299511.8844751433023; Mon, 18 Dec 2017 03:43:01 -0800 (PST) Received: from localhost ([::1]:58062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtov-00081z-8k for importer@patchew.org; Mon, 18 Dec 2017 06:42:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtn7-0006mL-8i for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQtn6-0001Wv-4V for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48600) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQtn5-0001Wb-S8; Mon, 18 Dec 2017 06:41:04 -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 D6DC7C00C7D8; Mon, 18 Dec 2017 11:41:02 +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 4A1E96EE44; Mon, 18 Dec 2017 11:40:58 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Mon, 18 Dec 2017 12:40:48 +0100 Message-Id: <1513597251-21942-2-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> MIME-Version: 1.0 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.31]); Mon, 18 Dec 2017 11:41:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 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: 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-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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- 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 c002352..a485dd0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -277,7 +277,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 @@ -785,7 +785,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/migration-test$(EXESUF): tests/migration-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