From nobody Mon Feb 9 19:00:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1652277444979354.50266981771165; Wed, 11 May 2022 06:57:24 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-Hz2HYvZIPamh3gLbWr0LbA-1; Wed, 11 May 2022 09:57:21 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7A4B3C161BD; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE6544411D4; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 854A51956B85; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7EA49193F6F3 for ; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5158040C1244; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C9074010A13 for ; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CE6A38107A7 for ; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-5-poFaiuwrP4CHZXxCf3RwZQ-1; Wed, 11 May 2022 09:57:14 -0400 Received: by mail-pj1-f44.google.com with SMTP id e24so2323528pjt.2 for ; Wed, 11 May 2022 06:57:14 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:12 -0700 (PDT) X-MC-Unique: Hz2HYvZIPamh3gLbWr0LbA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: poFaiuwrP4CHZXxCf3RwZQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FO5jeCQ/FqdBoj9hnAIgd4XNpLZ7N/nYbLHKyJ+b6+0=; b=odV+lUTXKa1HIixQlLaKH9dbkhGlCuaLqiHwPIgVBdrHLkcQNqx23qnVMJQAT7187X dhBsv86PCPeQvWsfx4bcNQLN7P/qyzYWFzWdFxoOqMMr0NnpUCaMu1C01vVhnlO1WNWQ 6CwBJ3VDpcqDcF3UnvccvV4QClHPKHr2ICUuHtPJjkxX96JrPQEa3Eqs7m7koex1KYfN E6ThFfwK2rXBfA5p6tKl/ggH9MDyqpkhb3kgAeJTIhSYoEAtSj1CQANYcdCnNsi4Gvgs cN6xCA/Hg4DMw3DBIawIpxmpe3q6j2zE7kGyK81BhSyzDP8pPdFVawINsCl4rh4lwjXz WaGQ== X-Gm-Message-State: AOAM533pznsBIqLKa2q2t/mOKeh8M7YL83/Aj7R94xTQK5nrvXwrJZU0 KUHoztkHq/Lng+Xk1kgD+0Y00/Nt/zPU4zEn X-Google-Smtp-Source: ABdhPJxMxCFlcfchNLgYoUnRhiJ2CBSAyD3hSgpPBvWm4TAwZg9dcwkGZsQJnTYDKo1jqDe1OIL1mg== X-Received: by 2002:a17:90a:fcb:b0:1dc:f0ce:69fb with SMTP id 69-20020a17090a0fcb00b001dcf0ce69fbmr5558720pjz.198.1652277432552; Wed, 11 May 2022 06:57:12 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 23/29] util: Remove unused includes Date: Wed, 11 May 2022 21:55:24 +0800 Message-Id: <20220511135530.951850-24-tcx4c70@gmail.com> In-Reply-To: <20220511135530.951850-1-tcx4c70@gmail.com> References: <20220511135530.951850-1-tcx4c70@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Tao Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1652277447187100002 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/util/iohelper.c | 3 --- src/util/virarch.h | 2 -- src/util/virarptable.c | 2 -- src/util/virarptable.h | 2 -- src/util/viraudit.h | 1 - src/util/virauth.c | 1 - src/util/virauth.h | 1 - src/util/virauthconfig.c | 1 - src/util/virbpf.c | 1 - src/util/virbuffer.c | 2 -- src/util/vircgroup.c | 3 --- src/util/vircgroupv2devices.c | 1 - src/util/vircgroupv2devices.h | 2 -- src/util/virconf.c | 1 - src/util/vircrypto.c | 2 -- src/util/virdnsmasq.c | 2 -- src/util/virebtables.c | 4 ---- src/util/virendian.h | 2 -- src/util/virenum.c | 1 - src/util/virerror.c | 1 - src/util/virevent.h | 1 - src/util/vireventglib.c | 1 - src/util/vireventglib.h | 2 -- src/util/vireventthread.h | 1 - src/util/virfcp.c | 2 -- src/util/virfdstream.c | 1 - src/util/virfilecache.c | 2 -- src/util/virfilecache.h | 2 -- src/util/virfirewall.c | 1 - src/util/virfirmware.c | 1 - src/util/virgic.c | 1 - src/util/virhook.c | 2 -- src/util/virhook.h | 2 -- src/util/virhostcpu.c | 2 -- src/util/virhostcpu.h | 1 - src/util/virhostmem.c | 2 -- src/util/virhostuptime.c | 1 - src/util/viridentity.c | 3 --- src/util/virinitctl.c | 3 --- src/util/viriptables.c | 6 ------ src/util/viriscsi.c | 2 -- src/util/virjson.c | 1 - src/util/virkmod.c | 1 - src/util/virlease.c | 2 -- src/util/virlockspace.c | 1 - src/util/virlockspace.h | 1 - src/util/virmacaddr.c | 1 - src/util/virmacmap.c | 2 -- src/util/virmacmap.h | 1 - src/util/virmdev.h | 1 - src/util/virnetdevbandwidth.c | 2 -- src/util/virnetdevbridge.c | 2 -- src/util/virnetdevip.c | 1 - src/util/virnetdevmacvlan.c | 2 -- src/util/virnetdevmacvlan.h | 2 -- src/util/virnetdevmidonet.c | 1 - src/util/virnetdevopenvswitch.c | 1 - src/util/virnetdevtap.c | 1 - src/util/virnetdevveth.c | 3 --- src/util/virnetdevvlan.c | 2 -- src/util/virnetlink.c | 1 - src/util/virnetlink.h | 1 - src/util/virnodesuspend.c | 4 ---- src/util/virnodesuspend.h | 2 -- src/util/virnvme.c | 1 - src/util/virobject.c | 2 -- src/util/virpci.c | 1 - src/util/virpcivpd.c | 1 - src/util/virperf.c | 2 -- src/util/virpidfile.c | 1 - src/util/virpolkit.c | 2 -- src/util/virportallocator.c | 3 --- src/util/virprobe.h | 1 - src/util/virprocess.h | 1 - src/util/virqemu.c | 2 -- src/util/virqemu.h | 1 - src/util/virrandom.c | 3 --- src/util/virresctrl.h | 3 --- src/util/virrotatingfile.c | 1 - src/util/virscsi.h | 1 - src/util/virscsivhost.c | 1 - src/util/virscsivhost.h | 1 - src/util/virseclabel.c | 2 -- src/util/virsecret.c | 1 - src/util/virsocketaddr.c | 2 -- src/util/virstoragefile.c | 4 ---- src/util/virtpm.c | 1 - src/util/virusb.h | 1 - src/util/virutil.c | 2 -- src/util/viruuid.c | 3 --- 90 files changed, 154 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 055540c8c4..dd77bda723 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -31,11 +31,8 @@ #include #include =20 -#include "virthread.h" #include "virfile.h" -#include "viralloc.h" #include "virerror.h" -#include "virrandom.h" #include "virstring.h" #include "virgettext.h" =20 diff --git a/src/util/virarch.h b/src/util/virarch.h index 81b1b27a57..cbfc893bbd 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - typedef enum { VIR_ARCH_NONE, VIR_ARCH_ALPHA, /* Alpha 64 BE https://en.wikipedia.org/w= iki/DEC_Alpha */ diff --git a/src/util/virarptable.c b/src/util/virarptable.c index 3b9ece3d9b..7f9fefc160 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -27,11 +27,9 @@ #include "viralloc.h" #include "virarptable.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" #include "virnetlink.h" #include "virsocketaddr.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virarptable.h b/src/util/virarptable.h index 825c7966b7..c3c90cfd11 100644 --- a/src/util/virarptable.h +++ b/src/util/virarptable.h @@ -20,8 +20,6 @@ =20 #pragma once =20 -#include "internal.h" - typedef struct _virArpTableEntry virArpTableEntry; typedef struct _virArpTable virArpTable; =20 diff --git a/src/util/viraudit.h b/src/util/viraudit.h index bc2325da58..a38a61c9f9 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virlog.h" =20 typedef enum { diff --git a/src/util/virauth.c b/src/util/virauth.c index e7fe8c97dd..b9c2ae3ed1 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -31,7 +31,6 @@ #include "virerror.h" #include "configmake.h" #include "virauthconfig.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_AUTH =20 diff --git a/src/util/virauth.h b/src/util/virauth.h index a0fd84962b..df67ab1d34 100644 --- a/src/util/virauth.h +++ b/src/util/virauth.h @@ -22,7 +22,6 @@ =20 #pragma once =20 -#include "internal.h" #include "viruri.h" =20 int virAuthGetConfigFilePath(virConnectPtr conn, diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 63d9cebdf7..dabd7cd217 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -24,7 +24,6 @@ =20 #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "viralloc.h" =20 struct _virAuthConfig { diff --git a/src/util/virbpf.c b/src/util/virbpf.c index df4f333614..1169b99d07 100644 --- a/src/util/virbpf.c +++ b/src/util/virbpf.c @@ -18,7 +18,6 @@ #include =20 #include "virlog.h" -#include "virerror.h" #include "virbpf.h" =20 VIR_LOG_INIT("util.bpf"); diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 19cf775a8c..01d04cc4f9 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -23,8 +23,6 @@ #include =20 #include "virbuffer.h" -#include "virstring.h" -#include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5cfc20f1ed..9918430cca 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -35,19 +35,16 @@ #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" =20 -#include "virutil.h" #include "viralloc.h" #include "vircgroupbackend.h" #include "virerror.h" #include "virlog.h" #include "virfile.h" #include "virgdbus.h" -#include "virhash.h" #include "virstring.h" #include "virsystemd.h" #include "virtypedparam.h" #include "virhostcpu.h" -#include "virthread.h" =20 VIR_LOG_INIT("util.cgroup"); =20 diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index ffa65bdd00..1769c499c8 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -30,7 +30,6 @@ #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" =20 -#include "viralloc.h" #include "virbpf.h" #include "vircgroup.h" #include "vircgroupv2devices.h" diff --git a/src/util/vircgroupv2devices.h b/src/util/vircgroupv2devices.h index 1ff46987e8..db83bb13db 100644 --- a/src/util/vircgroupv2devices.h +++ b/src/util/vircgroupv2devices.h @@ -20,8 +20,6 @@ =20 #include =20 -#include "internal.h" - #include "vircgroup.h" =20 bool diff --git a/src/util/virconf.c b/src/util/virconf.c index 0d0c04a824..8a96805642 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -32,7 +32,6 @@ #include "virlog.h" #include "viralloc.h" #include "virfile.h" -#include "virstring.h" #include "configmake.h" =20 #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 23692d22fb..828e822d8e 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -23,8 +23,6 @@ #include "vircrypto.h" #include "virlog.h" #include "virerror.h" -#include "viralloc.h" -#include "virrandom.h" #include "virsecureerase.h" =20 #include diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..342b489ab7 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -31,8 +31,6 @@ #include =20 #include "internal.h" -#include "datatypes.h" -#include "virbitmap.h" #include "virdnsmasq.h" #include "vircommand.h" #include "viralloc.h" diff --git a/src/util/virebtables.c b/src/util/virebtables.c index e296cf2578..9fc066a693 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -21,12 +21,8 @@ =20 #include =20 -#include "internal.h" #include "virebtables.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "virfirewall.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virendian.h b/src/util/virendian.h index e5b82026ac..db9c147c08 100644 --- a/src/util/virendian.h +++ b/src/util/virendian.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - /* The interfaces in this file are provided as macros for speed. */ =20 /** diff --git a/src/util/virenum.c b/src/util/virenum.c index 103f00b524..c6936e58ff 100644 --- a/src/util/virenum.c +++ b/src/util/virenum.c @@ -18,7 +18,6 @@ #include =20 #include "virenum.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virerror.c b/src/util/virerror.c index 5c8b9ebeb5..d114c0a346 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -27,7 +27,6 @@ #include "viralloc.h" #include "virlog.h" #include "virthread.h" -#include "virstring.h" #include "virbuffer.h" =20 #define LIBVIRT_VIRERRORPRIV_H_ALLOW diff --git a/src/util/virevent.h b/src/util/virevent.h index 6c8fdcbac4..321bbe67f7 100644 --- a/src/util/virevent.h +++ b/src/util/virevent.h @@ -20,6 +20,5 @@ */ =20 #pragma once -#include "internal.h" =20 int virEventRequireImpl(void); diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index fc04d8f712..b01ddb814e 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -27,7 +27,6 @@ =20 #include "vireventglib.h" #include "vireventglibwatch.h" -#include "virerror.h" #include "virlog.h" #include "virprobe.h" =20 diff --git a/src/util/vireventglib.h b/src/util/vireventglib.h index ef68abaa20..ea6f2149ac 100644 --- a/src/util/vireventglib.h +++ b/src/util/vireventglib.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - void virEventGLibRegister(void); =20 int virEventGLibRunOnce(void); diff --git a/src/util/vireventthread.h b/src/util/vireventthread.h index 5826c25cf4..79bdff479b 100644 --- a/src/util/vireventthread.h +++ b/src/util/vireventthread.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include =20 #define VIR_TYPE_EVENT_THREAD vir_event_thread_get_type() diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 5e8fe72fec..bb62fa9025 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -22,10 +22,8 @@ =20 #include "internal.h" =20 -#include "viralloc.h" #include "virfile.h" #include "virerror.h" -#include "virstring.h" =20 #include "virfcp.h" =20 diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index b596659702..3de0d59a8b 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -39,7 +39,6 @@ #include "configmake.h" #include "virstring.h" #include "virtime.h" -#include "virprocess.h" #include "virsocket.h" =20 #define VIR_FROM_THIS VIR_FROM_STREAMS diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index cfcfc26e19..c4bc984020 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -24,7 +24,6 @@ =20 #include "internal.h" =20 -#include "viralloc.h" #include "virbuffer.h" #include "vircrypto.h" #include "virerror.h" @@ -33,7 +32,6 @@ #include "virhash.h" #include "virlog.h" #include "virobject.h" -#include "virstring.h" =20 #include #include diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h index 81be8feef5..eb37d4cf15 100644 --- a/src/util/virfilecache.h +++ b/src/util/virfilecache.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - #include "virobject.h" #include "virhash.h" =20 diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 31a8352d4e..3183e0aec7 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -26,7 +26,6 @@ #include "virfirewalld.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "vircommand.h" #include "virlog.h" #include "virfile.h" diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index b2e3491544..9b333cf04b 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -20,7 +20,6 @@ =20 #include =20 -#include "viralloc.h" #include "virerror.h" #include "virfirmware.h" #include "virlog.h" diff --git a/src/util/virgic.c b/src/util/virgic.c index dcae97356d..fd0d248777 100644 --- a/src/util/virgic.c +++ b/src/util/virgic.c @@ -19,7 +19,6 @@ */ =20 #include -#include "internal.h" #include "virgic.h" =20 VIR_ENUM_IMPL(virGICVersion, diff --git a/src/util/virhook.c b/src/util/virhook.c index b52e2cd814..871bfcc670 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -27,9 +27,7 @@ =20 #include "virerror.h" #include "virhook.h" -#include "virutil.h" #include "virlog.h" -#include "viralloc.h" #include "virfile.h" #include "configmake.h" #include "vircommand.h" diff --git a/src/util/virhook.h b/src/util/virhook.h index d8237c837e..277d3118b4 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - typedef enum { VIR_HOOK_DRIVER_DAEMON =3D 0, /* Daemon related events */ VIR_HOOK_DRIVER_QEMU, /* QEMU domains related events */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index e3f2d6d4b7..639dd9b51e 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -45,9 +45,7 @@ #include "virerror.h" #include "virarch.h" #include "virfile.h" -#include "virtypedparam.h" #include "virstring.h" -#include "virnuma.h" #include "virlog.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 86a231daa2..9c6f1855b9 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virarch.h" #include "virbitmap.h" #include "virenum.h" diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 5984dfab3f..052f7cd935 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -36,10 +36,8 @@ # include #endif =20 -#include "viralloc.h" #include "virhostmem.h" #include "virerror.h" -#include "virarch.h" #include "virfile.h" #include "virtypedparam.h" #include "virstring.h" diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 7508a5a9b6..3d41fa081d 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -25,7 +25,6 @@ #endif =20 #include "virhostuptime.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" #include "virstring.h" diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 70843ecf9f..3e0dd687f3 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -30,15 +30,12 @@ #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW =20 #include "internal.h" -#include "viralloc.h" #include "virerror.h" #include "viridentitypriv.h" #include "virlog.h" -#include "virobject.h" #include "virrandom.h" #include "virthread.h" #include "virutil.h" -#include "virstring.h" #include "virprocess.h" #include "virtypedparam.h" #include "virfile.h" diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index d7e29f24c3..1b9f2ad022 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -26,10 +26,7 @@ #include "internal.h" #include "virinitctl.h" #include "virerror.h" -#include "virutil.h" -#include "viralloc.h" #include "virfile.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_INITCTL =20 diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 7db09a0d80..e9886a200e 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -29,14 +29,8 @@ #include "internal.h" #include "viriptables.h" #include "virfirewalld.h" -#include "vircommand.h" -#include "viralloc.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virthread.h" -#include "virstring.h" -#include "virutil.h" #include "virhash.h" =20 VIR_LOG_INIT("util.iptables"); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index e84d49b03c..fbf84c9305 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -27,10 +27,8 @@ #include "viralloc.h" #include "vircommand.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" #include "virrandom.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virjson.c b/src/util/virjson.c index 6e13e97e15..1334886f9c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -28,7 +28,6 @@ #include "virerror.h" #include "virlog.h" #include "virstring.h" -#include "virutil.h" #include "virbuffer.h" #include "virenum.h" #include "virbitmap.h" diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 6a996ebb04..4c709f8659 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -23,7 +23,6 @@ #include "viralloc.h" #include "virkmod.h" #include "vircommand.h" -#include "virstring.h" =20 static int doModprobe(const char *opts, const char *module, char **outbuf, char **err= buf) diff --git a/src/util/virlease.c b/src/util/virlease.c index 48b0f6fe57..357bacd83d 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -29,8 +29,6 @@ #include "virfile.h" #include "virstring.h" #include "virerror.h" -#include "viralloc.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK =20 diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 79925053bf..d54162b3d7 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -29,7 +29,6 @@ #include "virfile.h" #include "virhash.h" #include "virthread.h" -#include "virstring.h" =20 #include #include diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h index da83c001e9..fc087f1e35 100644 --- a/src/util/virlockspace.h +++ b/src/util/virlockspace.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virjson.h" =20 typedef struct _virLockSpace virLockSpace; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 6b22384cee..073f298b5b 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -23,7 +23,6 @@ =20 #include "virmacaddr.h" #include "virrandom.h" -#include "viralloc.h" =20 static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =3D { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index cf554205a8..98be64fb31 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -26,8 +26,6 @@ #include "virjson.h" #include "virfile.h" #include "virhash.h" -#include "virstring.h" -#include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK =20 diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index c0efa2b20f..09d2f32755 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" =20 typedef struct virMacMap virMacMap; diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 4d3655a091..9514080421 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -18,7 +18,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" #include "virenum.h" =20 diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 2895be8d27..ce65615bca 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -24,8 +24,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index a9667b48ce..f1a1c7f509 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -22,10 +22,8 @@ #include "virnetdev.h" #include "virerror.h" #include "virfile.h" -#include "viralloc.h" #include "virlog.h" #include "virstring.h" -#include "virsocket.h" =20 #ifdef WITH_NET_IF_H # include diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 2eacb64ebe..5b1c76c347 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -25,7 +25,6 @@ #include "virerror.h" #include "virlog.h" #include "virstring.h" -#include "vircommand.h" #include "viralloc.h" =20 #if WITH_GETIFADDRS diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index fd8c20e059..69c34cf016 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -27,8 +27,6 @@ #include "virnetdevmacvlan.h" #include "virmacaddr.h" #include "virerror.h" -#include "virthread.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NET =20 diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 0a013fc242..405e48088f 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -21,8 +21,6 @@ =20 #include "internal.h" #include "virmacaddr.h" -#include "virsocketaddr.h" -#include "virnetdevbandwidth.h" #include "virnetdevvportprofile.h" #include "virnetdevvlan.h" #include "virenum.h" diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 72b2fd4467..202808ef0f 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -20,7 +20,6 @@ =20 #include "virnetdevmidonet.h" #include "vircommand.h" -#include "viralloc.h" #include "virerror.h" #include "viruuid.h" =20 diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 7418716600..b54b2ddd99 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -30,7 +30,6 @@ #include "virlog.h" #include "virjson.h" #include "virfile.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cdaf67a72e..112a1e8b99 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -29,7 +29,6 @@ #include "viralloc.h" #include "virlog.h" #include "virstring.h" -#include "datatypes.h" =20 #include #include diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index b580e105ac..d9a73358a6 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -22,10 +22,7 @@ #include "virnetdevveth.h" #include "viralloc.h" #include "virlog.h" -#include "vircommand.h" #include "virerror.h" -#include "virfile.h" -#include "virstring.h" #include "virnetdev.h" #include "virnetlink.h" =20 diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 64fbacd4f8..5a0fa4e491 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -18,8 +18,6 @@ =20 #include =20 -#include "internal.h" -#include "virerror.h" #include "virnetdevvlan.h" #include "viralloc.h" =20 diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 04a39a905b..1711966cad 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -32,7 +32,6 @@ #include "virmacaddr.h" #include "virerror.h" #include "viralloc.h" -#include "virsocket.h" =20 #define VIR_FROM_THIS VIR_FROM_NET =20 diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 75192f645f..acab39dde4 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -19,7 +19,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virmacaddr.h" =20 #if defined(WITH_LIBNL) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 5feef79c43..0fec5647c1 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -26,10 +26,6 @@ #include "virsystemd.h" #include "vircommand.h" #include "virthread.h" -#include "datatypes.h" - -#include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "virerror.h" =20 diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index f767961bff..fa5e7d6274 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - int virNodeSuspend(unsigned int target, unsigned long long duration, unsigned int flags); diff --git a/src/util/virnvme.c b/src/util/virnvme.c index 3ce02b5000..d0f0c04aba 100644 --- a/src/util/virnvme.c +++ b/src/util/virnvme.c @@ -23,7 +23,6 @@ #include "virpci.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" =20 VIR_LOG_INIT("util.nvme"); #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virobject.c b/src/util/virobject.c index 74cc84205e..d1cd4d32f1 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -24,11 +24,9 @@ #define VIR_PARENT_REQUIRED /* empty, to allow virObject to have no parent= */ #include "virobject.h" #include "virthread.h" -#include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "virprobe.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virpci.c b/src/util/virpci.c index d141fde814..03d1d7b074 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -31,7 +31,6 @@ #include =20 #include "virlog.h" -#include "vircommand.h" #include "virerror.h" #include "virfile.h" #include "virkmod.h" diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 9af0566d19..4ba4fea237 100644 --- a/src/util/virpcivpd.c +++ b/src/util/virpcivpd.c @@ -30,7 +30,6 @@ #include "virpcivpdpriv.h" #include "virlog.h" #include "virerror.h" -#include "virfile.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virperf.c b/src/util/virperf.c index fde8ca7e34..434d1d99c4 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -30,8 +30,6 @@ #include "virlog.h" #include "virfile.h" #include "virstring.h" -#include "virtypedparam.h" -#include "viralloc.h" =20 VIR_LOG_INIT("util.perf"); =20 diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 9d194f7336..bfd967c1af 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -29,7 +29,6 @@ =20 #include "virpidfile.h" #include "virfile.h" -#include "viralloc.h" #include "virbuffer.h" #include "virutil.h" #include "virlog.h" diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 8970de192f..6c83eaf412 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -26,8 +26,6 @@ #include "virpolkit.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" -#include "virprocess.h" #include "viralloc.h" #include "virgdbus.h" #include "virfile.h" diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 44edd8f99a..96474b789a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -24,13 +24,10 @@ #include =20 #include "virsocket.h" -#include "viralloc.h" #include "virbitmap.h" #include "virportallocator.h" #include "virthread.h" #include "virerror.h" -#include "virfile.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virprobe.h b/src/util/virprobe.h index 80a5f48ec8..e8b195826a 100644 --- a/src/util/virprobe.h +++ b/src/util/virprobe.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virlog.h" =20 #if WITH_DTRACE_PROBES diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 086fbe0e4d..168255ba38 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -23,7 +23,6 @@ =20 #include =20 -#include "internal.h" #include "virbitmap.h" #include "virenum.h" =20 diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 8ff61b22b0..9dc0eab386 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -26,8 +26,6 @@ #include "virerror.h" #include "virlog.h" #include "virqemu.h" -#include "virstring.h" -#include "viralloc.h" #include "virbitmap.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 472f24de53..76c521e7c8 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -22,7 +22,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virbuffer.h" #include "virjson.h" =20 diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c3f3aa1fa6..e23ddf8e1d 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -28,11 +28,8 @@ #include =20 #include "virrandom.h" -#include "virthread.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 5d7b23c3c4..6fadacbfc6 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -18,10 +18,7 @@ =20 #pragma once =20 -#include "internal.h" - #include "virobject.h" -#include "virbitmap.h" #include "virenum.h" =20 typedef enum { diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 4e6fa382a8..d339e58e1c 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -28,7 +28,6 @@ #include "virrotatingfile.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "virfile.h" #include "virlog.h" =20 diff --git a/src/util/virscsi.h b/src/util/virscsi.h index 65ad15ed76..6915241a22 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" =20 typedef struct _virSCSIDevice virSCSIDevice; diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 487301ab64..1ea6a1ee2a 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -25,7 +25,6 @@ #include "virlog.h" #include "virerror.h" #include "virfile.h" -#include "virstring.h" #include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index d030aea397..e5b6f237a7 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" =20 typedef struct _virSCSIVHostDevice virSCSIVHostDevice; diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index 907e154d14..d7e4834d5f 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -22,9 +22,7 @@ #include =20 #include "internal.h" -#include "viralloc.h" #include "virseclabel.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virsecret.c b/src/util/virsecret.c index 604d900f77..c01f3fb967 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -26,7 +26,6 @@ #include "virerror.h" #include "virlog.h" #include "virsecret.h" -#include "virstring.h" #include "viruuid.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 430e43f2eb..0480485ab7 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -20,9 +20,7 @@ =20 #include "virsocketaddr.h" #include "virerror.h" -#include "virstring.h" #include "virbuffer.h" -#include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e3ec64486e..873da65d42 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -23,14 +23,10 @@ #include "virstoragefile.h" =20 #include "viralloc.h" -#include "viruuid.h" #include "virerror.h" #include "virlog.h" #include "vircommand.h" -#include "virhash.h" #include "virstring.h" -#include "virbuffer.h" -#include "virsecret.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 65126f8160..b898f3a6db 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -22,7 +22,6 @@ =20 #include =20 -#include "virstring.h" #include "virerror.h" #include "viralloc.h" #include "virfile.h" diff --git a/src/util/virusb.h b/src/util/virusb.h index d2b3f69942..fcc6259dc0 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" =20 #define USB_DEVFS "/dev/bus/usb/" diff --git a/src/util/virutil.c b/src/util/virutil.c index 176e2f8f59..7e246d22d1 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -48,11 +48,9 @@ =20 #include "virerror.h" #include "virlog.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "vircommand.h" -#include "virprocess.h" #include "virstring.h" #include "virutil.h" #include "virsocket.h" diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 558fbb9c0d..a63b91c645 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -28,10 +28,7 @@ #include #include =20 -#include "internal.h" -#include "virerror.h" #include "virlog.h" -#include "viralloc.h" #include "virfile.h" #include "virrandom.h" =20 --=20 2.36.1