From patchwork Tue Oct 17 13:32:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10012065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE817600CC for ; Tue, 17 Oct 2017 13:35:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8083288CD for ; Tue, 17 Oct 2017 13:35:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCDBC288CF; Tue, 17 Oct 2017 13:35:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6CD20288CD for ; Tue, 17 Oct 2017 13:35:26 +0000 (UTC) Received: from localhost ([::1]:39311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4S1l-0006wZ-BH for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Oct 2017 09:35:25 -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) 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 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) 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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); } +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; @@ -90,6 +119,7 @@ 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 = "Haswell-x86_64-cpu"; data->sockets = 1; data->cores = 3; data->threads = 2; @@ -105,19 +135,27 @@ 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(mname); + 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); } }