From patchwork Wed Jan 31 11:55:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 768490 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp1819490wro; Wed, 31 Jan 2024 04:00:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEiAvzn/x9b9AN/+JJZlOj9sc0XS4gyKPVbig/wnng2T5bedrxPPc7OLy36JUTuKsMVGKGW X-Received: by 2002:ae9:ee19:0:b0:785:22d2:fbb2 with SMTP id i25-20020ae9ee19000000b0078522d2fbb2mr1024555qkg.10.1706702450617; Wed, 31 Jan 2024 04:00:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706702450; cv=none; d=google.com; s=arc-20160816; b=OoECt76RMvhTs+ywu7No5qtSmuR8CZpd8NrzqRNLdjAayH7NamZEFOWC1ol1tlopOk 46Yck68P9jLfXqhm8KkeLYIf+cPMIjoSc4Yk4vSzupMwQX37vx8ZWLk3DICL7YjLMiRv iI/gIGUJq8mB/3wgbzUmYQvzViGGlVDcF9NgZIFTXKS+c0jj4svJor9e7i4oTNyXrMtn ze95px0KxCCCXHc2ZKOHi8SGoIxJg16ESMT6liTJ9cIBYbGfDRypJ/0vhMWbEQCrZpHt SaueG/qk56Sv6yHrtHTVFZbxYpqRnmbMu+q2oQDTpvCNGiLaIurY67xzulO8Wd/W3WiS PO/A== 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; bh=GTdQ2iAQjzN4DKenulexvLEPXg3ZNZzM0pmWA08H3OY=; fh=x+w6Zr88JKuH34NQi/lJsuDgT+iEPr5Mt3FVdDPlmHw=; b=bJmv70ArDOpbKwIiIalkBSbTAYJuscIo4aZzIov42VFVrDjzmqDOAdu7e3Bj5zqJxK oEKwqldDOATQmNXQrLWIkdUf3PygRucngMhQoTaJmv+9/XgowqC/5UDeJfDZe3aSoubx b+si7TAs4Jx30KpEBtcdqr/M5nRtzgSck5W4duXjA89lYXKgUaqygBpTpmlPcaotCvQ9 vId1BirIxj25ao9HsjIXJap/NDHv/CAIzCnI9RQG1Mxu7TfuBXGWG/wnv/pJHr76/KGi qU4SQyfoCns0CLqhZrW2biDb7q2HjlxuE4fW7oP4n3Fy0DHGKhn2L8ITcDmVYenIizy4 hLsg==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; 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" X-Forwarded-Encrypted: i=0; AJvYcCVfE+5euM8x7mN2Hpjm/8qXusx7MCzkTlev7eU6TkLNY3zvhLG+DHv6PuYLEN9ApO1dK3bNXzp8DvqAdkVYFlMR Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dz1-20020a05620a2b8100b0078402036e82si6110240qkb.747.2024.01.31.04.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 04:00:50 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rV9Ce-0000Tp-EE; Wed, 31 Jan 2024 06:56:28 -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 1rV9CU-0000B2-0p; Wed, 31 Jan 2024 06:56:19 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rV9CF-0003wN-5L; Wed, 31 Jan 2024 06:56:16 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 320E4490C5; Wed, 31 Jan 2024 14:56:47 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 5BE8F7026E; Wed, 31 Jan 2024 14:55:50 +0300 (MSK) Received: (nullmailer pid 2263933 invoked by uid 1000); Wed, 31 Jan 2024 11:55:49 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 07/21] hyperv: Clean up includes Date: Wed, 31 Jan 2024 14:55:35 +0300 Message-Id: <20240131115549.2263854-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240131115549.2263854-1-mjt@tls.msk.ru> References: <20240131115549.2263854-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Peter Maydell 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 Signed-off-by: Michael Tokarev --- hw/hyperv/hv-balloon-internal.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.c | 1 + hw/hyperv/hv-balloon-our_range_memslots.h | 1 - hw/hyperv/hv-balloon-page_range_tree.c | 1 + hw/hyperv/hv-balloon-page_range_tree.h | 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 164c2e5825..ee53a28a26 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.c b/hw/hyperv/hv-balloon-our_range_memslots.c index 99bae870f3..1505a395cf 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-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h index b6f592d34b..df3b686bc7 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.c b/hw/hyperv/hv-balloon-page_range_tree.c index e178d8b413..dfb14852f4 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-page_range_tree.h b/hw/hyperv/hv-balloon-page_range_tree.h index 07a9ae0da6..333772b86d 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.c b/hw/hyperv/hv-balloon.c index 66f297c1d7..0238365712 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"