From patchwork Wed Jan 18 12:40:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dou Liyang X-Patchwork-Id: 716627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3v3RhJ0DnPz9t0q for ; Wed, 18 Jan 2017 23:52:32 +1100 (AEDT) Received: from localhost ([::1]:41051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTpj3-0000QN-Ml for incoming@patchwork.ozlabs.org; Wed, 18 Jan 2017 07:52:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTpYu-0000tz-0u for qemu-devel@nongnu.org; Wed, 18 Jan 2017 07:42:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTpYs-0003ar-QN for qemu-devel@nongnu.org; Wed, 18 Jan 2017 07:42:00 -0500 Received: from [59.151.112.132] (port=61481 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTpYs-0003Wn-AD for qemu-devel@nongnu.org; Wed, 18 Jan 2017 07:41:58 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="14878975" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Jan 2017 20:41:52 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 8B68447B0CB2; Wed, 18 Jan 2017 20:41:47 +0800 (CST) Received: from localhost.localdomain.localdomain (10.167.226.106) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 18 Jan 2017 20:41:47 +0800 From: Dou Liyang To: , Date: Wed, 18 Jan 2017 20:40:07 +0800 Message-ID: <1484743207-10721-4-git-send-email-douly.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1484743207-10721-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1484743207-10721-1-git-send-email-douly.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: 8B68447B0CB2.AEF6C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 3/3] cpu: make the function of cpu_common_map_numa_node more efficiently 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: peter.maydell@linaro.org, Dou Liyang , fanc.fnst@cn.fujitsu.com, caoj.fnst@cn.fujitsu.com, stefanha@redhat.com, izumi.taku@jp.fujitsu.com, imammedo@redhat.com, vilanova@ac.upc.edu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Current function does some unnecessary operations, such as it makes the assert() in the loop, and the loop was not stopped in time. This patch moves the assert() out the loop and stops the loop in time. Signed-off-by: Dou Liyang Reviewed-by: Eduardo Habkost --- qom/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qom/cpu.c b/qom/cpu.c index e08dceb..3c655b2 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -343,10 +343,11 @@ static void cpu_common_map_numa_node(CPUState *cpu) { int i; + assert(cpu->cpu_index < max_cpus); for (i = 0; i < nb_numa_nodes; i++) { - assert(cpu->cpu_index < max_cpus); if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) { cpu->numa_node = i; + return; } } }