From patchwork Mon Dec 18 11:40:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 850000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z0fND1k12z9s83 for ; Mon, 18 Dec 2017 22:45:00 +1100 (AEDT) Received: from localhost ([::1]:58076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtqs-0001TT-Bb for incoming@patchwork.ozlabs.org; Mon, 18 Dec 2017 06:44:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQtnD-0006rw-Qs for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQtnA-0001Z6-Nm for qemu-devel@nongnu.org; Mon, 18 Dec 2017 06:41:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQtnA-0001Yr-Fb; Mon, 18 Dec 2017 06:41:08 -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 934CE80C0D; Mon, 18 Dec 2017 11:41:07 +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 586356EE43; Mon, 18 Dec 2017 11:41:03 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini Date: Mon, 18 Dec 2017 12:40:49 +0100 Message-Id: <1513597251-21942-3-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.26]); Mon, 18 Dec 2017 11:41:07 +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 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: Daniel Barboza , qemu-s390x@nongnu.org, david@redhat.com, qemu-ppc@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using 'device_add' instead of 'cpu-add' is the new way for hot-plugging CPUs, so we should test this regularly, too. Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth Reviewed-by: Daniel Henrique Barboza Tested-by: Daniel Henrique Barboza --- tests/cpu-plug-test.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 4579119..1e622cb 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; + char *device_model; unsigned sockets; unsigned cores; unsigned threads; @@ -71,11 +72,40 @@ static void test_plug_without_cpu_add(gconstpointer data) g_free(args); } +static void test_plug_with_device_add_x86(gconstpointer data) +{ + const PlugTestData *td = data; + char *args; + unsigned int s, c, t; + + args = g_strdup_printf("-machine %s -cpu %s " + "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u", + td->machine, td->cpu_model, + td->sockets, td->cores, td->threads, td->maxcpus); + qtest_start(args); + + for (s = td->sockets; s < td->maxcpus / td->cores / td->threads; s++) { + for (c = 0; c < td->cores; c++) { + for (t = 0; t < td->threads; t++) { + char *id = 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 = data; g_free(pc->machine); + g_free(pc->device_model); g_free(pc); } @@ -90,6 +120,8 @@ static void add_pc_test_case(const char *mname) data = g_new(PlugTestData, 1); data->machine = g_strdup(mname); data->cpu_model = "Haswell"; /* 1.3+ theoretically */ + data->device_model = g_strdup_printf("%s-%s-cpu", data->cpu_model, + qtest_get_arch()); data->sockets = 1; data->cores = 3; data->threads = 2; @@ -105,19 +137,30 @@ static void add_pc_test_case(const char *mname) (strcmp(mname, "pc-0.12") == 0) || (strcmp(mname, "pc-0.11") == 0) || (strcmp(mname, "pc-0.10") == 0)) { - path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u", + path = g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=%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 = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u", + PlugTestData *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_x86, + test_data_free); + g_free(path); } }