From nobody Mon Feb 9 19:53:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607624759; cv=none; d=zohomail.com; s=zohoarc; b=Ry/YwkJd7rHCDpEceOIqmb6/RIgs/hNeIyvxJeLsCJvk9/m0hMwzx4qzs4FeLgbSvAkgF2twiKozkAbUroFIq6SLsFUxbLsc3u6odXKBYKETYtFJDAF+7Koyt4Dej/h/KJqpMPjAbe2qhbCMdTTFSBKUM5ZaZGprNjayPMyMKPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607624759; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G2bGa2EOpf8UttQv+0DCCfEwjpR8f8U1SOsoCA0P5+E=; b=bMXJHtcT60N5jwXrzd2XajrkQ4JDhBHPhaJJbHirAaate5cy0i9RMhhCOpGbQtIru0YepQanc4l93HhRJnnw2RdL8dkziBn+ZSMMYjFunQzOMbRuRXO7wuodZRVIGP37qys8xMQRHz/GMxEEop8H3ZIFMqV89HZA8vGdfp2/gME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607624759553771.5888128799833; Thu, 10 Dec 2020 10:25:59 -0800 (PST) Received: from localhost ([::1]:47324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knOzR-0005u1-ST for importer@patchew.org; Thu, 10 Dec 2020 11:40:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knOrj-0008Mp-9k for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knOrV-0003TD-O0 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 11:32:27 -0500 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-404-yLP3tHSpPm2xjxAm3z1YMA-1; Thu, 10 Dec 2020 11:32:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C0E29195D581; Thu, 10 Dec 2020 16:31:41 +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 65EE06F976; Thu, 10 Dec 2020 16:31:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BCBE91132B52; Thu, 10 Dec 2020 17:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607617930; 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: in-reply-to:in-reply-to:references:references; bh=G2bGa2EOpf8UttQv+0DCCfEwjpR8f8U1SOsoCA0P5+E=; b=MufhdToamLcI8rE7a7TD3YcY8nTT/hGuzyfDC2/usGmbGsdHhYtXPueqhCk11J4XzkigEo mI7znM1UZjk0S4f2J+NwFxM7OU4PdC2IzUVoG6UdtC6feCW+Z8rjfB9y5x11Vsb7ICK556 whs555ulN3IWo8aqIf702Eb9n06MEAo= X-MC-Unique: yLP3tHSpPm2xjxAm3z1YMA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 01/13] Clean up includes Date: Thu, 10 Dec 2020 17:31:20 +0100 Message-Id: <20201210163132.2919935-2-armbru@redhat.com> In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com> References: <20201210163132.2919935-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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=ham 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: peter.maydell@linaro.org, Thomas Huth , "Michael S . Tsirkin" , Cornelia Huck , "Dr . David Alan Gilbert" , Alexander Bulekov , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Message-Id: <20201113061216.2483385-1-armbru@redhat.com> Acked-by: Paolo Bonzini Acked-by: Dr. David Alan Gilbert Tested-by: Thomas Huth Acked-by: Cornelia Huck Acked-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Acked-by: Alexander Bulekov --- 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 =20 -#include "qemu/osdep.h" =20 #ifdef CONFIG_MEMFD -#include #include #endif =20 diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index bdf9a74b46..ad664c4df8 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 =20 -#include "qemu/osdep.h" =20 #include "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 =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" =20 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 =20 -#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 =20 -#include "qemu/osdep.h" =20 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_ =20 -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" =20 diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/gen= eric_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 =20 -#include "qemu/osdep.h" =20 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 @@ =20 #include "fuse_log.h" #include "fuse_opt.h" -#include -#include =20 /** 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 */ =20 -#include =20 /** * Log severity level diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowleve= l.h index 9c06240f9e..0e10a14bc9 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -25,10 +25,7 @@ =20 #include "fuse_common.h" =20 -#include -#include #include -#include #include #include =20 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 @@ */ =20 #include -#include "config-host.h" =20 /* * Versioned symbols cannot be used in some cases because it diff --git a/tools/virtiofsd/passthrough_seccomp.h b/tools/virtiofsd/passth= rough_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 =20 -#include =20 void setup_seccomp(bool enable_syslog); =20 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. */ =20 +#include "qemu/osdep.h" #include #include "virgl.h" =20 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. */ =20 +#include "qemu/osdep.h" #include "vugbm.h" =20 static bool diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/mai= n.c index d2de47cee7..c15d18c33f 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -6,7 +6,6 @@ =20 #include "qemu/osdep.h" =20 -#include #include =20 #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 9296e1bb6e..ead4f222d5 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -9,11 +9,12 @@ * directory. */ =20 +#include "qemu/osdep.h" + #include #include #include =20 -#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 bdc608c221..874f01c488 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 =20 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" =20 -#include -#include =20 static void default_log_func(__attribute__((unused)) enum fuse_log_level l= evel, const char *fmt, va_list ap) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.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" =20 -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include =20 #define THREAD_POOL_SIZE 64 =20 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" =20 -#include -#include -#include -#include =20 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" =20 -#include -#include -#include -#include -#include =20 static struct fuse_session *fuse_instance; =20 diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 623812c432..b264dcbd18 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" =20 -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include -#include #include -#include =20 #include "libvhost-user.h" =20 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" =20 -#include -#include -#include -#include -#include -#include #include -#include #include -#include =20 #define FUSE_HELPER_OPT(t, p) \ { \ diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 97485b22b4..12de321745 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 =20 #include "qemu/cutils.h" #include "passthrough_helpers.h" diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passth= rough_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 =20 /* 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" =20 --=20 2.26.2