From patchwork Thu Jan 25 16:34:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765950 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46807wrx; Thu, 25 Jan 2024 08:35:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IGI59m2YYSL6WFoKdi5B8BApcd8MN1foQaq2PzU/5bczPJOwnaeGLSKcQQpxAoakk9qYAdo X-Received: by 2002:a05:620a:2298:b0:783:40da:323b with SMTP id o24-20020a05620a229800b0078340da323bmr1237475qkh.66.1706200532368; Thu, 25 Jan 2024 08:35:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200532; cv=none; d=google.com; s=arc-20160816; b=L2YAxMxoPTeLBVzG03Bh7UOu7/8oUQj9uoqzpCNSmDm7IoMW7DnE63JQnpdoYBFWvw 8xmqNrk9CEjYcoOeMSfIgiG/hzRBjXDoJODSRevlSUJMqK7oFag1JFRlVuuDWn0dkhgw PlE2yEPj6Ixc6yraMdAWiBUFYuzZB5wPHgJRN4Dp5oVv7GL5C9TK+gW8Tvf72dB+QbQd sQMdbVG2R40/VuVZQX8EqSHtVcIEPAATvloiYI3MoIIeV+SyplioSd5wAwT5AFNXOpBi 6yLOYINmxu1TpPeeD+2Fp8UzMpu0KQ+SLzz+Rxx1uW1KpEWdL5XqnEgoe8vorC5RyXky tRfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=k5R5mQomVvaRjvtYL+9eLkOfiiGGyLR0nJnyIzcqwL243j8c8V681q6wz7kfStbNX+ HSlKh0oBYUe5jmv5wHWcwbm+LjFRQutfFg8eKj+ddguGDkTpPtA/PPn44T+IL+sPOesn u2DVq5J0lovWobM2bZDxzrY/LVUNGBljK0Qfd+qDXdjf7qVPWFU918zCeO23vSo8qB0o o0EKE3UEaXXpwPETA6NqPcDLEDJIkBWpBq7wbUw3gnYjrlKaSl0GKG08iL3EDKPjkUsN O5oYn6Je1KI9dKVfirfs8Paui9OCWgAgWKDYSMlYOgLvKCujPLpmys7hf2MrpUtX7ZWb RQ/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WHlhMl+5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v17-20020ae9e311000000b007836c6e0506si13066979qkf.14.2024.01.25.08.35.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WHlhMl+5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT2gC-0006pW-Ve; Thu, 25 Jan 2024 11:34:16 -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 1rT2gB-0006kd-5r for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:15 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2g8-00027q-2V for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:14 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40ed232ea06so6744235e9.1 for ; Thu, 25 Jan 2024 08:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200450; x=1706805250; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; b=WHlhMl+5mBgjtAiH9fXiLu+gY7NCJoQj+Id1O7EHCM4/Hh+REqCKfqi1+4o1qDXN6i m/zfxx35tbocP0J9uwWwmN86mTSlFRmMezzxc4DG7H+PVLxqwQnImKAj8uifN5VVjRiF +Xaz5xQm7JqxtEdzQr1zLhzCuqrVA2oJQPmzENVRX61mAb98VIsvj3/YXb5xqhvB57Rh CCrpmOd+ywlfZ95FJnJkmMS+TxnoTzxUbEGeFGp3x0njvXVRTeNsqnP8L0HvVqBuEE7M mNUb/Zikul0kGfm+gNM7sRKwq8Czk/2Y4kwZDNXblecURIUtswd7Q9oaryhn657Gnmib Go9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200450; x=1706805250; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; b=ScEJrSRDvZj7HbaBJl+hf0hMSrhgT6Bguo8caMcMaQ2340nvkUBXVLxjFSCgv+GGCo Mr9/qjmGEnp7KhSm/T+qjOESSIohQ4zXtl7rxZhE0FonbIZr+TySIESD9QetMR07aAZO 456dHwwiFmnxAzXuEZ51MP2VSyEETtnsL2pV2poAw6dK40SvNxdXa2/cr7E9RgVQ+3m9 uvrGYAI2IHTO2/tLgdAPc+Y1Xrj0dSofiAvAwe98wTDj6CRVqP8Iyo/3BqcFE8Ec5TPH BRsYbHV4IswlIf0p5rp666eKBLNXw14pisSySLNmuDN+1ppm1O0Xr8scLnk0+HmbTqpE ASCw== X-Gm-Message-State: AOJu0YwLOl+GYKN9mGmqXao4E5Cjiha66KW57r9VwGJG+I6C3HexHKW+ acbYkkxiIbtvRjDj6w1g18HK1lB+sGeDigaCs6KXjA2fEY6cs+DwSs7v5Y8DiYZDLDu+oGkNX3r Z X-Received: by 2002:a5d:4dcd:0:b0:336:7300:f532 with SMTP id f13-20020a5d4dcd000000b003367300f532mr1072181wru.85.1706200450563; Thu, 25 Jan 2024 08:34:10 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 02/10] hyperv: Clean up includes Date: Thu, 25 Jan 2024 16:34:00 +0000 Message-Id: <20240125163408.1595135-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git hyperv hw/hyperv/*.[ch] All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson --- hw/hyperv/hv-balloon-internal.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.h | 1 - hw/hyperv/hv-balloon-page_range_tree.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.c | 1 + hw/hyperv/hv-balloon-page_range_tree.c | 1 + hw/hyperv/hv-balloon.c | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/hyperv/hv-balloon-internal.h b/hw/hyperv/hv-balloon-internal.h index 164c2e58253..ee53a28a266 100644 --- a/hw/hyperv/hv-balloon-internal.h +++ b/hw/hyperv/hv-balloon-internal.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H #define HW_HYPERV_HV_BALLOON_INTERNAL_H -#include "qemu/osdep.h" #define HV_BALLOON_PFN_SHIFT 12 #define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT) diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h index b6f592d34b0..df3b686bc7c 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.h +++ b/hw/hyperv/hv-balloon-our_range_memslots.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H #define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "qom/object.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.h b/hw/hyperv/hv-balloon-page_range_tree.h index 07a9ae0da61..333772b86d2 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.h +++ b/hw/hyperv/hv-balloon-page_range_tree.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H -#include "qemu/osdep.h" /* PageRange */ typedef struct PageRange { diff --git a/hw/hyperv/hv-balloon-our_range_memslots.c b/hw/hyperv/hv-balloon-our_range_memslots.c index 99bae870f37..1505a395cf7 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.c +++ b/hw/hyperv/hv-balloon-our_range_memslots.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-our_range_memslots.h" #include "trace.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.c b/hw/hyperv/hv-balloon-page_range_tree.c index e178d8b413c..dfb14852f42 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.c +++ b/hw/hyperv/hv-balloon-page_range_tree.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-page_range_tree.h" diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 66f297c1d7e..02383657124 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "exec/address-spaces.h"