From patchwork Mon Jan 15 09:48:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D93B3C47258 for ; Mon, 15 Jan 2024 09:37:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOA-0002sk-My; Mon, 15 Jan 2024 04:36:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJO7-0002rP-Vj for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:12 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJO6-00082p-C1 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311370; x=1736847370; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1NRorIVgPPapskwi2yNyDwZUkMT9veYvMKnbbEk649Q=; b=CQyohfjDUjUX1bFrdLzBbFT45s1Db5c1D0qybjTRKWrp3uTab/F7xKjK pL0q67pUw9wz75HcEfgnPx8XEusdjA/vNdwgCXoTs2Zqm6TloBc+mJWh3 cEwZ3dHL4HBRaBZKisY1qJ+FcsRVspja+Gd7jWNuxkOuGhdf5VNcQZSPm SoHITaAfpwRorKasNi+hRGtfpTheDH+Q5i21ci1MigUlCjJlzZrkPr3XC 9Uj2fHm/hH2hIPzvUtCvXAkiqwJyglQYRV1qx5IEQQbvwNv0wDOEmqJrt dtNgmCj+GqSWbbBHxA4Mh3KEEGcz8xlmPkaLp0vle7XaWcoxJqda7KvFA w==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439705" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439705" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594142" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594142" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:04 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 01/11] MAINTAINERS: Update hw/core/cpu.c entry Date: Mon, 15 Jan 2024 17:48:42 +0800 Message-Id: <20240115094852.3597165-2-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu The hw/core/cpu.c was split as hw/core/cpu-common.c and hw/core/cpu-sysemu.c in the commit df4fd7d5c8a3 ("cpu: Split as cpu-common / cpu-sysemu"). Update the related entry. Signed-off-by: Zhao Liu Reviewed-by: Philippe Mathieu-Daudé --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index b406fb20c059..529313eba27e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1867,7 +1867,8 @@ M: Marcel Apfelbaum R: Philippe Mathieu-Daudé R: Yanan Wang S: Supported -F: hw/core/cpu.c +F: hw/core/cpu-common.c +F: hw/core/cpu-sysemu.c F: hw/core/machine-qmp-cmds.c F: hw/core/machine.c F: hw/core/machine-smp.c From patchwork Mon Jan 15 09:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E93A2C3DA79 for ; Mon, 15 Jan 2024 09:37:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOE-0002uk-M4; Mon, 15 Jan 2024 04:36:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOB-0002uO-QQ for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:15 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJO9-00083u-V4 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311373; x=1736847373; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GJeci8mK7yn0nRNGrhm8Z6i51j2QxMraNbK/U8jSyYs=; b=Ae7APvq/zJK+29egmZpqfaE+qg1v8+5VhAFfN0N/iVWi/zQtRETDjJJZ p+nfV5cbf3q/K4Uf2V0YRPxNbZ4pTjFINHDhdai+zmDAGKAu7zJoVMj+g 2/SzFwX3FBARG+V5RiFykxVMX/z6enpCNX24RXqtCz5vXCVasLffDeUSI ju6TLGFbdm/CR6ubkzMmNCYDGY3WSg4vUsR1hamqT/qGfYxYl97wNGKuz 3wabgXYwMSXC175zBJKMXLfd+1dsppXsukWxVLNSate0DAnXdifmSvY5K oE4k+00nuZNQUev2+d5ItfSmSEzYBIy9y2CTWwZxmNrPv+kUrlUbwABuv g==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439710" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439710" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594149" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594149" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:05 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 02/11] hw/core: Cleanup unused included headers in cpu-common.c Date: Mon, 15 Jan 2024 17:48:43 +0800 Message-Id: <20240115094852.3597165-3-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Remove unused headers in cpu-common.c: * qemu/notify.h * qemu/log.h * qemu/main-loop.h * exec/cpu-common.h * qemu/error-report.h * qemu/qemu-print.h Though hw/core/cpu.h has been included by sysemu/hw_accel.h, to keep the dependency clear, still directly include hw/core/cpu.h in this file. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/cpu-common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 3ccfe882e2c3..bb21dfc03029 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -19,16 +19,11 @@ */ #include "qemu/osdep.h" + #include "qapi/error.h" #include "hw/core/cpu.h" #include "sysemu/hw_accel.h" -#include "qemu/notify.h" -#include "qemu/log.h" -#include "qemu/main-loop.h" #include "exec/log.h" -#include "exec/cpu-common.h" -#include "qemu/error-report.h" -#include "qemu/qemu-print.h" #include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/qdev-properties.h" From patchwork Mon Jan 15 09:48:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F48EC3DA79 for ; Mon, 15 Jan 2024 09:37:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOH-0002xX-Og; Mon, 15 Jan 2024 04:36:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOE-0002ux-Qt for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:18 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOC-00083u-II for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311376; x=1736847376; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=flRKbSEdAP4ceuEU5TinqRhscLt9QCn3R7aZPVfjlfo=; b=UC6WIJhRdLjE9bQYhr4bbt9ilRuekGyiOAGmyH+0vA9vgC4Ht+n7ahcM NMIA1mesq/lm8mSYs/2bSvqvtPlMQqzaofUUxGWRb4l/S/vdqYcaPxOP1 WVeMJTQsuu2sHrNZciRioCVvrxTDgWBhLHtBwR3O9YjQ+5TfgGuF521X1 JndJHXK9jvH1FWGnXAL+Kf2z7ewnurk7JCVZZ5CVPgrwnmVsOUy+LRn/R U0MaE1jOH54lNf3LLnoxgXRRhxQlakItdXz7LddrDD+YlRLsqorIuOgdn HFUixHFz0X8c/yc7pnF6noBDSQ+qopJm4zGUSpmScL1JeT51yrBLgTWOI g==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439715" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439715" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594153" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594153" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:07 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 03/11] hw/core: Reorder included headers in cpu-common.c Date: Mon, 15 Jan 2024 17:48:44 +0800 Message-Id: <20240115094852.3597165-4-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Reorder the header files (except qemu/osdep.h) in alphabetical order. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/cpu-common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index bb21dfc03029..1b785a6965ea 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -20,15 +20,15 @@ #include "qemu/osdep.h" -#include "qapi/error.h" -#include "hw/core/cpu.h" -#include "sysemu/hw_accel.h" #include "exec/log.h" -#include "sysemu/tcg.h" #include "hw/boards.h" +#include "hw/core/cpu.h" #include "hw/qdev-properties.h" -#include "trace.h" +#include "qapi/error.h" #include "qemu/plugin.h" +#include "sysemu/hw_accel.h" +#include "sysemu/tcg.h" +#include "trace.h" CPUState *cpu_by_arch_id(int64_t id) { From patchwork Mon Jan 15 09:48:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519420 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB851C3DA79 for ; Mon, 15 Jan 2024 09:36:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOF-0002vd-RW; Mon, 15 Jan 2024 04:36:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOC-0002uX-Pt for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:17 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOB-00083y-2u for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311375; x=1736847375; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XH3LsbqPJSIGrPOUvQjfkrvf/Mabxk9CR1ifojleA4I=; b=VgWql20GTOyH1Hi9VO6XsTjKw3j5gKg4sC0uZDWHi6nVJhzrwkpSkPlb yZPARB6SOUJQg9RpnnL9fs7lcPY2wo+M1SVFj1iibC4nchOd8hsGsReyT 6ff1p14qrYcSMGZGx9nuTno2epQTxK4q4vh8SD32gF8+qFh2eQosCYKRW 4o0SoYr6BIWlzx7dWb1PeHG0eA3IoaEB1ZwQrclNEka/Cn0kVFo3ZvNyB +t16U/nBSutXjRLKdme+hGdmI3+U500mUbMn2lxtUR7zQoeHRtBxtTiOw nHFaF3nXwkctYZvPNeUtjOnkKsFVcKIVuTbkijDZnGXmMPVDze0Hb564y Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439724" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439724" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594157" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594157" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:09 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 04/11] hw/core: Reorder included headers in cpu-sysemu.c Date: Mon, 15 Jan 2024 17:48:45 +0800 Message-Id: <20240115094852.3597165-5-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Reorder the header files (except qemu/osdep.h) in alphabetical order. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/cpu-sysemu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c index d0d6a910f97c..c2cb05830076 100644 --- a/hw/core/cpu-sysemu.c +++ b/hw/core/cpu-sysemu.c @@ -19,9 +19,10 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" + #include "hw/core/cpu.h" #include "hw/core/sysemu-cpu-ops.h" +#include "qapi/error.h" bool cpu_paging_enabled(const CPUState *cpu) { From patchwork Mon Jan 15 09:48:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D319C47422 for ; Mon, 15 Jan 2024 09:37:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOG-0002wE-P1; Mon, 15 Jan 2024 04:36:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOE-0002uy-NM for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:18 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOC-00084H-Nq for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311376; x=1736847376; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/1Uxm7TXZFuEah25rWzAdZsTGu5hTcUNKhbNsRucjwU=; b=Y1vYvHeVkwT7y3Vj7CsALSBPO1GokHT3Uz2f1dvS5NN0lSpFVqY1EnE9 F2mx6/y82SU4CjcCFtZvTV+FhqLNEzBbW0keZRYwwooeS0P/mk3ymebTH KAs0+EXsxLuoe/Kcgxlzx2d5SvrtTFO+OABqdsNIsQfbVcouiFpKIjVwu RF4pMj4U4UHFKVNjLCio8tajqWcS7Pyi/Eil9TEyPyr13cAU6EP2KyXup +OX0c+v4CiIfGteJmhpkQYfmsD7EOv6CaeEAejyKTG44v7r/V3Mm23DCe PonfQbWCLE22lkEc5INT/lRSfy7KwJHdW8VJzq7ECsmqX2pXlAewduBwn w==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439758" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439758" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594162" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594162" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:11 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 05/11] hw/core: Cleanup unused included headers in machine-qmp-cmds.c Date: Mon, 15 Jan 2024 17:48:46 +0800 Message-Id: <20240115094852.3597165-6-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Remove unused headers in machine-qmp-cmds.c: * qemu/main-loop.h * qemu/uuid.h * sysemu/hostmem.h Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/machine-qmp-cmds.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 3860a50c3b7b..1b2b4cce5386 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" + #include "hw/acpi/vmgenid.h" #include "hw/boards.h" #include "hw/intc/intc.h" @@ -19,10 +20,7 @@ #include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h" #include "qapi/type-helpers.h" -#include "qemu/main-loop.h" -#include "qemu/uuid.h" #include "qom/qom-qobject.h" -#include "sysemu/hostmem.h" #include "sysemu/hw_accel.h" #include "sysemu/numa.h" #include "sysemu/runstate.h" From patchwork Mon Jan 15 09:48:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7ADE3C3DA79 for ; Mon, 15 Jan 2024 09:37:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOI-0002xp-FO; Mon, 15 Jan 2024 04:36:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOF-0002vO-Ii for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:19 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOD-00083y-F2 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311377; x=1736847377; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=duXLjlHspppopoqelLTa/6YliFZpAeVWVXPvV7DdYGg=; b=RlMHdfDp4w9s9DENDW9mvvKmYLfvZrWCq9/f8q3z50cm3gg8jrva/+QH Ru9hCZTQYIovc1GQ7+7KPsGcJeQWQbBu9wb9fJxwvgTihB8LmhQvj2XnU OuOEjy56BWHu9cSHojYgfKi/8V2QWZs+5Xtw8R9Nx9V1WZOQItshjqvIK dylIHUjD0MQEZAxcoqdtwmFBJmK0yLib1IbjefPmbcObdLOJKbtEdYdGd 0az/B3afLn8IyOH50aWZRsW7pONdq/eeO74/ypbuP40QZG+3QQI8aFeAK nKIiK6F50zzxIfXLZPrWNBqO5bZ5oippTucAcGA8OoznfDaf368PWyN1u Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439766" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439766" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594165" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594165" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:13 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 06/11] hw/core: Cleanup unused included header in machine.c Date: Mon, 15 Jan 2024 17:48:47 +0800 Message-Id: <20240115094852.3597165-7-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Remove unused header in cpu-common.c: * qapi/error.h Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index fb5afdcae4cc..554c4f5df2da 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -11,11 +11,11 @@ */ #include "qemu/osdep.h" + #include "qemu/accel.h" #include "sysemu/replay.h" #include "hw/boards.h" #include "hw/loader.h" -#include "qapi/error.h" #include "qapi/qapi-visit-machine.h" #include "qom/object_interfaces.h" #include "sysemu/cpus.h" From patchwork Mon Jan 15 09:48:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B3A4C3DA79 for ; Mon, 15 Jan 2024 09:38:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOK-0002yc-OY; Mon, 15 Jan 2024 04:36:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOG-0002wB-Ia for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:20 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOE-00083u-Vb for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311379; x=1736847379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W/Wursoino0Yj1hVD2AZ+GmLqddvaPvnEIq0pMwnGd8=; b=N+Vr9MPXHH19Yg1gLMQYj7vv7dQQW9/VEFmMCVjHWAHXc64zf2QIrc43 PYTKbJi7s0ZqBpmEUF9nuDOXvyPyPpoIi9+WPxLmmSSVcz6eBvQeRV5x0 vnNEtoHzweLlDcAliyUxAcFwOuUz1jRSNFTruNqJ4zi62hFxOd+jFFjzX JRfA3eHnTRgfCCjkByBFMIUl+pxU6e7tIBg0XujL+ZI23iibt5sFDKLHn HlgDBCdr29ekzYnySGTo+ALLXt/U//eI9O83unhK9ILcjRGt1hFkSrMk3 hRQkyX1h5Lj4GlZbeERn/CvSr5Tx9RgJXv+QMXu/HEXR8WNLpT3X+xF6a A==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439786" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439786" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594168" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594168" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:14 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 07/11] hw/core: Reorder included header in machine.c Date: Mon, 15 Jan 2024 17:48:48 +0800 Message-Id: <20240115094852.3597165-8-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Reorder the header files (except qemu/osdep.h) in alphabetical order. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/machine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 554c4f5df2da..50e69b1cf1b8 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -12,25 +12,25 @@ #include "qemu/osdep.h" -#include "qemu/accel.h" -#include "sysemu/replay.h" +#include "audio/audio.h" +#include "exec/confidential-guest-support.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/mem/nvdimm.h" +#include "hw/pci/pci_bridge.h" +#include "hw/virtio/virtio-net.h" +#include "hw/virtio/virtio-pci.h" +#include "migration/global_state.h" #include "qapi/qapi-visit-machine.h" +#include "qemu/accel.h" #include "qom/object_interfaces.h" #include "sysemu/cpus.h" +#include "sysemu/qtest.h" #include "sysemu/sysemu.h" +#include "sysemu/replay.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "sysemu/xen.h" -#include "sysemu/qtest.h" -#include "hw/pci/pci_bridge.h" -#include "hw/mem/nvdimm.h" -#include "migration/global_state.h" -#include "exec/confidential-guest-support.h" -#include "hw/virtio/virtio-pci.h" -#include "hw/virtio/virtio-net.h" -#include "audio/audio.h" GlobalProperty hw_compat_8_2[] = {}; const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2); From patchwork Mon Jan 15 09:48:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29C32C3DA79 for ; Mon, 15 Jan 2024 09:38:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOK-0002y1-52; Mon, 15 Jan 2024 04:36:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOG-0002x4-T8 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:20 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOF-00084H-8j for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311379; x=1736847379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BoeRZGN7eQPcgZF2+XzoPfgKu1ZXa9REGBB4Q0wXOGQ=; b=d5P5sxHeEtHWF/jyr4S8ohn/vefJFwJmoggyhAjPgUY67EZLfoqbA5+P pHjX4vcRAjp6JuPCPFXPF31ARoLP/ETNRtENXsLVzcUepH/wx0FXZxtYt fiXVYYVaWEEh8wcXZmssqYMViIosNE887YktiD79NlqRhE1vQIkz4D7AO czdTvhN6Inc5ANJdNbLz6qvOfSRFYaK2z7dVP+OUzdvaNHMi4mY/u1wGI I4qSsd71g2Vw/qsHmTU1UPH9QIOB6ag5pRgOjX8ZiWWTxgWTpKrzROUzj 0s1xwTwt6zh5ZRSmlLOpXX+AcbU4GnIOm9IQ/rTpyFfQHxIl+SCZIkmq7 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439799" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439799" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594172" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594172" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:16 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 08/11] hw/core: Cleanup unnecessary included header in null-machine.c Date: Mon, 15 Jan 2024 17:48:49 +0800 Message-Id: <20240115094852.3597165-9-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Remove the unnecessary header (hw/core/cpu.h) since the hw/boards.h has already included that header. Signed-off-by: Zhao Liu --- hw/core/null-machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f586a4bef543..a0c7acc19cc3 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -12,10 +12,10 @@ */ #include "qemu/osdep.h" + #include "qemu/error-report.h" #include "hw/boards.h" #include "exec/address-spaces.h" -#include "hw/core/cpu.h" static void machine_none_init(MachineState *mch) { From patchwork Mon Jan 15 09:48:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BA07C3DA79 for ; Mon, 15 Jan 2024 09:36:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOJ-0002xz-Vw; Mon, 15 Jan 2024 04:36:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOI-0002xq-Ht for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:22 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOG-00083y-UC for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311380; x=1736847380; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bEuuzhlR+r/Qy0aq8IIdnaQz63UEvVOGDNMZ/dCZ9KE=; b=LqVcmKMIyMjSzNHatrUKdWXgwO+bYAkjDfLKKeGsSSpnxryTADVWCkV9 4OYVQGSUUzGgqI4qQz3u5XzbH/nLm3cJ4/+TBD/xTrpP1lYJ6WCfvyNDH voHZZ0i3VqHF5MmOaHmqJE9FhJEoEs668K1pxqhdOllzhySBLFcle1lF0 B9LGtql9bAQY/pLx50ZTE8BfHGgQ6bjTnUafkeJJKYoJk2asuuW5lIHWa JhRv6aoBWZCIUQpl0Wi4J7MuopcLs5YkIvEdkapm6YehEd59SleEq7FRc CHTLtnbuxKrQmIJtpAdkMZLlIGRa3bjQ6ROgTf1vm/i02tQOIBAmfCWFv A==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439814" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439814" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594175" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594175" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:18 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 09/11] hw/core: Reorder included headers in null-machine.c Date: Mon, 15 Jan 2024 17:48:50 +0800 Message-Id: <20240115094852.3597165-10-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Reorder the header files (except qemu/osdep.h) in alphabetical order. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/null-machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index a0c7acc19cc3..3d411de3396a 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -13,9 +13,9 @@ #include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "hw/boards.h" #include "exec/address-spaces.h" +#include "hw/boards.h" +#include "qemu/error-report.h" static void machine_none_init(MachineState *mch) { From patchwork Mon Jan 15 09:48:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0BD4C3DA79 for ; Mon, 15 Jan 2024 09:37:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOM-00030G-Bn; Mon, 15 Jan 2024 04:36:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOK-0002yd-Nb for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:24 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOJ-00083y-7Y for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311383; x=1736847383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ae3UEVtEQon0zcDRm0hrrOZyUSj7p14La3m7kAvib84=; b=fRKfdd2e2fWshXxtMzQIrog21OrVqiGGkwfKb5pK2CzgOPUpjMGJyaoF nFc2luRkEXTLLRxdsYv2UittKYVkcAOSdikzYu8mtdcTsKhEplAsT0yyi kdzAJVdJ3bSuuzmU06lTEUVhGy0WsMDv8Eba1JqfKwUtD5GrRwqjmxY2B H5eZ+0PCy5ASagLDYIXRVJJXLoB7uko94npnCsnutnMPzXvSxdW1768OY MBPCrxeiNjDouRvh2EEago2+f6C810lXEEFUbQJCO9RQxW6VlN+ENdzrN yGhs0jAPQQ122J/YQd+chm999HMjffd738aHzxycLOSK0z6swSezJkhkS Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439827" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439827" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594178" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594178" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:20 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 10/11] hw/core: Cleanup unused included headers in numa.c Date: Mon, 15 Jan 2024 17:48:51 +0800 Message-Id: <20240115094852.3597165-11-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Remove unused header in numa.c: * sysemu/hostmem.h * exec/cpu-common.h * exec/ramlist.h * qemu/bitmap.h * hw/core/cpu.h * hw/mem/pc-dimm.h * migration/vmstate.h Though sysemu/numa.h has been included by sysemu/hostmem.h which is included by hw/boards.h, to keep the dependency clear, still directly include sysemu/numa.h in this file. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/numa.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index f08956ddb0ff..ab3f2858ac51 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -23,20 +23,14 @@ */ #include "qemu/osdep.h" + #include "qemu/units.h" -#include "sysemu/hostmem.h" #include "sysemu/numa.h" -#include "exec/cpu-common.h" -#include "exec/ramlist.h" -#include "qemu/bitmap.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi/qapi-visit-machine.h" #include "sysemu/qtest.h" -#include "hw/core/cpu.h" -#include "hw/mem/pc-dimm.h" -#include "migration/vmstate.h" #include "hw/boards.h" #include "hw/mem/memory-device.h" #include "qemu/option.h" From patchwork Mon Jan 15 09:48:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13519425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6AABCC3DA79 for ; Mon, 15 Jan 2024 09:37:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPJOa-0003B1-63; Mon, 15 Jan 2024 04:36:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOY-00039R-9V for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:38 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPJOV-00083y-8c for qemu-devel@nongnu.org; Mon, 15 Jan 2024 04:36:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705311395; x=1736847395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pt2MYm30g9vvm1ADggzKeJz7RrkeGL5GZzLkhLInohU=; b=eHfh1i5EQhfXAcqLdCrUmQCZzXk6BQ3GsrTxTmsGnBv0lHSe2EiLDhZk HZr/UcNLJ0ogXQU2JXtYm2A1EtLldh2R2j0/PC4EyLAy1YHBu01r/cQG1 bFQ+yayz+CIFvREBGmaKB4NWq9ONkp1kqwIBQGApv6ocota//xyTl+RLE VO593Vfibkp1mjV3dimke4YxIc/g16xd4DZtFjQzGCukfu8l4b1tEs6rJ TMxz56+NjGTH7kKnQyLVjq7i0wfLAhNylMJWwlDPvSWpxOtfTNEhS+FM/ 8l0fCJWYmjnzPNJgLjkli9HsnS/UafLLl86BRqmj6O5CD7Gc8ro6Es3U6 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="398439854" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="398439854" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 01:36:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="1030594181" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="1030594181" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmsmga006.fm.intel.com with ESMTP; 15 Jan 2024 01:36:22 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 11/11] hw/core: Reorder included headers in numa.c Date: Mon, 15 Jan 2024 17:48:52 +0800 Message-Id: <20240115094852.3597165-12-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> References: <20240115094852.3597165-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.120; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Reorder the header files (except qemu/osdep.h) in alphabetical order. Tested by "./configure" and then "make". Signed-off-by: Zhao Liu --- hw/core/numa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index ab3f2858ac51..aff080d48aa1 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -24,18 +24,18 @@ #include "qemu/osdep.h" -#include "qemu/units.h" +#include "hw/boards.h" +#include "hw/mem/memory-device.h" #include "sysemu/numa.h" -#include "qemu/error-report.h" +#include "sysemu/qtest.h" #include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi/qapi-visit-machine.h" -#include "sysemu/qtest.h" -#include "hw/boards.h" -#include "hw/mem/memory-device.h" -#include "qemu/option.h" +#include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/cutils.h" +#include "qemu/option.h" +#include "qemu/units.h" QemuOptsList qemu_numa_opts = { .name = "numa",