From patchwork Wed Jan 31 11:55:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 768482 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp1818530wro; Wed, 31 Jan 2024 03:58:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyDew+roBEw6NbXKBkLlXI/spaOwdohC54GEB38Y96j6ZFvgBCQZc7/J+3WobDh4ttS5dO X-Received: by 2002:a05:6214:f0e:b0:68c:4fac:930e with SMTP id gw14-20020a0562140f0e00b0068c4fac930emr1633690qvb.54.1706702297501; Wed, 31 Jan 2024 03:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706702297; cv=none; d=google.com; s=arc-20160816; b=zSWV318e5d4rFXGdVDLTtXki2vP1h9oIT/w4Ji08TCfkzfKMlB3Nu/RdjtGuOvwQtY gHBfWLsgN4aMH++9FJnSdYtPkJOBhr2beoIFgC4fpyojavfmiw0157/hnUvfFLNEDw4n GeU033I2MtthknKlGOeRyaXwN1jEnRF/B6ayTGHAfRUMkNLMowtM84jvuPW9xt4ach5j UdUWBt/AxVNd4X43SvFVobMkBbEZb4wR7V8mdbWN4xFjj3XwGGA6E9KuiIMwmNO7ryUA y8e0xSV/oE/lpGFq8axeRcQrAbMqFmNf3ikGnw6dxWbA6yhpzBwJmTXMOVHHuVh61rXy S0cQ== 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=4mlV+6TQTxjOJgXORChO2tm+D0DhDYRSgKs5IoATsLQ=; fh=6YG5FlYRyvnGYKLw9pHHNL8FkkMBy1ILiM3zC+zqpnY=; b=IJ+i3iAkPpNQUyfHtb0RMQhgqLkYgGGdaDRTm7SOIEAjonzCQifDF+CkQo1/0X0Yaw i4zznvjgERQXzg8+hjmu5qFKR5vC6kD/Yueb5u9bSc7Vq4R+mR9Jnipd30Jp7rJpdRP0 rMAsg5w4Cf37YDKbBbeo8uRfDMHGauHRFOyuWuAcf00zd92QZ7Bq8yhKUu06ffbqKJRB LsHnCiPv94JvOFNbnS6EDhf1j7Frp33HVArfE8FwMXhbjZ4ENFhHVz4b9h1GpCZueqzE KbtwC8GxiiPZ9b0RSB8JosZjbz6rQR5ZxVo5hTGPcdFkTnKA8TgjBZdSWGxRLGN1PGYk axmw==; 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; AJvYcCUzLKDambGsxBD8clTu7w2/5ksAHFy4JhKUK5flkjD0TpDFuxh/K3D7B39edQGSauzW3EhGZ1UrM/DABLMYOiLq Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m8-20020a0562141bc800b0068c641b2886si2794200qvc.575.2024.01.31.03.58.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 03:58:17 -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 1rV9CZ-0000Fq-6Y; Wed, 31 Jan 2024 06:56:23 -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 1rV9CQ-00005b-6r; Wed, 31 Jan 2024 06:56:15 -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 1rV9CN-0003xX-1q; Wed, 31 Jan 2024 06:56:13 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 61344490C8; 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 9651870271; Wed, 31 Jan 2024 14:55:50 +0300 (MSK) Received: (nullmailer pid 2263942 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 10/21] acpi: Clean up includes Date: Wed, 31 Jan 2024 14:55:38 +0300 Message-Id: <20240131115549.2263854-11-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 acpi include/hw/*/*acpi.h hw/*/*acpi.c 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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/nvram/fw_cfg-acpi.c | 1 + hw/virtio/virtio-acpi.c | 1 + include/hw/nvram/fw_cfg_acpi.h | 1 - include/hw/virtio/virtio-acpi.h | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 4e48baeaa0..58cdcd3121 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index e18cb38bdb..230a669500 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio-acpi.h" #include "hw/acpi/aml-build.h" diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b6553d86fc..b39eb0490f 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -7,7 +7,6 @@ #ifndef FW_CFG_ACPI_H #define FW_CFG_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index 844e102569..cace2a315f 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -6,7 +6,6 @@ #ifndef VIRTIO_ACPI_H #define VIRTIO_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base,