Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60958C388F9 for ; Fri, 13 Nov 2020 06:13:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9BDD52085B for ; Fri, 13 Nov 2020 06:13:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B8y+1XQU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BDD52085B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdSLF-0004VH-Nc for qemu-devel@archiver.kernel.org; Fri, 13 Nov 2020 01:13:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSKF-00043T-Cl for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:12:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSKB-0000sP-SZ for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:12:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605247961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGaaXRPjcHePlHW0yWi0rYxHibu+AZIPU+KnHEYR+5k=; b=B8y+1XQUJvXzg1tQUh00TKLV+JnZlaOunNIn0+kvjhxhocz9Z451eyAjm1/sxLG+iTqxCM VQDqpeHNvssOxB9ZdCDFQwU7RDTMmq9palytt0GJYsQ5oYZ5ImQRsoWf/+Oce01LcG3TTN zSZ5G2OHg+aIswr35b8Hz32PSYP8Yi4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-Q2_tPifHOzincK_-YgvYPQ-1; Fri, 13 Nov 2020 01:12:40 -0500 X-MC-Unique: Q2_tPifHOzincK_-YgvYPQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 433B35F9D6; Fri, 13 Nov 2020 06:12:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD30B5C1C7; Fri, 13 Nov 2020 06:12:17 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4333F11386A0; Fri, 13 Nov 2020 07:12:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH] Clean up includes Date: Fri, 13 Nov 2020 07:12:16 +0100 Message-Id: <20201113061216.2483385-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alxndr@bu.edu, thuth@redhat.com, cohuck@redhat.com, mjrosato@linux.ibm.com, david@redhat.com, qemu-s390x@nongnu.org, mst@redhat.com, laurent@vivier.eu, dgilbert@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, bsd@redhat.com, kraxel@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c contrib/plugins/, tests/plugin/, and tests/test-rcu-slist.c appear not to include osdep.h intentionally. The remaining reverts are the same as in commit bbfff19688d. Signed-off-by: Markus Armbruster --- No real need to get this into 5.2 at this stage. No real risk either. contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-) diff --git a/contrib/vhost-user-gpu/vugbm.h b/contrib/vhost-user-gpu/vugbm.h index 07e698fcd7..66f1520764 100644 --- a/contrib/vhost-user-gpu/vugbm.h +++ b/contrib/vhost-user-gpu/vugbm.h @@ -10,10 +10,8 @@ #ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include #include #endif diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index 3153c9a6de..5eca2a96ab 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -15,7 +15,6 @@ #ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 5a49029543..c1bd5f6555 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -11,7 +11,6 @@ #ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index c133fa271e..80806b0306 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -13,7 +13,6 @@ #ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" diff --git a/include/qemu/nvdimm-utils.h b/include/qemu/nvdimm-utils.h index 4b8b198ba7..5f45774c2c 100644 --- a/include/qemu/nvdimm-utils.h +++ b/include/qemu/nvdimm-utils.h @@ -1,7 +1,6 @@ #ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list(void); #endif diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 08e9560a79..3a8570e84c 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -14,7 +14,6 @@ #ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/generic_fuzz_configs.h index c4d925f9e6..b4c5fefeca 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects; diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index 5aee5193eb..30b18b4966 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -18,8 +18,6 @@ #include "fuse_log.h" #include "fuse_opt.h" -#include -#include /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3 diff --git a/tools/virtiofsd/fuse_log.h b/tools/virtiofsd/fuse_log.h index bf6c11ff11..8d7091bd4d 100644 --- a/tools/virtiofsd/fuse_log.h +++ b/tools/virtiofsd/fuse_log.h @@ -14,7 +14,6 @@ * This file defines the logging interface of FUSE */ -#include /** * Log severity level diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h index 9c06240f9e..0e10a14bc9 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -25,10 +25,7 @@ #include "fuse_common.h" -#include -#include #include -#include #include #include diff --git a/tools/virtiofsd/fuse_misc.h b/tools/virtiofsd/fuse_misc.h index 5c618ce21f..f252baa752 100644 --- a/tools/virtiofsd/fuse_misc.h +++ b/tools/virtiofsd/fuse_misc.h @@ -7,7 +7,6 @@ */ #include -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it diff --git a/tools/virtiofsd/passthrough_seccomp.h b/tools/virtiofsd/passthrough_seccomp.h index d47c8eade6..a3ab073f08 100644 --- a/tools/virtiofsd/passthrough_seccomp.h +++ b/tools/virtiofsd/passthrough_seccomp.h @@ -9,7 +9,6 @@ #ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include void setup_seccomp(bool enable_syslog); diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index b0bc22c3c1..e647278052 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -12,6 +12,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "virgl.h" diff --git a/contrib/vhost-user-gpu/vugbm.c b/contrib/vhost-user-gpu/vugbm.c index 9c357b6399..f5304ada2f 100644 --- a/contrib/vhost-user-gpu/vugbm.c +++ b/contrib/vhost-user-gpu/vugbm.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static bool diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c index 6020c6f33a..25e2faa16b 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" -#include #include #include "qemu/iov.h" diff --git a/hw/display/artist.c b/hw/display/artist.c index ed0e637f25..aa7bd594aa 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index d5c78063b5..28343f90e3 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -9,11 +9,12 @@ * directory. */ +#include "qemu/osdep.h" + #include #include #include -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index 27c1377f22..2085db2743 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/virtiofsd/buffer.c @@ -12,11 +12,6 @@ #include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include -#include -#include -#include -#include size_t fuse_buf_size(const struct fuse_bufvec *bufv) { diff --git a/tools/virtiofsd/fuse_log.c b/tools/virtiofsd/fuse_log.c index c301ff6da1..745d88cd2a 100644 --- a/tools/virtiofsd/fuse_log.c +++ b/tools/virtiofsd/fuse_log.c @@ -11,8 +11,6 @@ #include "qemu/osdep.h" #include "fuse_log.h" -#include -#include static void default_log_func(__attribute__((unused)) enum fuse_log_level level, const char *fmt, va_list ap) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index c70fb16a9a..d4119e92ab 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -16,17 +16,7 @@ #include "fuse_opt.h" #include "fuse_virtio.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #define THREAD_POOL_SIZE 64 diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c index 28922361a2..f0ab8d22f4 100644 --- a/tools/virtiofsd/fuse_opt.c +++ b/tools/virtiofsd/fuse_opt.c @@ -14,10 +14,6 @@ #include "fuse_i.h" #include "fuse_misc.h" -#include -#include -#include -#include struct fuse_opt_context { void *data; diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c index f18625b6e2..1de46de1ce 100644 --- a/tools/virtiofsd/fuse_signals.c +++ b/tools/virtiofsd/fuse_signals.c @@ -12,11 +12,6 @@ #include "fuse_i.h" #include "fuse_lowlevel.h" -#include -#include -#include -#include -#include static struct fuse_session *fuse_instance; diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 83ba07c6cd..2c800418f1 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -20,20 +20,10 @@ #include "fuse_opt.h" #include "fuse_virtio.h" -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include -#include #include -#include #include "contrib/libvhost-user/libvhost-user.h" diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 75ac48dec2..28243b51b2 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -16,16 +16,8 @@ #include "fuse_misc.h" #include "fuse_opt.h" -#include -#include -#include -#include -#include -#include #include -#include #include -#include #define FUSE_HELPER_OPT(t, p) \ { \ diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index ec1008bceb..56cff773e4 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -41,29 +41,17 @@ #include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include #include #include #include #include -#include #include #include #include -#include #include "qemu/cutils.h" #include "passthrough_helpers.h" diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passthrough_seccomp.c index 11623f56f2..a60d7da4b4 100644 --- a/tools/virtiofsd/passthrough_seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -10,10 +10,7 @@ #include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include -#include #include -#include /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk) diff --git a/util/nvdimm-utils.c b/util/nvdimm-utils.c index 5cc768ca47..aa3d199f2d 100644 --- a/util/nvdimm-utils.c +++ b/util/nvdimm-utils.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h" -- 2.26.2