From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 165227740493545.63644050492769; Wed, 11 May 2022 06:56:44 -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-671-Ls29PDyqOhiEsqUO496E_Q-1; Wed, 11 May 2022 09:56:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5EFC1C0336D; Wed, 11 May 2022 13:56:23 +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 D304C1121314; Wed, 11 May 2022 13:56:23 +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 B4A3B1947B84; Wed, 11 May 2022 13:56:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 43307194707B for ; Wed, 11 May 2022 13:56:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 34FB914C3B46; Wed, 11 May 2022 13:56:23 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30C5514C3B3F for ; Wed, 11 May 2022 13:56:23 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 B2D271E7DCD7 for ; Wed, 11 May 2022 13:56:15 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-166-xCRadvjhNj6KaoIwt8YqCA-1; Wed, 11 May 2022 09:56:11 -0400 Received: by mail-pf1-f181.google.com with SMTP id c14so2073926pfn.2 for ; Wed, 11 May 2022 06:56:10 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:08 -0700 (PDT) X-MC-Unique: Ls29PDyqOhiEsqUO496E_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: xCRadvjhNj6KaoIwt8YqCA-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=VXT45GZEevEvq9X8cdSzcWgslHhW/zMxEFa6Ll7arYg=; b=f/KhCvE9JeiKPAjEYgEh6+45ijk9IFkHoUnj74n013kdkWvBH4OIyElzl8Gzc8dcrR 8136YVtogZ4Ar5xereQZFgMiNOTyPkYG6wpmqgp3j4UD2M/qYrLJZwYTDYQnEsXD49M/ smhn6Ayw/ETFbz+8I2Ibqvx3OPDom9sdBGiZiBjQgEWQdKk8Wy0Tv7NOI7kTMiqHVcsN CaB6eJtAWpooOOkQkJkmrWp7DbM3yHtH3awHHtQ8dKfNaoqCAJCyKPkyRIiL6uRayZSx TzuDjhQE6Feg5rV/KARjtTUiA1e5woEKDILgcY47Vz7R47rZbSR1WXxlX9NP8r/aiGcV ymWg== X-Gm-Message-State: AOAM530bT5VDQ/p0uWbl4eHuxzQBaRCEzfyzQ3LqLwePsA4CMQu3zlUu Eaa8A3CuChAYDv3lU5E6kLyOJqD2N5cq9FJe X-Google-Smtp-Source: ABdhPJyWrnCj1IXpvDsW7tG77o9w2Sru8QtGgVngKI6vvmsQf6AhtLyT417b8WsHGHiCEz9FZvlJow== X-Received: by 2002:a63:87c8:0:b0:3c6:a549:5679 with SMTP id i191-20020a6387c8000000b003c6a5495679mr13981164pge.380.1652277368969; Wed, 11 May 2022 06:56:08 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 01/29] access: Remove unused includes Date: Wed, 11 May 2022 21:55:02 +0800 Message-Id: <20220511135530.951850-2-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.85 on 10.11.54.7 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.78 on 10.11.54.3 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: 1652277406884100004 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/access/viraccessdriver.h | 1 - src/access/viraccessdriverpolkit.c | 4 ---- src/access/viraccessdriverstack.c | 1 - src/access/viraccessmanager.h | 1 - src/access/viraccessperm.h | 1 - 5 files changed, 8 deletions(-) diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h index c1bccfe90f..f4bc4b6ced 100644 --- a/src/access/viraccessdriver.h +++ b/src/access/viraccessdriver.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "conf/domain_conf.h" #include "access/viraccessmanager.h" =20 typedef int (*virAccessDriverCheckConnectDrv)(virAccessManager *manager, diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index c8d1421ad8..2473bd6258 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -21,13 +21,9 @@ #include =20 #include "viraccessdriverpolkit.h" -#include "viralloc.h" -#include "vircommand.h" #include "virlog.h" -#include "virprocess.h" #include "virerror.h" #include "virpolkit.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_ACCESS =20 diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriver= stack.c index e6fe285a54..fb9ea71665 100644 --- a/src/access/viraccessdriverstack.c +++ b/src/access/viraccessdriverstack.c @@ -22,7 +22,6 @@ =20 #include "viraccessdriverstack.h" #include "viralloc.h" -#include "virerror.h" =20 #define VIR_FROM_THIS VIR_FROM_ACCESS =20 diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h index 9e3da355da..2050ac9b85 100644 --- a/src/access/viraccessmanager.h +++ b/src/access/viraccessmanager.h @@ -21,7 +21,6 @@ #pragma once =20 #include "viridentity.h" -#include "conf/domain_conf.h" #include "conf/network_conf.h" #include "conf/nwfilter_conf.h" #include "conf/node_device_conf.h" diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index 051246a7b6..b0ee36ed3a 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virenum.h" =20 typedef enum { --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277401511228.22112438399745; Wed, 11 May 2022 06:56:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-641---PmS8a7MHSOQCWSHcIFtQ-1; Wed, 11 May 2022 09:56:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC0411DC2439; Wed, 11 May 2022 13:56:26 +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 B8719400E436; Wed, 11 May 2022 13:56:26 +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 8C412193F6F3; Wed, 11 May 2022 13:56:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 51DBB194975B for ; Wed, 11 May 2022 13:56:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 31CF34411DA; Wed, 11 May 2022 13:56:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AE494411DC for ; Wed, 11 May 2022 13:56:24 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 9D32D3C19032 for ; Wed, 11 May 2022 13:56:20 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-6xJuk8SSMk68ueUnn_xW8Q-1; Wed, 11 May 2022 09:56:18 -0400 Received: by mail-pf1-f177.google.com with SMTP id x52so2036380pfu.11 for ; Wed, 11 May 2022 06:56:18 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:16 -0700 (PDT) X-MC-Unique: --PmS8a7MHSOQCWSHcIFtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 6xJuk8SSMk68ueUnn_xW8Q-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=Z0iwmfXiHe3OkJ2y18y7L/7tAR0mq8VzoxVlrVcQTWI=; b=Y3VLisFWHng5yju/px9A8nbS72vnwR46Lf9hbjc6MDHz7RaqgxTT2AXpiIsegXeCqx qrRTnXAWG6oLeu7kuua4mL5W2zLhzmWHd5UI7AxO93MuGTEDA+rYeVVVV1m2yTuggmCr VKcGRbI1Ov782jDWZmYZsm30zCEYCPuCfZgAa0UwkSt/bgZ+hcZWMnQtv03bTPRlEWhw vgFJYpWLIwWhrO+pWC8L0Rg5/SZ9ccXWJ2ILIP+TcK1RPZ/HlbeyGNpIHNAR7jaGNZne gE4m5vkgqXG90z0q2VZ2lrPP/4tLoFs/japlSlFMM4p29UI65Cm/2jNcd2ygRICZTVuU I7gw== X-Gm-Message-State: AOAM53157JIM1avjPPgwF3oIGHWQcpiwCdpF0LVLrYfvC63PMfBbUXB0 oZj8iJG37ZVPbJJlHIX8ESESWnNYBL+M2Jha X-Google-Smtp-Source: ABdhPJxzmTGSTnRoZaUFCIoEKz2TAPvPQ0JVcXH+1ykapnzjOVR1MqyjTxqU7vs+FtW5jUrSPYCuhQ== X-Received: by 2002:a05:6a00:2b6:b0:510:b7d7:ca88 with SMTP id q22-20020a056a0002b600b00510b7d7ca88mr10856935pfs.35.1652277377281; Wed, 11 May 2022 06:56:17 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 02/29] admin: Remove unused includes Date: Wed, 11 May 2022 21:55:03 +0800 Message-Id: <20220511135530.951850-3-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.85 on 10.11.54.9 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.84 on 10.11.54.2 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: 1652277406366100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/admin/admin_server.c | 4 ---- src/admin/admin_server.h | 1 - src/admin/admin_server_dispatch.c | 4 ---- src/admin/libvirt-admin.c | 2 -- 4 files changed, 11 deletions(-) diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index 6731a366cf..7ed2645f57 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -21,15 +21,11 @@ #include =20 #include "admin_server.h" -#include "datatypes.h" -#include "viralloc.h" #include "virerror.h" #include "viridentity.h" #include "virlog.h" #include "rpc/virnetdaemon.h" #include "rpc/virnetserver.h" -#include "virstring.h" -#include "virthreadpool.h" #include "virtypedparam.h" =20 #define VIR_FROM_THIS VIR_FROM_ADMIN diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h index 1c077af63b..20cb5f8fed 100644 --- a/src/admin/admin_server.h +++ b/src/admin/admin_server.h @@ -21,7 +21,6 @@ #pragma once =20 #include "rpc/virnetdaemon.h" -#include "rpc/virnetserver.h" =20 int adminConnectListServers(virNetDaemon *dmn, virNetServer ***servers, diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index 893c7f1de2..06047c66a8 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -21,20 +21,16 @@ #include =20 #include "internal.h" -#include "libvirt_internal.h" =20 #include "admin_server_dispatch.h" #include "admin_server.h" -#include "datatypes.h" #include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "rpc/virnetdaemon.h" #include "rpc/virnetserver.h" -#include "virstring.h" #include "virthreadjob.h" #include "virtypedparam.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_ADMIN =20 diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 5f64784a13..e7f005fda0 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -29,10 +29,8 @@ #include "virlog.h" #include "virnetclient.h" #include "virobject.h" -#include "virstring.h" #include "viruri.h" #include "virutil.h" -#include "viruuid.h" =20 #define VIR_FROM_THIS VIR_FROM_ADMIN =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 165227740387032.96237269826099; Wed, 11 May 2022 06:56:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-N3htr-6FOv-VqJrCR9a81g-1; Wed, 11 May 2022 09:56:39 -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 27AF89221CB; Wed, 11 May 2022 13:56:29 +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 14D6D4411C7; Wed, 11 May 2022 13:56:29 +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 E8D76193F6F3; Wed, 11 May 2022 13:56:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 18949194707B for ; Wed, 11 May 2022 13:56:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F213914E09E6; Wed, 11 May 2022 13:56:27 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE47A14E09E5 for ; Wed, 11 May 2022 13:56:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 3423519711DD for ; Wed, 11 May 2022 13:56:25 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-119-jCQnLGc1N_KMGcTFfxGygg-1; Wed, 11 May 2022 09:56:21 -0400 Received: by mail-pl1-f179.google.com with SMTP id d22so1947530plr.9 for ; Wed, 11 May 2022 06:56:20 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:19 -0700 (PDT) X-MC-Unique: N3htr-6FOv-VqJrCR9a81g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: jCQnLGc1N_KMGcTFfxGygg-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=Wx6NqmSpGYOmknsq+4x6HwtYHTlgwjeFvygeMgqV0+A=; b=d7bEUfAqn0hWihnpsXJKVp8j6ynbnQxlZUyPoWc+VhMDHSAKnPnevDBdYFzbS9n2GD sNTtk8yJxtIUBKSid6tOL2DNnErjqmMhdEksPPHYHK3rj0dtOSERNJPt2LXsOEcD+hGQ CBS1oGBK4BOkgg75i40iU69j8Xd1A0YqRLLfEx4hNtEBuZFrBOqrqSC8+oU0LVoGKzlI TCT+j1xXhUjkwUtadHMSEU3eIbLOFg9JPM0WSEQnJC5Mgkk7oiKtKdT8Paof4c9AJC+L h4KsCs84OzXoOgvKQ50jTwptA8gfhvu/rqxnFjskckj5CUPWsRRQsG8PszWCeQd0mljK DfDw== X-Gm-Message-State: AOAM530b8v7mMoRf+EqVD/Ja32fPsB2LCcv8jrQ1JULBq64SuwrRiJoF 9aQULu4rAY+PrCWZqNjeEyOuTgbJ8TCV1wDM X-Google-Smtp-Source: ABdhPJyDqWdziktx5xF89gnVOABj/oaC1FK44VaSlGqRDlYQ6pnwPs0WJnkVeezOog6v7pgJfjpnZg== X-Received: by 2002:a17:902:6902:b0:15e:a439:82b6 with SMTP id j2-20020a170902690200b0015ea43982b6mr25444594plk.76.1652277379648; Wed, 11 May 2022 06:56:19 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 03/29] ch: Remove unused includes Date: Wed, 11 May 2022 21:55:04 +0800 Message-Id: <20220511135530.951850-4-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.85 on 10.11.54.7 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: 1652277409885100017 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/ch/ch_conf.c | 1 - src/ch/ch_domain.c | 1 - src/ch/ch_driver.c | 7 ------- src/ch/ch_monitor.c | 2 -- src/ch/ch_process.c | 2 -- src/ch/ch_process.h | 1 - 6 files changed, 14 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index bae245adf3..775596e9f5 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -21,7 +21,6 @@ #include =20 #include "configmake.h" -#include "viralloc.h" #include "vircommand.h" #include "virlog.h" #include "virobject.h" diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index bb489a74e3..08420fd5f5 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -22,7 +22,6 @@ =20 #include "ch_domain.h" #include "domain_driver.h" -#include "viralloc.h" #include "virchrdev.h" #include "virlog.h" #include "virtime.h" diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index d14899044e..e7c172c894 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -29,18 +29,11 @@ #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" -#include "viralloc.h" -#include "virbuffer.h" #include "virchrdev.h" -#include "vircommand.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virnetdevtap.h" #include "virobject.h" -#include "virstring.h" #include "virtypedparam.h" -#include "viruri.h" #include "virutil.h" #include "viruuid.h" #include "virnuma.h" diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 2c6b83a1b5..fe3c1237c4 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -24,7 +24,6 @@ #include #include =20 -#include "ch_conf.h" #include "ch_monitor.h" #include "viralloc.h" #include "vircommand.h" @@ -33,7 +32,6 @@ #include "virjson.h" #include "virlog.h" #include "virstring.h" -#include "virtime.h" =20 #define VIR_FROM_THIS VIR_FROM_CH =20 diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 977082d585..192a027b3e 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -27,8 +27,6 @@ #include "ch_monitor.h" #include "ch_process.h" #include "domain_cgroup.h" -#include "virnuma.h" -#include "viralloc.h" #include "virerror.h" #include "virjson.h" #include "virlog.h" diff --git a/src/ch/ch_process.h b/src/ch/ch_process.h index 800e3f4e23..6eccf5e608 100644 --- a/src/ch/ch_process.h +++ b/src/ch/ch_process.h @@ -21,7 +21,6 @@ #pragma once =20 #include "ch_conf.h" -#include "internal.h" =20 int virCHProcessStart(virCHDriver *driver, virDomainObj *vm, --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277406651400.0358146903991; Wed, 11 May 2022 06:56:46 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-3a_W-KBAPYWS45qkUyHh0w-1; Wed, 11 May 2022 09:56:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 19FAA86B8AD; Wed, 11 May 2022 13:56:35 +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 03C0740CF8EB; Wed, 11 May 2022 13:56:35 +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 428F9194975B; Wed, 11 May 2022 13:56:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 140851937429 for ; Wed, 11 May 2022 13:56:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E718A53CD; Wed, 11 May 2022 13:56:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E25907AE2 for ; Wed, 11 May 2022 13:56:28 +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 5A58980419A for ; Wed, 11 May 2022 13:56:28 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-7-zl_U2lrUM8-0rpkg2oxNLg-1; Wed, 11 May 2022 09:56:25 -0400 Received: by mail-pg1-f175.google.com with SMTP id x12so1857254pgj.7 for ; Wed, 11 May 2022 06:56:24 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:22 -0700 (PDT) X-MC-Unique: 3a_W-KBAPYWS45qkUyHh0w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: zl_U2lrUM8-0rpkg2oxNLg-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=28PXBVuVIsdlvS/zl2oaOU5v3JFEXhbqnqQJ54QNgs0=; b=6AJxgHyIAyqcHJ9or5WHczNVks+TzcvXSSAyKkV4tkfdOBblqaKjF17kRlmPTfDSoE ZxKHdtjgpVvXsSybmkTmDdq9C0CPUCzqFZSGxm74MC7qD5WTFjZMhz9isIct4YjJm7bU 7l5VcmIh3b+SX7ZM2304/AuaS4e81B43gp6NLOZb+il8yJXHStRZGZ8rIIQRKp7IGDSv lFR+wuO0IwId9CjEvgzIpQEsOsLJHM1x9tt77xt/K2SBBxduWAs0I5I1i1K4H7OITCy5 1TzThGiFxCKn7B+JTeWYNgWpn3c7s/X4RCdl0DKIjtS8qtymc4fQJFDU7r3EJ0ldwfpo IfqA== X-Gm-Message-State: AOAM531DDeLWtcLJb/0ve0GCSFfhvfdJ0OXokOit42weDvvHCngb59yM smtnQgHPFV7x2FZVGWPQqgNEk0Dnw/aFYp9F X-Google-Smtp-Source: ABdhPJzNYxmkGOiw7tyETY75GEa+mWNlSfBwZiA4N32iadC2k8Sj3oxD2hwWUGpnRhNJikl67as3iA== X-Received: by 2002:a05:6a00:21c8:b0:4fd:f89f:ec0e with SMTP id t8-20020a056a0021c800b004fdf89fec0emr24921196pfj.83.1652277382506; Wed, 11 May 2022 06:56:22 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 04/29] conf: Remove unused includes Date: Wed, 11 May 2022 21:55:05 +0800 Message-Id: <20220511135530.951850-5-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.79 on 10.11.54.5 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.84 on 10.11.54.1 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: 1652277406953100010 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/conf/backup_conf.c | 3 --- src/conf/capabilities.c | 1 - src/conf/capabilities.h | 3 --- src/conf/checkpoint_conf.c | 4 ---- src/conf/checkpoint_conf.h | 1 - src/conf/cpu_conf.c | 2 -- src/conf/cpu_conf.h | 1 - src/conf/device_conf.c | 2 -- src/conf/device_conf.h | 1 - src/conf/domain_addr.c | 1 - src/conf/domain_audit.c | 1 - src/conf/domain_capabilities.c | 2 -- src/conf/domain_capabilities.h | 1 - src/conf/domain_conf.c | 4 ---- src/conf/domain_conf.h | 1 - src/conf/domain_event.c | 2 -- src/conf/domain_nwfilter.c | 2 -- src/conf/domain_validate.c | 1 - src/conf/interface_conf.c | 4 ---- src/conf/interface_conf.h | 2 -- src/conf/moment_conf.c | 3 --- src/conf/moment_conf.h | 1 - src/conf/netdev_bandwidth_conf.c | 1 - src/conf/netdev_vlan_conf.h | 1 - src/conf/netdev_vport_profile_conf.c | 1 - src/conf/netdev_vport_profile_conf.h | 1 - src/conf/network_conf.c | 2 -- src/conf/network_conf.h | 3 --- src/conf/network_event.h | 1 - src/conf/networkcommon_conf.c | 3 --- src/conf/networkcommon_conf.h | 2 -- src/conf/node_device_conf.c | 1 - src/conf/node_device_conf.h | 2 -- src/conf/node_device_event.h | 1 - src/conf/node_device_util.c | 1 - src/conf/nwfilter_conf.c | 2 -- src/conf/nwfilter_conf.h | 3 --- src/conf/nwfilter_ipaddrmap.c | 3 --- src/conf/nwfilter_params.c | 2 -- src/conf/nwfilter_params.h | 1 - src/conf/object_event.c | 4 ---- src/conf/object_event.h | 2 -- src/conf/secret_conf.c | 3 --- src/conf/secret_event.h | 1 - src/conf/snapshot_conf.c | 8 -------- src/conf/snapshot_conf.h | 1 - src/conf/storage_adapter_conf.c | 1 - src/conf/storage_capabilities.c | 1 - src/conf/storage_capabilities.h | 2 -- src/conf/storage_conf.c | 4 ---- src/conf/storage_conf.h | 4 ---- src/conf/storage_encryption_conf.c | 3 --- src/conf/storage_event.h | 1 - src/conf/virchrdev.c | 1 - src/conf/virchrdev.h | 1 - src/conf/virdomaincheckpointobjlist.c | 1 - src/conf/virdomaincheckpointobjlist.h | 2 -- src/conf/virdomainmomentobjlist.c | 5 ----- src/conf/virdomainobjlist.c | 2 -- src/conf/virdomainsnapshotobjlist.c | 3 --- src/conf/virdomainsnapshotobjlist.h | 2 -- src/conf/virinterfaceobj.c | 1 - src/conf/virinterfaceobj.h | 2 -- src/conf/virnetworkobj.h | 2 -- src/conf/virnetworkportdef.c | 2 -- src/conf/virnetworkportdef.h | 2 -- src/conf/virnodedeviceobj.c | 1 - src/conf/virnwfilterbindingdef.c | 1 - src/conf/virnwfilterbindingdef.h | 1 - src/conf/virnwfilterbindingobj.c | 4 ---- src/conf/virnwfilterbindingobj.h | 1 - src/conf/virnwfilterobj.h | 2 -- src/conf/virsavecookie.h | 1 - src/conf/virsecretobj.h | 3 --- src/conf/virstorageobj.c | 1 - src/conf/virstorageobj.h | 4 ---- 76 files changed, 154 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 2a7fa95e0c..0f2fba115d 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -21,16 +21,13 @@ #include "configmake.h" #include "internal.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" #include "backup_conf.h" #include "storage_source_conf.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virhash.h" #include "virenum.h" =20 diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 169aabdee1..1a7ebf4a13 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -37,7 +37,6 @@ #include "virlog.h" #include "virnuma.h" #include "virstring.h" -#include "virtypedparam.h" #include "viruuid.h" #include "virenum.h" #include "virutil.h" diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 701878332c..77fdd9f228 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -21,12 +21,9 @@ =20 #pragma once =20 -#include "internal.h" #include "virconftypes.h" -#include "virbuffer.h" #include "cpu_conf.h" #include "virarch.h" -#include "virmacaddr.h" #include "virobject.h" #include "virresctrl.h" =20 diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 175a95fed7..338cf10d12 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -23,19 +23,15 @@ =20 #include "configmake.h" #include "internal.h" -#include "virbitmap.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" #include "checkpoint_conf.h" #include "storage_source_conf.h" #include "viruuid.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virdomaincheckpointobjlist.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT diff --git a/src/conf/checkpoint_conf.h b/src/conf/checkpoint_conf.h index b11ec07b68..0128551eba 100644 --- a/src/conf/checkpoint_conf.h +++ b/src/conf/checkpoint_conf.h @@ -22,7 +22,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" #include "moment_conf.h" #include "virobject.h" diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 2d447da7c3..5ec703b903 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -26,8 +26,6 @@ #include "virbuffer.h" #include "virfile.h" #include "cpu_conf.h" -#include "domain_conf.h" -#include "virstring.h" #include "virlog.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 2cda4ee1f4..05523e1024 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -22,7 +22,6 @@ =20 #include "virbuffer.h" #include "virxml.h" -#include "virbitmap.h" #include "virarch.h" #include "numa_conf.h" #include "virenum.h" diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cb523d3a0d..e6ccdd2dd2 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -20,10 +20,8 @@ =20 #include #include "virerror.h" -#include "datatypes.h" #include "viralloc.h" #include "virxml.h" -#include "viruuid.h" #include "virbuffer.h" #include "device_conf.h" #include "domain_addr.h" diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index b6b710d313..c62798b51f 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -25,7 +25,6 @@ #include =20 #include "internal.h" -#include "virthread.h" #include "virbuffer.h" #include "virpci.h" #include "virnetdev.h" diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1173143635..1b1642b04a 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -23,7 +23,6 @@ =20 #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "domain_addr.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 17a01c51ba..974df5a037 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -34,7 +34,6 @@ #include "viruuid.h" #include "virlog.h" #include "viralloc.h" -#include "virstring.h" =20 VIR_LOG_INIT("conf.domain_audit"); =20 diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 2a888da1a9..895e8d00e8 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -20,11 +20,9 @@ =20 #include =20 -#include "device_conf.h" #include "domain_capabilities.h" #include "domain_conf.h" #include "viralloc.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES =20 diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index f2eed80b15..15bb7f4eb3 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" #include "virenum.h" =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 298ae183ce..38c363108b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -34,25 +34,21 @@ #include "domain_addr.h" #include "domain_conf.h" #include "domain_validate.h" -#include "snapshot_conf.h" #include "viralloc.h" #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" #include "virlog.h" -#include "nwfilter_conf.h" #include "virnetworkportdef.h" #include "storage_conf.h" #include "storage_source_conf.h" #include "virfile.h" #include "virbitmap.h" -#include "secret_conf.h" #include "netdev_vport_profile_conf.h" #include "netdev_bandwidth_conf.h" #include "netdev_vlan_conf.h" #include "device_conf.h" #include "network_conf.h" -#include "virtpm.h" #include "virsecret.h" #include "virstring.h" #include "virnetdev.h" diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a48646160..be0fb525d9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -29,7 +29,6 @@ #include "internal.h" #include "virconftypes.h" #include "capabilities.h" -#include "storage_encryption_conf.h" #include "cpu_conf.h" #include "virthread.h" #include "virhash.h" diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 18539e348b..ff8ea2c389 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -29,8 +29,6 @@ #include "datatypes.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "virtypedparam.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index 0a67b6765e..84c6b94919 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -27,9 +27,7 @@ #include "domain_conf.h" #include "domain_nwfilter.h" #include "virnwfilterbindingdef.h" -#include "virerror.h" #include "viralloc.h" -#include "virstring.h" #include "virlog.h" =20 =20 diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 18eb8d697d..f4f862e692 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -22,7 +22,6 @@ =20 #include "domain_validate.h" #include "domain_conf.h" -#include "snapshot_conf.h" #include "vircgroup.h" #include "virconftypes.h" #include "virlog.h" diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index ba5dc9961a..dc61b378b9 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -20,15 +20,11 @@ =20 #include #include "virerror.h" -#include "datatypes.h" =20 #include "interface_conf.h" =20 -#include "viralloc.h" #include "virxml.h" -#include "viruuid.h" #include "virbuffer.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_INTERFACE =20 diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 510d83b2bf..b4d2868387 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -24,8 +24,6 @@ #include #include =20 -#include "internal.h" -#include "virthread.h" #include "device_conf.h" #include "virenum.h" =20 diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index 0dff2cd000..8d5c7e3ef0 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -23,12 +23,9 @@ =20 #include =20 -#include "internal.h" #include "moment_conf.h" #include "domain_conf.h" #include "virlog.h" -#include "viralloc.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN =20 diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h index e1bc7ba138..e429a44aa6 100644 --- a/src/conf/moment_conf.h +++ b/src/conf/moment_conf.h @@ -22,7 +22,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virconftypes.h" #include "virobject.h" =20 diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 7737451046..4d9f855916 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -20,7 +20,6 @@ =20 #include "netdev_bandwidth_conf.h" #include "virerror.h" -#include "viralloc.h" #include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h index a2752e57ad..7b27d789b4 100644 --- a/src/conf/netdev_vlan_conf.h +++ b/src/conf/netdev_vlan_conf.h @@ -18,7 +18,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virnetdevvlan.h" #include "virbuffer.h" #include "virxml.h" diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_p= rofile_conf.c index d13833d7df..cdde7efcd9 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -20,7 +20,6 @@ =20 #include "netdev_vport_profile_conf.h" #include "virerror.h" -#include "viralloc.h" #include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_p= rofile_conf.h index 58b104610a..b5fccd26d4 100644 --- a/src/conf/netdev_vport_profile_conf.h +++ b/src/conf/netdev_vport_profile_conf.h @@ -18,7 +18,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virnetdevvportprofile.h" #include "virbuffer.h" #include "virxml.h" diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d8813ee2cc..b8450b75a9 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -26,7 +26,6 @@ #include =20 #include "virerror.h" -#include "datatypes.h" #include "network_conf.h" #include "netdev_vport_profile_conf.h" #include "netdev_bandwidth_conf.h" @@ -35,7 +34,6 @@ #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" -#include "virfile.h" #include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index b374bbba48..184b83885c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -23,15 +23,12 @@ =20 #define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as ment= ioned in RFC-2782 */ =20 -#include "internal.h" -#include "virthread.h" #include "virsocketaddr.h" #include "virnetdevbandwidth.h" #include "virnetdevvportprofile.h" #include "virnetdevvlan.h" #include "virmacaddr.h" #include "device_conf.h" -#include "virbitmap.h" #include "networkcommon_conf.h" #include "virobject.h" #include "virmacmap.h" diff --git a/src/conf/network_event.h b/src/conf/network_event.h index b55739ed0f..4502bfcaef 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -23,7 +23,6 @@ =20 #include "internal.h" #include "object_event.h" -#include "object_event_private.h" =20 int virNetworkEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 2f543ced70..7bfcd2e9b4 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -22,10 +22,7 @@ #include =20 #include "virerror.h" -#include "datatypes.h" #include "networkcommon_conf.h" -#include "viralloc.h" -#include "virstring.h" #include "virxml.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h index cc75af1ebb..6e1d0b1326 100644 --- a/src/conf/networkcommon_conf.h +++ b/src/conf/networkcommon_conf.h @@ -25,9 +25,7 @@ #include #include =20 -#include "internal.h" #include "virbuffer.h" -#include "virsocketaddr.h" #include "virnetdevip.h" =20 virNetDevIPRoute * diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 8b20a7bee9..d689f48280 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -25,7 +25,6 @@ #include =20 #include "virerror.h" -#include "datatypes.h" #include "viralloc.h" #include "virstring.h" #include "node_device_conf.h" diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index e4d1f67d53..b28ef21dbf 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -22,14 +22,12 @@ =20 #pragma once =20 -#include "internal.h" #include "virbitmap.h" #include "virpcivpd.h" #include "virscsihost.h" #include "virpci.h" #include "virvhba.h" #include "device_conf.h" -#include "storage_adapter_conf.h" #include "virenum.h" =20 #include diff --git a/src/conf/node_device_event.h b/src/conf/node_device_event.h index 46828ce406..3f605027c3 100644 --- a/src/conf/node_device_event.h +++ b/src/conf/node_device_event.h @@ -24,7 +24,6 @@ =20 #include "internal.h" #include "object_event.h" -#include "object_event_private.h" =20 int virNodeDeviceEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 1c1f5a0dd5..dfec1a91ce 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -23,7 +23,6 @@ #include "node_device_util.h" #include "virlog.h" #include "virscsihost.h" -#include "virstring.h" #include "virvhba.h" #include "viralloc.h" #include "virutil.h" diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 5171145c75..53b1dd4a8f 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -38,10 +38,8 @@ #include "viruuid.h" #include "viralloc.h" #include "virerror.h" -#include "datatypes.h" #include "nwfilter_params.h" #include "nwfilter_conf.h" -#include "domain_conf.h" #include "virfile.h" #include "virstring.h" =20 diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 46867afc8c..980eabab00 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -24,9 +24,6 @@ =20 #pragma once =20 -#include "internal.h" - -#include "virhash.h" #include "virxml.h" #include "virbuffer.h" #include "virsocketaddr.h" diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 4090cc2769..ea4586fb1b 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -23,9 +23,6 @@ =20 #include "internal.h" =20 -#include "viralloc.h" -#include "virerror.h" -#include "virstring.h" #include "datatypes.h" #include "nwfilter_params.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index ca7b62874c..92385a97e6 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -25,9 +25,7 @@ =20 #include "viralloc.h" #include "virerror.h" -#include "datatypes.h" #include "nwfilter_params.h" -#include "domain_conf.h" #include "virlog.h" #include "virstring.h" =20 diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index f9f7f68ff3..9ce3b80ef4 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -23,7 +23,6 @@ =20 #include "virhash.h" #include "virbuffer.h" -#include "virmacaddr.h" #include "virxml.h" =20 typedef enum { diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 9ea9ee3496..3c998eda7f 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -22,16 +22,12 @@ =20 #include =20 -#include "domain_event.h" -#include "network_event.h" #include "object_event.h" #include "object_event_private.h" #include "virlog.h" -#include "datatypes.h" #include "viralloc.h" #include "virerror.h" #include "virobject.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 7b5531344e..57bc5d0298 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -24,8 +24,6 @@ =20 #include "internal.h" =20 -#include "virobject.h" - /** * Dispatching domain events that come in while * in a call / response rpc diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 1dee90eba1..011fdaa12b 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -22,11 +22,8 @@ =20 #include "internal.h" #include "virbuffer.h" -#include "datatypes.h" #include "virlog.h" -#include "viralloc.h" #include "secret_conf.h" -#include "virsecretobj.h" #include "virerror.h" #include "virsecret.h" #include "virstring.h" diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h index b0b0a213ce..b1639c828a 100644 --- a/src/conf/secret_event.h +++ b/src/conf/secret_event.h @@ -24,7 +24,6 @@ =20 #include "internal.h" #include "object_event.h" -#include "object_event_private.h" =20 int virSecretEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 80946beba9..ae635edd08 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -27,23 +27,15 @@ =20 #include "configmake.h" #include "internal.h" -#include "virbitmap.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" -#include "netdev_bandwidth_conf.h" -#include "netdev_vport_profile_conf.h" -#include "nwfilter_conf.h" -#include "secret_conf.h" #include "snapshot_conf.h" #include "storage_source_conf.h" #include "viruuid.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virdomainsnapshotobjlist.h" =20 #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 1f787f1a94..94d7ab129a 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" #include "moment_conf.h" #include "virenum.h" diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_con= f.c index 135deeb933..4c13cc4c17 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -24,7 +24,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "virutil.h" #include "virxml.h" =20 diff --git a/src/conf/storage_capabilities.c b/src/conf/storage_capabilitie= s.c index 22e05bbe30..b4dc2643d7 100644 --- a/src/conf/storage_capabilities.c +++ b/src/conf/storage_capabilities.c @@ -21,7 +21,6 @@ #include =20 #include "virerror.h" -#include "datatypes.h" #include "capabilities.h" #include "storage_capabilities.h" #include "storage_conf.h" diff --git a/src/conf/storage_capabilities.h b/src/conf/storage_capabilitie= s.h index 2b484bbc30..ce4b3e853b 100644 --- a/src/conf/storage_capabilities.h +++ b/src/conf/storage_capabilities.h @@ -20,8 +20,6 @@ =20 #pragma once =20 -#include "internal.h" - typedef struct _virStoragePoolCaps virStoragePoolCaps; struct _virStoragePoolCaps { virObjectLockable parent; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 85260431e7..5da0bf20dd 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -27,8 +27,6 @@ #include =20 #include "virerror.h" -#include "datatypes.h" -#include "node_device_conf.h" #include "storage_adapter_conf.h" #include "storage_conf.h" #include "storage_source_conf.h" @@ -38,10 +36,8 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" -#include "virscsihost.h" #include "virstring.h" #include "virlog.h" -#include "virvhba.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index aaecf138d6..a0410d2da6 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -21,11 +21,7 @@ =20 #pragma once =20 -#include "internal.h" -#include "storage_encryption_conf.h" #include "storage_source_conf.h" -#include "virbitmap.h" -#include "virthread.h" #include "device_conf.h" #include "object_event.h" #include "storage_adapter_conf.h" diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encrypti= on_conf.c index a65ef1f8a2..3651ff8cfd 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -30,10 +30,7 @@ #include "storage_encryption_conf.h" #include "virxml.h" #include "virerror.h" -#include "viruuid.h" -#include "virfile.h" #include "virsecret.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h index 8a62785798..4fcf83ff50 100644 --- a/src/conf/storage_event.h +++ b/src/conf/storage_event.h @@ -24,7 +24,6 @@ =20 #include "internal.h" #include "object_event.h" -#include "object_event_private.h" =20 int virStoragePoolEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 8610f0ac5c..0ffd3db90a 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -35,7 +35,6 @@ #include "virlog.h" #include "virerror.h" #include "virfile.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h index 54fd110ab0..78a40a4a1a 100644 --- a/src/conf/virchrdev.h +++ b/src/conf/virchrdev.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" =20 typedef struct _virChrdevs virChrdevs; diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomainchec= kpointobjlist.c index 797feea520..70b2f90c0e 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -28,7 +28,6 @@ #include "virlog.h" #include "virerror.h" #include "datatypes.h" -#include "virstring.h" #include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT diff --git a/src/conf/virdomaincheckpointobjlist.h b/src/conf/virdomainchec= kpointobjlist.h index 8b6f51cd89..ad01391cb8 100644 --- a/src/conf/virdomaincheckpointobjlist.h +++ b/src/conf/virdomaincheckpointobjlist.h @@ -22,9 +22,7 @@ =20 #pragma once =20 -#include "internal.h" #include "virdomainmomentobjlist.h" -#include "virbuffer.h" =20 virDomainCheckpointObjList * virDomainCheckpointObjListNew(void); diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentob= jlist.c index 2f2467d13f..f19ec3319a 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -26,14 +26,9 @@ #include "virdomainmomentobjlist.h" #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "moment_conf.h" #include "viralloc.h" =20 -/* FIXME: using virObject would allow us to not need this */ -#include "virdomainsnapshotobjlist.h" -#include "virdomaincheckpointobjlist.h" - #define VIR_FROM_THIS VIR_FROM_DOMAIN =20 VIR_LOG_INIT("conf.virdomainmomentobjlist"); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 66bd4bcba7..f16b963eb0 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -25,8 +25,6 @@ #include "internal.h" #include "datatypes.h" #include "virdomainobjlist.h" -#include "checkpoint_conf.h" -#include "snapshot_conf.h" #include "viralloc.h" #include "virfile.h" #include "virlog.h" diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapsh= otobjlist.c index 2520a4bca4..9a9ea7827e 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -22,13 +22,10 @@ =20 #include =20 -#include "internal.h" #include "virdomainsnapshotobjlist.h" #include "snapshot_conf.h" #include "virlog.h" -#include "virerror.h" #include "datatypes.h" -#include "virstring.h" #include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapsh= otobjlist.h index ce9d77e10b..0008576d05 100644 --- a/src/conf/virdomainsnapshotobjlist.h +++ b/src/conf/virdomainsnapshotobjlist.h @@ -22,9 +22,7 @@ =20 #pragma once =20 -#include "internal.h" #include "virdomainmomentobjlist.h" -#include "virbuffer.h" =20 virDomainSnapshotObjList *virDomainSnapshotObjListNew(void); void virDomainSnapshotObjListFree(virDomainSnapshotObjList *snapshots); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 95279d5b1c..c2b81b984f 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -27,7 +27,6 @@ #include "virinterfaceobj.h" #include "virhash.h" #include "virlog.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_INTERFACE =20 diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 5927484167..3e6a73fd15 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -19,8 +19,6 @@ =20 #pragma once =20 -#include "internal.h" - typedef struct _virInterfaceObj virInterfaceObj; =20 typedef struct _virInterfaceObjList virInterfaceObjList; diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index fadd277cbd..fd519cced1 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -19,8 +19,6 @@ =20 #pragma once =20 -#include "internal.h" - #include "network_conf.h" #include "virnetworkportdef.h" =20 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index aa35374fb0..39fa895fae 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -23,8 +23,6 @@ =20 #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "virfile.h" #include "virnetdevmacvlan.h" #include "virnetworkportdef.h" #include "network_conf.h" diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h index ee13f8a084..bbc155a3ea 100644 --- a/src/conf/virnetworkportdef.h +++ b/src/conf/virnetworkportdef.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" -#include "viruuid.h" #include "virnetdevvlan.h" #include "virnetdevvportprofile.h" #include "virnetdevbandwidth.h" diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 49947d0a58..26498fc498 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virhash.h" #include "virlog.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NODEDEV =20 diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index c55a5d28dc..cc50ba944a 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -22,7 +22,6 @@ =20 #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "nwfilter_params.h" #include "virnwfilterbindingdef.h" #include "viruuid.h" diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbinding= def.h index 4bf0f252f8..c3f87492aa 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virmacaddr.h" #include "virhash.h" #include "virbuffer.h" diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index be43ae3931..47455c7e35 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -23,11 +23,7 @@ =20 #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "nwfilter_params.h" #include "virnwfilterbindingobj.h" -#include "viruuid.h" -#include "virfile.h" =20 =20 #define VIR_FROM_THIS VIR_FROM_NWFILTER diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbinding= obj.h index 93f693936e..6739b848a3 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virnwfilterbindingdef.h" #include "virobject.h" =20 diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index b67dc017c5..8629f0d461 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -19,8 +19,6 @@ =20 #pragma once =20 -#include "internal.h" - #include "nwfilter_conf.h" #include "virnwfilterbindingobjlist.h" =20 diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h index 9d275edd03..a43c47af47 100644 --- a/src/conf/virsavecookie.h +++ b/src/conf/virsavecookie.h @@ -22,7 +22,6 @@ =20 #include =20 -#include "internal.h" #include "virobject.h" #include "virbuffer.h" =20 diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index 93b4a46acf..0bcfd4bfc3 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -20,10 +20,7 @@ =20 #pragma once =20 -#include "internal.h" - #include "secret_conf.h" -#include "virobject.h" =20 typedef struct _virSecretObj virSecretObj; =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index fe868d25fa..238d4678a2 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -21,7 +21,6 @@ #include =20 #include "datatypes.h" -#include "node_device_conf.h" #include "node_device_util.h" #include "virstorageobj.h" =20 diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 523bdec244..f1a2c5f89d 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -19,12 +19,8 @@ =20 #pragma once =20 -#include "internal.h" - #include "storage_conf.h" =20 -#include "capabilities.h" - typedef struct _virStoragePoolObj virStoragePoolObj; =20 typedef struct _virStoragePoolObjList virStoragePoolObjList; --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277401348474.0951537696849; Wed, 11 May 2022 06:56:41 -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-439-TDku7zNONj2OVCscv_UlGg-1; Wed, 11 May 2022 09:56:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 433413C1172C; Wed, 11 May 2022 13:56:33 +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 2E61B400E122; Wed, 11 May 2022 13:56:33 +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 08B39193F6F3; Wed, 11 May 2022 13:56:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF4E8194707B for ; Wed, 11 May 2022 13:56:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 87BDE40CF8EE; Wed, 11 May 2022 13:56:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8397E40CF8EB for ; Wed, 11 May 2022 13:56:32 +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 00883805F46 for ; Wed, 11 May 2022 13:56:31 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-Xd_rLGYYPJ65kjPvAtOvNg-1; Wed, 11 May 2022 09:56:26 -0400 Received: by mail-pf1-f169.google.com with SMTP id g8so2065629pfh.5 for ; Wed, 11 May 2022 06:56:26 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:24 -0700 (PDT) X-MC-Unique: TDku7zNONj2OVCscv_UlGg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: Xd_rLGYYPJ65kjPvAtOvNg-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=GH84zSWqgk5m5/mBUu6eT59UPfP8v5AN2u1S6FD5ZOQ=; b=p55oa47KSC0NQmbI4/gsH9A1SUFz7Mb5MCFLkPSuTkK82GCc1jdjlWlZvkyN5PakJT EGpJbOhSRAAa4whEbE1mreuc0iqSF/KKAs9+KfLhxVhmS/nQtlaUq7Uw+SYRmGUH5vD/ EZv34C45dq0CTVOQ+E2mokAaq8Y7hL5KA4QF6U7dOpJ5aFG+RsLJiEtY6YOyFXQptGAX 6qXuYtxh57hKtqu3IXTfXS+igXOilKpR3WUI++GUkECDFs1j3s32geWBILiom8chGC8z W1VuAyl6p4MG0RSjonwXcywqX8aju13y0IMCLVppIOolZHozi5rCgAG2u7RhPT7689KU 0CLA== X-Gm-Message-State: AOAM5311fDDYl6zeg3jw91a+DBMMcVGawb7K4F8hhxN/JqkO4ti5/gpb AW7M/GCXplREadbKNAsDNSfpEEUmTOPRarG9 X-Google-Smtp-Source: ABdhPJwiqFqu7pJHq/THo+V7/za9tCQUXe9yR0tID0LCseHSdgAIa0MdNGzNiG9yJIhgavqaW1KkXA== X-Received: by 2002:a62:830e:0:b0:510:8508:2b5f with SMTP id h14-20020a62830e000000b0051085082b5fmr23153331pfe.44.1652277384914; Wed, 11 May 2022 06:56:24 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 05/29] cpu: Remove unused includes Date: Wed, 11 May 2022 21:55:06 +0800 Message-Id: <20220511135530.951850-6-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.1 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.84 on 10.11.54.2 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: 1652277407903100013 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/cpu/cpu.c | 3 --- src/cpu/cpu.h | 1 - src/cpu/cpu_arm.c | 1 - src/cpu/cpu_map.c | 2 -- src/cpu/cpu_ppc64.c | 1 - src/cpu/cpu_s390.c | 2 -- src/cpu/cpu_x86.c | 1 - 7 files changed, 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 285c7eee44..d97ef5e873 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -21,16 +21,13 @@ #include =20 #include "virlog.h" -#include "viralloc.h" #include "virxml.h" #include "cpu.h" -#include "cpu_map.h" #include "cpu_x86.h" #include "cpu_ppc64.h" #include "cpu_s390.h" #include "cpu_arm.h" #include "capabilities.h" -#include "virstring.h" =20 =20 #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 071b33fe76..06b5858ef3 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "virerror.h" #include "datatypes.h" #include "virarch.h" #include "domain_capabilities.h" diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 51a3c1f3ee..599bb836ed 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -35,7 +35,6 @@ #include "cpu_arm.h" #include "cpu_map.h" #include "virlog.h" -#include "virstring.h" #include "virxml.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 6baaa77776..1d8051a13b 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -20,12 +20,10 @@ =20 #include =20 -#include "viralloc.h" #include "virfile.h" #include "cpu.h" #include "cpu_map.h" #include "configmake.h" -#include "virstring.h" #include "virlog.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 314d2f7c86..5ff076e337 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -26,7 +26,6 @@ #include "cpu.h" #include "virstring.h" #include "cpu_map.h" -#include "virbuffer.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU =20 diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 8fda4a49a6..d908a83928 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -21,8 +21,6 @@ =20 #include =20 -#include "viralloc.h" -#include "virstring.h" #include "cpu.h" =20 =20 diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a4aca6055d..695d095baa 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -31,7 +31,6 @@ #include "cpu_x86.h" #include "virbuffer.h" #include "virendian.h" -#include "virstring.h" #include "virhostcpu.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277405787547.8655110975031; Wed, 11 May 2022 06:56:45 -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-38-6jmJE-yIM6e70a8az134Bg-1; Wed, 11 May 2022 09:56:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0C8B299E77E; Wed, 11 May 2022 13:56:37 +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 AD65714C3B37; Wed, 11 May 2022 13:56:37 +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 966F2193F6F6; Wed, 11 May 2022 13:56:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 844DA194707B for ; Wed, 11 May 2022 13:56:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 270D514C4EC1; Wed, 11 May 2022 13:56:36 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 231EE14C4EB5 for ; Wed, 11 May 2022 13:56:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 0A7FD1C01B2D for ; Wed, 11 May 2022 13:56:35 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-lTqDfST6Nq6mh28hfY8hcA-2; Wed, 11 May 2022 09:56:28 -0400 Received: by mail-pf1-f169.google.com with SMTP id g8so2065629pfh.5 for ; Wed, 11 May 2022 06:56:28 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:27 -0700 (PDT) X-MC-Unique: 6jmJE-yIM6e70a8az134Bg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: lTqDfST6Nq6mh28hfY8hcA-2 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=E90INwUj5D0rEEtrsRrzTBLH/lAPhr2YNpXjWi3Diow=; b=0tEWHaB0Z8kBNy0PMYxaZyMMXvEGSCiZoTmPtSst0/43bx1l9uFLgMp1oDeoVESkrZ 3rRmcUurjvIUkmGW0D8nlbNm1rskFEzcK2R9saCADG5xV6TE6lBFe2g2kgP84AIpGQEK yLG9AYZXmjnP37hjOQTZ9JR3xwCBdJwXO4kxnnlFZ/nm7KKMtp4ktP2rS+WGoE5rMrH1 pQopXYv9Q4UnRVAV7j17eUjj62UcJQsR+0C/FpBUvleT8pOavKdlqSxOYD2SbXaawQp0 GJY2GTuzL097G86YcEhKYUwYb+0pjlNmiu/6pWyuVqVBdn50c457s3iuyFU7znm8VHIJ 1P1g== X-Gm-Message-State: AOAM531gozEUoPE5YF7QL09laPGkjr9XOT1MRyh1bcBZR45hiaZFk5Og IpQ//d0TTWg7q4/yXvL9lB2gCeABt9YY9YzJ X-Google-Smtp-Source: ABdhPJy/3nNevmoYIX5VZM/yHDYfFqOToPXy3WjcWKUm1sUFb0RxhMbwYGcyBCuz7MDPyrZCO3vllA== X-Received: by 2002:a65:6e82:0:b0:381:71c9:9856 with SMTP id bm2-20020a656e82000000b0038171c99856mr21246075pgb.316.1652277387506; Wed, 11 May 2022 06:56:27 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 06/29] esx: Remove unused includes Date: Wed, 11 May 2022 21:55:07 +0800 Message-Id: <20220511135530.951850-7-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.85 on 10.11.54.7 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.7 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: 1652277406883100003 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/esx/esx_driver.c | 1 - src/esx/esx_interface_driver.c | 6 ------ src/esx/esx_network_driver.c | 2 -- src/esx/esx_private.h | 3 --- src/esx/esx_storage_backend_iscsi.c | 2 -- src/esx/esx_storage_backend_vmfs.c | 2 -- src/esx/esx_storage_driver.c | 2 -- src/esx/esx_stream.c | 1 - src/esx/esx_stream.h | 1 - src/esx/esx_util.c | 3 --- src/esx/esx_vi.h | 2 -- src/esx/esx_vi_methods.c | 2 -- src/esx/esx_vi_types.c | 1 - 13 files changed, 28 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fd1331375c..79b991f36f 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -28,7 +28,6 @@ #include "snapshot_conf.h" #include "virauth.h" #include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "viruuid.h" #include "vmx.h" diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 0c4f2022f5..d6b6410d1a 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -24,16 +24,10 @@ #include =20 #include "internal.h" -#include "viralloc.h" -#include "viruuid.h" #include "interface_conf.h" #include "virsocketaddr.h" #include "esx_private.h" -#include "esx_interface_driver.h" #include "esx_vi.h" -#include "esx_vi_methods.h" -#include "esx_util.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_ESX =20 diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 34020ac188..290c0ad56f 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -28,12 +28,10 @@ #include "viruuid.h" #include "network_conf.h" #include "esx_private.h" -#include "esx_network_driver.h" #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" #include "vircrypto.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_ESX =20 diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h index 278a3f0142..1d5c539f5b 100644 --- a/src/esx/esx_private.h +++ b/src/esx/esx_private.h @@ -21,10 +21,7 @@ =20 #pragma once =20 -#include "internal.h" -#include "virerror.h" #include "capabilities.h" -#include "domain_conf.h" #include "esx_vi.h" =20 typedef struct _esxPrivate { diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_back= end_iscsi.c index 043de1690d..7be0444f1b 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -33,9 +33,7 @@ #include "esx_private.h" #include "esx_vi.h" #include "esx_vi_methods.h" -#include "esx_util.h" #include "vircrypto.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_ESX =20 diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backe= nd_vmfs.c index 5dba813111..c718597d72 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -28,9 +28,7 @@ =20 #include "internal.h" #include "viralloc.h" -#include "virfile.h" #include "virlog.h" -#include "viruuid.h" #include "storage_conf.h" #include "storage_source_conf.h" #include "esx_storage_backend_vmfs.h" diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 056b340a08..7ce2efe855 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -26,9 +26,7 @@ =20 #include "viruuid.h" #include "viralloc.h" -#include "storage_conf.h" #include "esx_private.h" -#include "esx_storage_driver.h" #include "esx_storage_backend_vmfs.h" #include "esx_storage_backend_iscsi.h" =20 diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index b356fbed70..86a7c1f9e3 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -24,7 +24,6 @@ #include "internal.h" #include "datatypes.h" #include "viralloc.h" -#include "virstring.h" #include "esx_stream.h" =20 #define VIR_FROM_THIS VIR_FROM_ESX diff --git a/src/esx/esx_stream.h b/src/esx/esx_stream.h index 29ca014c67..41f1bee7cd 100644 --- a/src/esx/esx_stream.h +++ b/src/esx/esx_stream.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "esx_private.h" =20 int esxStreamOpenUpload(virStreamPtr stream, esxPrivate *priv, const char = *url); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index c73a6728f7..89d5517262 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -24,15 +24,12 @@ #include =20 #include "internal.h" -#include "datatypes.h" -#include "viralloc.h" #include "virlog.h" #include "viruuid.h" #include "vmx.h" #include "esx_private.h" #include "esx_util.h" #include "virstring.h" -#include "virsocket.h" =20 #define VIR_FROM_THIS VIR_FROM_ESX =20 diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4c0e712919..632ddcb487 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -26,8 +26,6 @@ #include #include =20 -#include "internal.h" -#include "virerror.h" #include "datatypes.h" #include "esx_vi_types.h" #include "esx_util.h" diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 87046b6225..5aab2df377 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -23,8 +23,6 @@ #include =20 #include "virbuffer.h" -#include "viralloc.h" -#include "viruuid.h" #include "esx_vi_methods.h" #include "esx_util.h" =20 diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 132c5ac2fd..15f8f957e2 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -26,7 +26,6 @@ #include =20 #include "virbuffer.h" -#include "datatypes.h" #include "viralloc.h" #include "virlog.h" #include "esx_vi.h" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277405374582.2401657634018; Wed, 11 May 2022 06:56:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-368-BDobtccMNJ6A2odeSnzaTw-1; Wed, 11 May 2022 09:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D426D108C1DF; Wed, 11 May 2022 13:56:39 +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 BF2937AE3; Wed, 11 May 2022 13:56:39 +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 9D4991947B84; Wed, 11 May 2022 13:56:39 +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 4122B194707B for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 32954400E400; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C478400E118 for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 140A89221C9 for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-29-gyn1ZMLkPRCXFWEn5gyTfQ-1; Wed, 11 May 2022 09:56:33 -0400 Received: by mail-pj1-f51.google.com with SMTP id o69so2303527pjo.3 for ; Wed, 11 May 2022 06:56:30 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:29 -0700 (PDT) X-MC-Unique: BDobtccMNJ6A2odeSnzaTw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: gyn1ZMLkPRCXFWEn5gyTfQ-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=3B/E4e+pBHakYCd4gY6xngyUgIfANijsgs3fxFaLd+A=; b=WdzHTLTBCXzJzJfOVBL7U+QfMYUIGOZOmXkBRp3FUtwHyuMCIJEPM/HqxpRmjQfKRB 05DsjAEQOvsm+9LPGDfkiH9/6xJ43sayaexi/Mfi59yYvrIhvWBbXF+4LJkmfVGzGumY ZtNkQNQ/1xz59bqmN/88j+uhTfmPTyyuyQUDdYKaceUQOCXksaGGw8EUkMpOlzfTEMvx et+EuUbzBQRj3vvSrh9tP787QbJQ6892QJZTWQSJF5zyOiVAcDDFuh3mfSrcfUZicnG1 sZ6cL5l90NI9h5+F/Jsy687JCHQTBctCBuv2CGLbQQJ8rj8CyhHF/HRtQm6duLbEJlBs owXA== X-Gm-Message-State: AOAM531oHddtJwNXwYU9j55C3OI30J5qW+oW++uecAHfx8uSdDtz44b2 qyIieKNJN10JQIzJQ2K3y8XvsHcQGiV5oepS X-Google-Smtp-Source: ABdhPJzYgAXVoSoAtD6MUBWzllADZt2EyjLRAQ/kWXCNsUvKLR9Hhva9vSKVOIzo325u+20a0eaKMA== X-Received: by 2002:a17:902:c40f:b0:15e:bc6b:6980 with SMTP id k15-20020a170902c40f00b0015ebc6b6980mr25460356plk.145.1652277389921; Wed, 11 May 2022 06:56:29 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 07/29] hyperv: Remove unused includes Date: Wed, 11 May 2022 21:55:08 +0800 Message-Id: <20220511135530.951850-8-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.79 on 10.11.54.5 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: 1652277406895100005 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/hyperv/hyperv_private.h | 3 --- src/hyperv/hyperv_util.c | 3 --- src/hyperv/hyperv_util.h | 1 - 3 files changed, 7 deletions(-) diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h index da37a8fd20..3d0606bac3 100644 --- a/src/hyperv/hyperv_private.h +++ b/src/hyperv/hyperv_private.h @@ -22,12 +22,9 @@ =20 #pragma once =20 -#include "internal.h" -#include "virerror.h" #include "hyperv_util.h" #include "hyperv_wsman.h" #include "capabilities.h" -#include "domain_conf.h" =20 typedef struct _hypervPrivate hypervPrivate; struct _hypervPrivate { diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index ede786be25..fe71e47285 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -22,13 +22,10 @@ #include =20 #include "internal.h" -#include "datatypes.h" #include "viralloc.h" #include "virlog.h" -#include "viruuid.h" #include "hyperv_private.h" #include "hyperv_util.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_HYPERV =20 diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index 3c3cf56c13..93c45a639b 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "viruri.h" =20 typedef struct _hypervParsedUri hypervParsedUri; --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277407861960.5157533989321; Wed, 11 May 2022 06:56:47 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-qqe6l_BZMb-ZEnbrK4EF5g-1; Wed, 11 May 2022 09:56:44 -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 ABD858015BA; Wed, 11 May 2022 13:56:41 +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 96E4F4411D5; Wed, 11 May 2022 13:56:41 +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 0849D1932206; Wed, 11 May 2022 13:56:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6E1D21932206 for ; Wed, 11 May 2022 13:56:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4F81D40CF8F2; Wed, 11 May 2022 13:56:40 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A31540CF8F0 for ; Wed, 11 May 2022 13:56:40 +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 2E9361815D02 for ; Wed, 11 May 2022 13:56:40 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-441-Jq-M9ybZMFCb-QkLvvo5dQ-1; Wed, 11 May 2022 09:56:37 -0400 Received: by mail-pj1-f52.google.com with SMTP id iq2-20020a17090afb4200b001d93cf33ae9so5005332pjb.5 for ; Wed, 11 May 2022 06:56:34 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:32 -0700 (PDT) X-MC-Unique: qqe6l_BZMb-ZEnbrK4EF5g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: Jq-M9ybZMFCb-QkLvvo5dQ-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=0Ebusm5Cd98IsEUNp+uwiwowNCqixcjAk/5eQXgS4s4=; b=OXwwIfNYPLrI3xnqNb3PtyMbuaUJyluaK5N+vrpH931iW63ekBFn3YBKWUaIyEw/+J xO6MykGgCRhP/sHyX7xqrSu0DN5qV8eYvukkMgiyO9PfiJXgieT5XH4zMt7ag5Ri4pzE OWXkYmTj0MR8uq8S835pj6Pg+S4mYZUelHF57TGPdr8c9s9WvV55vpOM7+qBo4sZ+t1H xS6Puecf7lrwa2KLHJL4IxVEAfBw8xlcIjFRFtEYvaD6KGWdu8dL8EzseNjWnW6va8Vy zFEyFcc8HM5ijOc6l0hDBfkmtUScvMjKzjJN+V+/L0H/2BETxn+8BU/QN1O+MIQLV/f9 UbLA== X-Gm-Message-State: AOAM533uE7PRM3cmmPWlYtKepjNWWsQ/0x8zcyGlZVc95bsUn0nF/I2i LpiMTOPwFj2qVz+pncy7AuEjj9L3789//j0d X-Google-Smtp-Source: ABdhPJxRVkSvZnS23sgPmwGu+UMFBi41/Mh9gU8GiuaB2eFKMD5RWbuh8OGo4ih7itwM1JxKkMD7aA== X-Received: by 2002:a17:902:e2d3:b0:15f:249c:2002 with SMTP id l19-20020a170902e2d300b0015f249c2002mr8390872plc.159.1652277393003; Wed, 11 May 2022 06:56:33 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 08/29] interface: Remove unused includes Date: Wed, 11 May 2022 21:55:09 +0800 Message-Id: <20220511135530.951850-9-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.1 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: 1652277408915100015 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/interface/interface_backend_netcf.c | 2 -- src/interface/interface_backend_udev.c | 1 - 2 files changed, 3 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index d625964421..90514692e2 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -29,9 +29,7 @@ #include "interface_conf.h" #include "viralloc.h" #include "virlog.h" -#include "virfile.h" #include "virpidfile.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "virinterfaceobj.h" #include "virutil.h" diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 8c417714e5..32318d8d50 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -26,7 +26,6 @@ #include "virerror.h" #include "virfile.h" #include "datatypes.h" -#include "domain_conf.h" #include "interface_driver.h" #include "interface_conf.h" #include "viralloc.h" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277412912725.6039143567159; Wed, 11 May 2022 06:56:52 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-510-2Gy2QI_IO4eD0ohWnJYMFw-1; Wed, 11 May 2022 09:56:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF1E0811E90; Wed, 11 May 2022 13:56:40 +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 99F607AD5; Wed, 11 May 2022 13:56:40 +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 08F67194975B; Wed, 11 May 2022 13:56:40 +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 916A0194707B for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 76D22400E118; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 725AD400E436 for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 5B9A69221C7 for ; Wed, 11 May 2022 13:56:38 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-171-542rKFZJNeyFlpSor9K1gw-1; Wed, 11 May 2022 09:56:36 -0400 Received: by mail-pf1-f178.google.com with SMTP id a11so2081164pff.1 for ; Wed, 11 May 2022 06:56:36 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:35 -0700 (PDT) X-MC-Unique: 2Gy2QI_IO4eD0ohWnJYMFw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 542rKFZJNeyFlpSor9K1gw-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=RaNndHGQn9uHLID46opVkHQLWbcsyolbDA5ebYHnQCg=; b=gmxPOwid2oLA5/EWgVzXnKItgf/DY3yLx5i42SGcW4AujFDks8LfIDYmITQss+7Fxp TNamxuHEPNIrrcdpPbGQVHEU8bFTeqX9oLsNX8JLXVwqyG7x63j2x8zC2lTlerJaxm0T aY9YV+zFGcxeWdjqsv8bDPJv+I4HexzLD8FWVzcIl0Q75mVrmOBwNiRFWdkMrVHBbBbD jJbHQ71BbpHySJ71dpm9rdqUV9D4Nh6dJp3v5rSZ/caXNp7lmpmYOaB6J6I2nyWBatPS Em6NtEix6KHz3CWQFr5LHyApAvxYV5qC18VNvqXIX9L6BTkeVzuqXvYi4C1QLDjs+Qw8 jbrg== X-Gm-Message-State: AOAM532XgWzn+B7b5nebu/bwwy03ki1dXYGJtnk043YZt1jSipAMCjiN WeGfUXG1K81v6arPqYiOIyVzF7ZaHEQw+vF8 X-Google-Smtp-Source: ABdhPJwQ1m4lPELXUnS40lU3f0sPuR1TNF56LL1CLwj24jOJ3TsZwtEVtSrbjJx2jaFjvv5jCSqWNg== X-Received: by 2002:a05:6a00:140f:b0:4e0:6995:9c48 with SMTP id l15-20020a056a00140f00b004e069959c48mr25304560pfu.59.1652277395388; Wed, 11 May 2022 06:56:35 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 09/29] libxl: Remove unused includes Date: Wed, 11 May 2022 21:55:10 +0800 Message-Id: <20220511135530.951850-10-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.79 on 10.11.54.5 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: 1652277414988100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/libxl/libxl_capabilities.c | 1 - src/libxl/libxl_capabilities.h | 2 -- src/libxl/libxl_conf.c | 3 --- src/libxl/libxl_conf.h | 3 --- src/libxl/libxl_domain.c | 1 - src/libxl/libxl_domain.h | 2 -- src/libxl/libxl_driver.c | 3 --- src/libxl/libxl_logger.c | 2 -- src/libxl/libxl_migration.c | 3 --- src/libxl/xen_common.h | 1 - src/libxl/xen_xl.c | 1 - src/libxl/xen_xl.h | 1 - src/libxl/xen_xm.c | 1 - src/libxl/xen_xm.h | 1 - 14 files changed, 25 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 6c7dfcb15e..c2975d637e 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "domain_conf.h" #include "capabilities.h" #include "domain_capabilities.h" diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index fd2b72620b..6611786dd5 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -22,8 +22,6 @@ =20 #include =20 -#include "virobject.h" -#include "capabilities.h" #include "domain_capabilities.h" #include "virfirmware.h" =20 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e5fe209718..26f69543f3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -28,20 +28,17 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "datatypes.h" #include "virconf.h" #include "virfile.h" #include "viridentity.h" #include "virstring.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virsocketaddr.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_conf.h" #include "libxl_utils.h" -#include "virstoragefile.h" #include "virsecret.h" #include "cpu/cpu.h" #include "xen_common.h" diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 16a7195bfd..cf160f11b7 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -23,15 +23,12 @@ =20 #include =20 -#include "internal.h" #include "libvirt_internal.h" #include "virdomainobjlist.h" #include "domain_event.h" -#include "capabilities.h" #include "configmake.h" #include "virportallocator.h" #include "virobject.h" -#include "virchrdev.h" #include "virhostdev.h" #include "locking/lock_manager.h" #include "virfirmware.h" diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index dbe44f4ffc..41775be0e8 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -32,7 +32,6 @@ #include "virerror.h" #include "virhook.h" #include "virlog.h" -#include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" #include "xen_common.h" diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa15e0352f..5ce4d518a9 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -22,10 +22,8 @@ =20 #include =20 -#include "domain_conf.h" #include "libxl_conf.h" #include "virchrdev.h" -#include "virenum.h" #include "domain_job.h" =20 =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9ffa20161d..aee3056636 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -36,7 +36,6 @@ #include "viralloc.h" #include "viruuid.h" #include "virhook.h" -#include "vircommand.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_driver.h" @@ -47,8 +46,6 @@ #include "xen_xl.h" #include "virtypedparam.h" #include "viruri.h" -#include "virstring.h" -#include "virsysinfo.h" #include "viraccessapicheck.h" #include "virhostdev.h" #include "virpidfile.h" diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 45cdc32f38..69565823a0 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -24,10 +24,8 @@ #include "internal.h" #include "libxl_logger.h" #include "util/viralloc.h" -#include "util/virerror.h" #include "util/virfile.h" #include "util/virhash.h" -#include "util/virstring.h" #include "util/virthread.h" #include "util/virtime.h" =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 5bb8747890..0fd2b3206e 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -23,12 +23,10 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "virconf.h" #include "datatypes.h" #include "virfile.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virstring.h" #include "virobject.h" #include "virthread.h" @@ -36,7 +34,6 @@ #include "rpc/virnetsocket.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" -#include "libxl_driver.h" #include "libxl_conf.h" #include "libxl_migration.h" #include "locking/domain_lock.h" diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index b21046e959..7436a7643c 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virconf.h" #include "domain_conf.h" =20 diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6b7f638783..3b5825eaa3 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -29,7 +29,6 @@ #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" -#include "storage_source.h" #include "storage_source_backingstore.h" #include "xen_xl.h" #include "libxl_capabilities.h" diff --git a/src/libxl/xen_xl.h b/src/libxl/xen_xl.h index c997562956..f8b1ebfde9 100644 --- a/src/libxl/xen_xl.h +++ b/src/libxl/xen_xl.h @@ -23,7 +23,6 @@ #pragma once =20 #include "virconf.h" -#include "domain_conf.h" #include "xen_common.h" =20 virDomainDef *xenParseXL(virConf *conn, diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index a962da9cad..d6213a852d 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -29,7 +29,6 @@ #include "xenxs_private.h" #include "xen_xm.h" #include "domain_conf.h" -#include "virstring.h" #include "xen_common.h" =20 #define VIR_FROM_THIS VIR_FROM_XENXM diff --git a/src/libxl/xen_xm.h b/src/libxl/xen_xm.h index afb4f51ff7..25d3d2bfbd 100644 --- a/src/libxl/xen_xm.h +++ b/src/libxl/xen_xm.h @@ -22,7 +22,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virconf.h" #include "domain_conf.h" =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277417654629.6337017799751; Wed, 11 May 2022 06:56:57 -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-369-HMs9IwMCOlukr-EPBXOE4A-1; Wed, 11 May 2022 09:56:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39FFF2919EA8; Wed, 11 May 2022 13:56:49 +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 1D293111F3C7; Wed, 11 May 2022 13:56:49 +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 095EF1932201; Wed, 11 May 2022 13:56:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 32EDB194975B for ; Wed, 11 May 2022 13:56:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1FDD3463DF1; Wed, 11 May 2022 13:56:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2F7463DF0 for ; Wed, 11 May 2022 13:56:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 E6ED618A0166 for ; Wed, 11 May 2022 13:56:41 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-416-jJEVbRzSNn23Pd_025SRBg-1; Wed, 11 May 2022 09:56:39 -0400 Received: by mail-pg1-f175.google.com with SMTP id r71so1531961pgr.0 for ; Wed, 11 May 2022 06:56:38 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:37 -0700 (PDT) X-MC-Unique: HMs9IwMCOlukr-EPBXOE4A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: jJEVbRzSNn23Pd_025SRBg-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=iHYTDHq+Ptom2hcaIOF/U9uUaQ8PymsgjRIvJWXZlSk=; b=A4FhOf/msQ4xrwim4dE7EZSOBzc52Qwa1CoFt6w1ymUzQnH5wI1vyGg8ARLuVpG+8r T2RLQ4fhk4IcndUBPO/NJ1emK/6Aeh6t9M2tsRuN9rNskqt2lCAV9+AbvTCOaqYqIw5T J/uLzeROVGx+3v16RK1NoHjcAJCmSXYchvTfRDSfsWSEL+oOygIFh8en3vj5778IF+GY GV8KT6n81teKj/hpG1zok/1/SPLjAhWAD4spHvN62+z2ifWHvQ39KvHk8Lnvo5XqH9wW co+pPBo9JUd1MIxQ+dQDMVSw5+Arg+33q7mq2jg/50xUMx7mNhwmQKUjM8Q6i0gis8zr 2zGg== X-Gm-Message-State: AOAM531aLJuOy2ZDHg+C4vqcAdqZ66UzrxGQTNorofXXT3u8XvXYkRcb FyHLufKANjrvMK+yWAJ4uvBowqaQtQt2RoOr X-Google-Smtp-Source: ABdhPJxGD7uzAoj57msrNprb7cPxwQ9xISrnJLyK3NaJPa1tacrVom5Yt9TLB30DEgF26204yMDCvw== X-Received: by 2002:a05:6a00:158c:b0:50f:83c5:c147 with SMTP id u12-20020a056a00158c00b0050f83c5c147mr24902311pfk.44.1652277397772; Wed, 11 May 2022 06:56:37 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 10/29] locking: Remove unused includes Date: Wed, 11 May 2022 21:55:11 +0800 Message-Id: <20220511135530.951850-11-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.85 on 10.11.54.10 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.78 on 10.11.54.3 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: 1652277418978100002 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/locking/domain_lock.c | 3 --- src/locking/domain_lock.h | 2 -- src/locking/lock_daemon.c | 2 -- src/locking/lock_daemon_config.c | 4 ---- src/locking/lock_daemon_dispatch.c | 1 - src/locking/lock_driver.h | 1 - src/locking/lock_driver_lockd.c | 1 - src/locking/lock_driver_nop.c | 2 -- src/locking/lock_manager.c | 1 - src/locking/lock_manager.h | 1 - src/locking/sanlock_helper.c | 2 -- 11 files changed, 20 deletions(-) diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index 9934e91aa9..582329081c 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -22,9 +22,6 @@ #include =20 #include "domain_lock.h" -#include "viralloc.h" -#include "viruuid.h" -#include "virerror.h" #include "virlog.h" =20 #define VIR_FROM_THIS VIR_FROM_LOCKING diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index 34a2a5fcb3..95fcd6e820 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" -#include "domain_conf.h" #include "lock_manager.h" =20 int virDomainLockProcessStart(virLockManagerPlugin *plugin, diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 75f6c708db..a83ea33b4f 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -37,10 +37,8 @@ #include "virerror.h" #include "virlog.h" #include "viralloc.h" -#include "virconf.h" #include "rpc/virnetdaemon.h" #include "rpc/virnetserver.h" -#include "virrandom.h" #include "virhash.h" #include "viruuid.h" #include "virstring.h" diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index 6106ae02b3..430f6bb9a5 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -23,12 +23,8 @@ =20 #include "lock_daemon_config.h" #include "virconf.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "rpc/virnetdaemon.h" #include "configmake.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_d= ispatch.c index 13e688f2e2..e65a2b340f 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -23,7 +23,6 @@ #include "rpc/virnetdaemon.h" #include "rpc/virnetserverclient.h" #include "virlog.h" -#include "virstring.h" #include "lock_daemon.h" #include "lock_protocol.h" #include "virerror.h" diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index 087a918882..50b57bc619 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" =20 typedef struct _virLockManager virLockManager; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 7e9081e9eb..e902b01463 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -34,7 +34,6 @@ #include "lock_protocol.h" #include "configmake.h" #include "virstoragefile.h" -#include "virstring.h" #include "virutil.h" =20 #include "lock_driver_lockd.h" diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 13934bbc37..ff7e5a0a21 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -22,9 +22,7 @@ #include =20 #include "lock_driver_nop.h" -#include "viralloc.h" #include "virlog.h" -#include "viruuid.h" =20 VIR_LOG_INIT("locking.lock_driver_nop"); =20 diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 82205865b2..5ab38785d4 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -28,7 +28,6 @@ #include "virlog.h" #include "viralloc.h" #include "viruuid.h" -#include "virstring.h" =20 #if WITH_DLFCN_H # include diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index 774931f7d6..7cade700d8 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "lock_driver.h" =20 typedef struct _virLockManagerPlugin virLockManagerPlugin; diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index 26f225e639..0a2df9509f 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -1,8 +1,6 @@ #include =20 #include "internal.h" -#include "virconf.h" -#include "viralloc.h" #include "domain_conf.h" #include "virgettext.h" =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277410229604.6860803540751; Wed, 11 May 2022 06:56:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-tvOEQKzNOMiQ5V47NjvzsQ-1; Wed, 11 May 2022 09:56:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B86A0899EC4; Wed, 11 May 2022 13:56:44 +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 A48A61121315; Wed, 11 May 2022 13:56:44 +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 898AF194975B; Wed, 11 May 2022 13:56:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CCA90194707B for ; Wed, 11 May 2022 13:56:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B8B264411C7; Wed, 11 May 2022 13:56:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B40584411C5 for ; Wed, 11 May 2022 13:56:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 9B66718A01B5 for ; Wed, 11 May 2022 13:56:43 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-632-FI2BAqANNk6Fx3fT0vJiuA-1; Wed, 11 May 2022 09:56:42 -0400 Received: by mail-pj1-f48.google.com with SMTP id fv2so2294814pjb.4 for ; Wed, 11 May 2022 06:56:41 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:39 -0700 (PDT) X-MC-Unique: tvOEQKzNOMiQ5V47NjvzsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: FI2BAqANNk6Fx3fT0vJiuA-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=H/aRt/4dFJbuHtPqbg3xZKJeDrWi9ETOZnN28cH8Yt4=; b=BgnkeNYYNnF8uS9dZ30ZMOOM4W3az5Edukue/UEA53pf5ShDVo6mAc6VieBZnI+WEa 8mQhzpt+1iK/8dAXzCdAlfO7g1RNOLJPPmAOmwsRsybkyW9ltwKnt89q0Qx9dGmeO7Mv lNHjGOtIaRkozhQT3cnEvQD55aOsH1SXCS8y7SdyGOb6b5hOzZdYhgehaODN7dSZXpaz jDH2hPjEdDAngh7+C9KEdTy3MpkoMbtc3ca/0+b9aopXj/JS0+gymLY4Nl51UYoRFV4T C869nwgybD09K5YA+OJfMZU+fnPkfvWPxXOSm1Yl9R1mVuoA0rZOwagBt8VkBkF75o8P u3pg== X-Gm-Message-State: AOAM530f/vs+ph3rBQdPxeFmGsz93XNJCInnH8WrxUiN8QS+ItQgcAcd mRK340DhmhDfVSR03Omu/Ot0whEWn3Wm9GVl X-Google-Smtp-Source: ABdhPJzlDXh3QoIK342WTHLxhbq/qyQqoYw1FpbjblfMYJEYJpLtM+Sew5nIBx8eDtaUpzuItS2UlA== X-Received: by 2002:a17:902:7402:b0:15e:d84c:260a with SMTP id g2-20020a170902740200b0015ed84c260amr25678700pll.80.1652277400205; Wed, 11 May 2022 06:56:40 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 11/29] logging: Remove unused includes Date: Wed, 11 May 2022 21:55:12 +0800 Message-Id: <20220511135530.951850-12-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.85 on 10.11.54.9 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.78 on 10.11.54.3 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: 1652277410914100019 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/logging/log_daemon.c | 5 ----- src/logging/log_daemon_config.c | 4 ---- src/logging/log_daemon_dispatch.c | 1 - src/logging/log_handler.c | 1 - src/logging/log_handler.h | 1 - src/logging/log_manager.c | 1 - 6 files changed, 13 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8ab334ff6d..91ed119c7f 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -33,15 +33,10 @@ #include "virutil.h" #include "virfile.h" #include "virpidfile.h" -#include "virprocess.h" #include "virerror.h" #include "virlog.h" #include "viralloc.h" -#include "virconf.h" #include "rpc/virnetdaemon.h" -#include "virrandom.h" -#include "virhash.h" -#include "viruuid.h" #include "virstring.h" #include "virgettext.h" #include "virdaemon.h" diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_confi= g.c index 84a2946395..4436745488 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -23,12 +23,8 @@ =20 #include "log_daemon_config.h" #include "virconf.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "rpc/virnetserver.h" #include "configmake.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dis= patch.c index 7a0a310576..f7448155fc 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -23,7 +23,6 @@ #include "rpc/virnetserver.h" #include "rpc/virnetserverclient.h" #include "virlog.h" -#include "virstring.h" #include "log_daemon.h" #include "log_protocol.h" #include "virerror.h" diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 5c3df37415..bf1e3f35c5 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -25,7 +25,6 @@ #include "virobject.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "virlog.h" #include "virrotatingfile.h" #include "viruuid.h" diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 099378b361..cdd5352a35 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virjson.h" =20 typedef struct _virLogHandler virLogHandler; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index e605ed9930..6e8e7e9f1a 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -24,7 +24,6 @@ #include "log_protocol.h" #include "viralloc.h" #include "virutil.h" -#include "virstring.h" #include "virerror.h" #include "virfile.h" =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277415611900.9946682360999; Wed, 11 May 2022 06:56:55 -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-244-9QaAaH-HOHKwotabHY0ATw-1; Wed, 11 May 2022 09:56:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB918398CA7C; Wed, 11 May 2022 13:56:49 +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 D4CC7400E86A; Wed, 11 May 2022 13:56:49 +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 A3B5E1937429; Wed, 11 May 2022 13:56:49 +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 E0F831947B84 for ; Wed, 11 May 2022 13:56:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D3BC2400E118; Wed, 11 May 2022 13:56:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CFC2D400E436 for ; Wed, 11 May 2022 13:56:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 B9831804181 for ; Wed, 11 May 2022 13:56:47 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-466-ktyhZbaFPFGUJqnMOYyfsQ-1; Wed, 11 May 2022 09:56:45 -0400 Received: by mail-pg1-f180.google.com with SMTP id 7so1846830pga.12 for ; Wed, 11 May 2022 06:56:44 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:43 -0700 (PDT) X-MC-Unique: 9QaAaH-HOHKwotabHY0ATw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ktyhZbaFPFGUJqnMOYyfsQ-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=HIosSlIAQGTls4ok4ZhfgSb++UkvE/db2kF0KzcetfI=; b=seSznfj3ItnrC2upcpPe1slAe/X2t0ljK08PIGS0XHaD09FYu4pP6xORgaFeeHN5MY MLRPgKZzZ4hn0rbwTY1pFYeKicscy5C3XfvQJwqX4nE5okIVWqr/EhQRJ9SkHlJqyiiv YAvp0JSWilTSLIhTP7khR0zsfvGHcKIAnpAqsXmi+nHdTIi/qm2Q2ZB5GDE8l0AZto62 wzSdQx6NE/n+4TuthWuNT5EmI0ZJwX/VjcMFtprSQG+37heUnGGPMgDzAAYRhvpHK6aP STHYu/CsIVLiygvmpYHoBHixVBK8MYtcXZfgeXuc2RVVD6j1skA1+4jXfPi3Dw9w6TPD NGhw== X-Gm-Message-State: AOAM5333JAp+8IqQD+SbnFWLdJ/bu4nYSimNdiIc67c5WsnDOKZQR7BV YCzdgSrDpLzvpjGMKbry3NTQiYX32VWth7U+ X-Google-Smtp-Source: ABdhPJwfwW1QSAt+N9hDaNhrWkJG8hhi6s/AKjbqcRMa+u+XWGRVDltrP33WEAP1Fam6WwU3bEaxZg== X-Received: by 2002:a65:55c8:0:b0:3c6:6833:5730 with SMTP id k8-20020a6555c8000000b003c668335730mr18109142pgs.325.1652277403653; Wed, 11 May 2022 06:56:43 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 12/29] network: Remove unused includes Date: Wed, 11 May 2022 21:55:13 +0800 Message-Id: <20220511135530.951850-13-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.84 on 10.11.54.1 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: 1652277418966100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/network/bridge_driver.c | 5 ----- src/network/bridge_driver.h | 3 --- src/network/bridge_driver_linux.c | 1 - src/network/bridge_driver_platform.h | 1 - src/network/leaseshelper.c | 4 ---- 5 files changed, 14 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ca1e0ca50f..272d1fb21a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -40,28 +40,23 @@ #include "datatypes.h" #include "bridge_driver.h" #include "bridge_driver_platform.h" -#include "device_conf.h" #include "driver.h" #include "virbuffer.h" #include "virpidfile.h" #include "vircommand.h" #include "viralloc.h" #include "viruuid.h" -#include "viriptables.h" #include "virlog.h" #include "virdnsmasq.h" #include "configmake.h" -#include "virnetlink.h" #include "virnetdev.h" #include "virnetdevip.h" #include "virnetdevbridge.h" -#include "virnetdevopenvswitch.h" #include "virnetdevtap.h" #include "virnetdevvportprofile.h" #include "virpci.h" #include "virgdbus.h" #include "virfile.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "network_event.h" #include "virhook.h" diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 9475345669..0049ad42fb 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -21,9 +21,6 @@ =20 #pragma once =20 -#include "internal.h" -#include "domain_conf.h" -#include "vircommand.h" #include "virdnsmasq.h" #include "virnetworkobj.h" =20 diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 98d2a33a1d..a0f593b066 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -21,7 +21,6 @@ =20 #include =20 -#include "viralloc.h" #include "virfile.h" #include "viriptables.h" #include "virstring.h" diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driv= er_platform.h index de7cbc1195..0ab09829b8 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virthread.h" #include "virdnsmasq.h" #include "virnetworkobj.h" diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index ca2c640672..807bbcc5f3 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -24,18 +24,14 @@ #include =20 =20 -#include "virthread.h" #include "virfile.h" #include "virpidfile.h" -#include "virstring.h" #include "virerror.h" -#include "viralloc.h" #include "virjson.h" #include "virlease.h" #include "virenum.h" #include "configmake.h" #include "virgettext.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 165227742811516.816250465113512; Wed, 11 May 2022 06:57:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-28-Q7pGen9-Oai9tKkD_-J6zQ-1; Wed, 11 May 2022 09:57:00 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D26A9221C0; Wed, 11 May 2022 13:56:58 +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 7630E7AE2; Wed, 11 May 2022 13:56:58 +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 1BEC8193F6F6; Wed, 11 May 2022 13:56:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3353C194975B for ; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 092FC2026987; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 04E9E2026E03 for ; Wed, 11 May 2022 13:56:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 8ED5D100BAB3 for ; Wed, 11 May 2022 13:56:50 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-krCqn-VaP2O_TgG5PUUB8A-1; Wed, 11 May 2022 09:56:47 -0400 Received: by mail-pg1-f179.google.com with SMTP id q76so1850703pgq.10 for ; Wed, 11 May 2022 06:56:47 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:46 -0700 (PDT) X-MC-Unique: Q7pGen9-Oai9tKkD_-J6zQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: krCqn-VaP2O_TgG5PUUB8A-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=tnfh3RGZQj0cV4/keSOy1CkNJMTxAAK9Drl4MdBpb+8=; b=4mQ/BuHQ2FgfqlwgWqqHrtA+DxZG3w6WvVOfHoBWaT261clzSbIm8Rjx5NLfBdggTQ ydlzu2Fu7U8YEqRXtrHzbWBxhBg64Mp5ZbUHQPzo8jSpQEdAt3jEdlOp6y5WqwImV8Oz nlJqNAc6lWjnxSx+1oQyifYdYzn7QaU2GnL57yVWHlNkyvPa1UIzGB7UOvS4IiCo+ccx 4dnAaBftPLtz1vXqoebWdGQL0mKbeau8dvpnYHwmc6FCISKh2y8NXJ1lN0WcN9y3in4J LWTgjV65p4+LLlwKeCrtHXAesduJM8GyHsHLQHNF71cu0ta3N5ydudM8Pil4T0BPnBC5 L5Ag== X-Gm-Message-State: AOAM533dO6vvvYTasx4dA5Bzl7KOnCo7kXpnlGuQJNYsNZ6hyyuKb9i3 Zo4lSlU9IbNCYBEsSDKkgLBIu/eEfJROTTG1 X-Google-Smtp-Source: ABdhPJyz65tsyy3C7AzOe2fvx1PZUdHGbb9dRoQQhxxiCuW7TLTOLFjWdwqSiugJsaSdJqc9vPkdDQ== X-Received: by 2002:aa7:970f:0:b0:50d:301e:e6ce with SMTP id a15-20020aa7970f000000b0050d301ee6cemr25407449pfg.61.1652277406483; Wed, 11 May 2022 06:56:46 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 13/29] node_device: Remove unused includes Date: Wed, 11 May 2022 21:55:14 +0800 Message-Id: <20220511135530.951850-14-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.78 on 10.11.54.4 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.79 on 10.11.54.5 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: 1652277429067100002 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/node_device/node_device_driver.c | 3 --- src/node_device/node_device_driver.h | 1 - src/node_device/node_device_udev.c | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 1eb452b989..8069f49cac 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -32,14 +32,11 @@ #include "viralloc.h" #include "virfile.h" #include "virjson.h" -#include "virstring.h" #include "node_device_conf.h" #include "node_device_event.h" #include "node_device_driver.h" -#include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" -#include "virnetdev.h" #include "virutil.h" #include "vircommand.h" #include "virlog.h" diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_de= vice_driver.h index 7311b603ac..e64145afeb 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "driver.h" #include "virnodedeviceobj.h" #include "vircommand.h" diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index b68dc12158..61c0986cf0 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -30,11 +30,9 @@ #include "node_device_udev.h" #include "virerror.h" #include "driver.h" -#include "datatypes.h" #include "virlog.h" #include "viralloc.h" #include "viruuid.h" -#include "virbuffer.h" #include "virfile.h" #include "virpci.h" #include "virpidfile.h" @@ -42,7 +40,6 @@ #include "virnetdev.h" #include "virmdev.h" #include "virutil.h" -#include "virpcivpd.h" =20 #include "configmake.h" =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277419228932.6645075310197; Wed, 11 May 2022 06:56:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-30x0aA8wNrinGvReFEpeEg-1; Wed, 11 May 2022 09:56:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDA089221C0; Wed, 11 May 2022 13:56:53 +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 D6B6B7AD5; Wed, 11 May 2022 13:56:53 +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 8F8D8193F6F3; Wed, 11 May 2022 13:56:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7DE63193F6F6 for ; Wed, 11 May 2022 13:56:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 52A9F14C303E; Wed, 11 May 2022 13:56:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4EF5B14C3B37 for ; Wed, 11 May 2022 13:56:52 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 36EB9811E84 for ; Wed, 11 May 2022 13:56:52 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-4d-RQFNgNNWaq4etgAzXdg-1; Wed, 11 May 2022 09:56:50 -0400 Received: by mail-pf1-f178.google.com with SMTP id x23so2049843pff.9 for ; Wed, 11 May 2022 06:56:50 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:48 -0700 (PDT) X-MC-Unique: 30x0aA8wNrinGvReFEpeEg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 4d-RQFNgNNWaq4etgAzXdg-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=fybzWV4gqCFAnCnn2ywGARCIMN1bTB4J0aC0f0DB6ss=; b=IsOAm/6KY/x/fP4gj+WHYVjGwjra6umsDoDkfMnWQcGkorVWCEqsKb5BxHcXaPK5R1 cxvebSl5/M2QorBeL+sEvZXTiQKAJkdkgl+4ellpwqo0/TSfaTLaicHJO/hza+eMgKzs hcqGGXdOpJ1YQUBJgLFbjiicz4vvWMqgtm8BbUCR3BpNliwty33ec5EjStgiSfDdfMzE ZVpu66dIJhoM5RgqCKBqCGNAWsW5JQHAHPydQIrZtWGQt2kmr2NkcQfVs0IzcyDI+BH6 O3nZG+WyAORm9cQb+XHmvHFLRVIeKPhOaBY3HIQHWnLJ32fxu1bCJq2ef4K9/ZV2LVDh n0dg== X-Gm-Message-State: AOAM531t2jjtnjFom0tRda65LfUcO38m5aRpa/MS9H8FGbVJ2j4bvUcb KXQan5H5iOzXKvHr52CRXIHzsIwLbURwo5LG X-Google-Smtp-Source: ABdhPJw5fIaSvq19SGIqgZ69AGy4CYejqYPo/yyhBwSL0NfAx7fjzekMY1D6vmtVP4HJlWxsuIrzJA== X-Received: by 2002:a05:6a00:1d8f:b0:510:9430:8021 with SMTP id z15-20020a056a001d8f00b0051094308021mr19267933pfw.55.1652277409130; Wed, 11 May 2022 06:56:49 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 14/29] nwfilter: Remove unused includes Date: Wed, 11 May 2022 21:55:15 +0800 Message-Id: <20220511135530.951850-15-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.85 on 10.11.54.7 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.79 on 10.11.54.5 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: 1652277420997100005 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/nwfilter/nwfilter_dhcpsnoop.c | 3 --- src/nwfilter/nwfilter_driver.c | 5 ----- src/nwfilter/nwfilter_driver.h | 3 --- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ---- src/nwfilter/nwfilter_gentech_driver.c | 4 ---- src/nwfilter/nwfilter_gentech_driver.h | 1 - src/nwfilter/nwfilter_learnipaddr.c | 5 ----- src/nwfilter/nwfilter_learnipaddr.h | 1 - 8 files changed, 26 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index d26e787453..1e6416b68a 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -45,11 +45,8 @@ =20 #include =20 -#include "viralloc.h" #include "virlog.h" -#include "datatypes.h" #include "virerror.h" -#include "conf/domain_conf.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_dhcpsnoop.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index b66ba22737..10ae6efeb2 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -31,15 +31,10 @@ =20 #include "virerror.h" #include "datatypes.h" -#include "viralloc.h" -#include "domain_conf.h" -#include "domain_nwfilter.h" #include "nwfilter_driver.h" #include "nwfilter_gentech_driver.h" #include "configmake.h" -#include "virfile.h" #include "virpidfile.h" -#include "virstring.h" #include "viraccessapicheck.h" =20 #include "nwfilter_ipaddrmap.h" diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index 6c864dd2e3..844a17e069 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -24,7 +24,4 @@ =20 #pragma once =20 -#include "nwfilter_params.h" -#include "nwfilter_conf.h" - int nwfilterRegister(void); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 177fd64049..24c0db5bde 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -33,13 +33,9 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "domain_conf.h" #include "nwfilter_conf.h" -#include "nwfilter_driver.h" -#include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" #include "virfile.h" -#include "vircommand.h" #include "configmake.h" #include "virstring.h" #include "virfirewall.h" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index 7e323afb1a..979b13fa2c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -26,7 +26,6 @@ =20 #include "viralloc.h" #include "virlog.h" -#include "domain_conf.h" #include "virerror.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" @@ -34,9 +33,6 @@ #include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #include "virnetdev.h" -#include "datatypes.h" -#include "virsocketaddr.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NWFILTER =20 diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter= _gentech_driver.h index 969ab76966..946d5d3d56 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -24,7 +24,6 @@ =20 #include "virnwfilterobj.h" #include "virnwfilterbindingdef.h" -#include "nwfilter_tech_driver.h" =20 int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index ec2d337188..0f3042a893 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -37,20 +37,15 @@ #include "internal.h" =20 #include "virbuffer.h" -#include "viralloc.h" #include "virlog.h" -#include "datatypes.h" #include "virnetdev.h" #include "virerror.h" #include "virthread.h" #include "conf/nwfilter_params.h" -#include "conf/domain_conf.h" #include "nwfilter_gentech_driver.h" -#include "nwfilter_ebiptables_driver.h" #include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #include "virstring.h" -#include "virsocket.h" =20 #define VIR_FROM_THIS VIR_FROM_NWFILTER =20 diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_le= arnipaddr.h index 5fe5bac036..c7572340c2 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -23,7 +23,6 @@ =20 #pragma once =20 -#include "conf/nwfilter_params.h" #include "nwfilter_tech_driver.h" #include "virnwfilterbindingdef.h" #include --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277428217903.3585170533913; Wed, 11 May 2022 06:57:08 -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-61-dompS1vVOEeUk48vV0I8sw-1; Wed, 11 May 2022 09:57:01 -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 2F080398CA8C; Wed, 11 May 2022 13:56:59 +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 198CB4411D4; Wed, 11 May 2022 13:56:59 +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 0613C19376A0; Wed, 11 May 2022 13:56:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2CBB6194707B for ; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1EDB91121315; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B0881121314 for ; Wed, 11 May 2022 13:56:56 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 79020803D7C for ; Wed, 11 May 2022 13:56:56 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-119-7HXDYX1UPxG9fRZ396n-Yw-2; Wed, 11 May 2022 09:56:52 -0400 Received: by mail-pl1-f179.google.com with SMTP id d22so1947530plr.9 for ; Wed, 11 May 2022 06:56:52 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:51 -0700 (PDT) X-MC-Unique: dompS1vVOEeUk48vV0I8sw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 7HXDYX1UPxG9fRZ396n-Yw-2 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=uzb+qSVB9D77fxTFsT6/z1Ab/hvMlL7kLZN07dYuUiM=; b=EQo+nQX8XJkGS1mLvbudUCKFd22dSj967ejRBT3X3EcnYodECmuDzdP9DYD0IRAXNE ycw3PL8q2lKKdLopLCKzbAyCkkhYSfNZBul9e0teULw/Vio2++EMMzy5nTkm2SAlsElO snz+0dZb8/lQxbReCQzMOFqMQSJbTmsRzv2+MPbBkMM8edixgFhmDz/ub2DPnY2a/jta f8KAfqTxX1c+qGzCCNCYthm7egVBiSrla4a27zmSVasE367Idf5zsUvOLGzz3sve+k37 oxqSRkkT9V08YxTjwCHeiVOKjleeAyyCrox1Gm5pQp+gqKBwLzGn08cLtGVqShx0bD8E z1SA== X-Gm-Message-State: AOAM530j/9P04sTw1SW3ChQaFFB9+z1lgFwqE3nvJoCgzqrr0PIsmmKl WwZRXZGXd2q2TGSFVXSc65Ye6tA/kk67Elm2 X-Google-Smtp-Source: ABdhPJwW0KdsZH4G0Vjo9Qzc3fcxEwQa3P1f67TYHrDMaLxtvdPNwIOxq9WkrPJLjgo3pNLyERnafQ== X-Received: by 2002:a17:90a:ef12:b0:1d9:44e6:a457 with SMTP id k18-20020a17090aef1200b001d944e6a457mr5545284pjz.163.1652277411580; Wed, 11 May 2022 06:56:51 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 15/29] openvz: Remove unused includes Date: Wed, 11 May 2022 21:55:16 +0800 Message-Id: <20220511135530.951850-16-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.78 on 10.11.54.3 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: 1652277429059100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/openvz/openvz_conf.c | 1 - src/openvz/openvz_conf.h | 1 - src/openvz/openvz_driver.h | 2 -- src/openvz/openvz_util.c | 1 - 4 files changed, 5 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 191c79e1e2..2253796b2c 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -34,7 +34,6 @@ #include "openvz_conf.h" #include "openvz_util.h" #include "viruuid.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "vircommand.h" diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 9c3eff9aaf..558dad0f2d 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -23,7 +23,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virdomainobjlist.h" #include "virthread.h" =20 diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index 1570fd82ac..93edd7ca01 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -22,8 +22,6 @@ =20 #pragma once =20 -#include "internal.h" - #define OPENVZ_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE) =20 diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 9419ce122c..6c64ba0bdc 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -29,7 +29,6 @@ #include "virerror.h" #include "vircommand.h" #include "datatypes.h" -#include "viralloc.h" =20 #include "openvz_conf.h" #include "openvz_util.h" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277432583754.8090679771748; Wed, 11 May 2022 06:57:12 -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-377-99M1vHfiOlK8GUADQcEtSQ-1; Wed, 11 May 2022 09:57:04 -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 B8AF31C01B2B; Wed, 11 May 2022 13:57:00 +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 A18944411D4; Wed, 11 May 2022 13:57:00 +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 8AB121947B84; Wed, 11 May 2022 13:57:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 668841947B84 for ; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4E7251121319; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 495361121314 for ; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 16E29811E81 for ; Wed, 11 May 2022 13:56:57 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-m6DAtr-zOZa-rf8pVfsi4A-2; Wed, 11 May 2022 09:56:55 -0400 Received: by mail-pg1-f179.google.com with SMTP id q76so1850703pgq.10 for ; Wed, 11 May 2022 06:56:55 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:53 -0700 (PDT) X-MC-Unique: 99M1vHfiOlK8GUADQcEtSQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: m6DAtr-zOZa-rf8pVfsi4A-2 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=KgVf08IYFxwz6eHFvKP4n+3vXCairibWHTGmAdfyCCU=; b=Gpa4bpq9qRmNnPX2dhkADghxIPzI7Lnk0+vdv1M4eO7kblI2RhIoaE7M3qwcyOgSym X67FFNgRgdCuD3ADiylLw/FZTfaGxLwT15PmKtmA1lgjTdDyXsUBLq75qYkf+whi0sti W8effWOZfMylY+sB6616hB1KkATf6AYBgL04rmUeN4nij3CgaHa+VR9cGPAcbNAvslRp pUoWVlsVpogu1UEGH76JmZ5TtYjPzCrI6v4UO/GfPgHRrzVzEuCQKNbBIK2v04QRk1qa gFv9sGmT96KCkfQ70ufb5n+edQsFzXI2XZravyeUN+Z5e8ZiZrNWiaY6e2P8h0tQCRof 5d2Q== X-Gm-Message-State: AOAM530z6lKSjt1x2o1ihWFEvw98We9VO37D//tqsX7OZqdFvBR4DyBz DYBW3dduQgiCycWXqPLA9Cvsxylv/oUIYsmj X-Google-Smtp-Source: ABdhPJwELzukxbzmeT68Jq9r9A7naTRoO9XcTSHoXyO5r6qaZgZWegpoqXdjRIkLgFKxHntfbH2BEw== X-Received: by 2002:a05:6a00:16c7:b0:4f7:e497:69c7 with SMTP id l7-20020a056a0016c700b004f7e49769c7mr25135923pfc.7.1652277414185; Wed, 11 May 2022 06:56:54 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 16/29] qemu: Remove unused includes Date: Wed, 11 May 2022 21:55:17 +0800 Message-Id: <20220511135530.951850-17-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.78 on 10.11.54.3 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: 1652277433114100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/qemu/qemu_agent.c | 2 -- src/qemu/qemu_agent.h | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_alias.h | 2 -- src/qemu/qemu_backup.c | 5 ----- src/qemu/qemu_block.c | 1 - src/qemu/qemu_block.h | 1 - src/qemu/qemu_blockjob.c | 2 -- src/qemu/qemu_capabilities.c | 5 ----- src/qemu/qemu_capabilities.h | 2 -- src/qemu/qemu_cgroup.c | 7 ------- src/qemu/qemu_cgroup.h | 2 -- src/qemu/qemu_checkpoint.c | 3 --- src/qemu/qemu_checkpoint.h | 1 - src/qemu/qemu_command.c | 7 ------- src/qemu/qemu_command.h | 4 ---- src/qemu/qemu_conf.c | 5 ----- src/qemu/qemu_conf.h | 8 -------- src/qemu/qemu_dbus.c | 3 --- src/qemu/qemu_domain.c | 6 ------ src/qemu/qemu_domain.h | 3 --- src/qemu/qemu_domain_address.h | 2 -- src/qemu/qemu_driver.c | 8 -------- src/qemu/qemu_extdevice.c | 5 ----- src/qemu/qemu_firmware.c | 1 - src/qemu/qemu_hostdev.c | 5 ----- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 4 ---- src/qemu/qemu_hotplug.h | 1 - src/qemu/qemu_interface.c | 1 - src/qemu/qemu_interface.h | 1 - src/qemu/qemu_interop_config.c | 3 --- src/qemu/qemu_migration.c | 5 ----- src/qemu/qemu_migration_cookie.c | 1 - src/qemu/qemu_migration_cookie.h | 1 - src/qemu/qemu_migration_params.c | 2 -- src/qemu/qemu_migration_params.h | 4 ---- src/qemu/qemu_monitor.c | 2 -- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 4 ---- src/qemu/qemu_monitor_json.h | 1 - src/qemu/qemu_monitor_text.c | 2 -- src/qemu/qemu_monitor_text.h | 2 -- src/qemu/qemu_namespace.c | 1 - src/qemu/qemu_namespace.h | 1 - src/qemu/qemu_process.c | 2 -- src/qemu/qemu_process.h | 1 - src/qemu/qemu_qapi.c | 2 -- src/qemu/qemu_saveimage.c | 2 -- src/qemu/qemu_saveimage.h | 2 -- src/qemu/qemu_security.h | 2 -- src/qemu/qemu_shim.c | 1 - src/qemu/qemu_slirp.c | 3 --- src/qemu/qemu_snapshot.c | 4 ---- src/qemu/qemu_snapshot.h | 1 - src/qemu/qemu_tpm.c | 5 ----- src/qemu/qemu_validate.h | 1 - src/qemu/qemu_vhost_user.c | 1 - src/qemu/qemu_vhost_user.h | 2 -- src/qemu/qemu_vhost_user_gpu.c | 3 --- src/qemu/qemu_vhost_user_gpu.h | 1 - 61 files changed, 164 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4156cb0dca..33911d32b2 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -34,12 +34,10 @@ #include "virerror.h" #include "virjson.h" #include "virfile.h" -#include "virprocess.h" #include "virtime.h" #include "virobject.h" #include "virstring.h" #include "virenum.h" -#include "virsocket.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 862f6b0a95..fc2a4e117c 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "domain_conf.h" =20 typedef struct _qemuAgent qemuAgent; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 8c2f055604..7efd91051e 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -22,7 +22,6 @@ #include =20 #include "qemu_alias.h" -#include "viralloc.h" #include "virlog.h" #include "virstring.h" #include "virutil.h" diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 8fc27f4696..1a583b8207 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "domain_conf.h" - #include "qemu_capabilities.h" #include "qemu_domain.h" #include "qemu_domain_address.h" diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 427c090dd8..d2a5d2db5f 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -23,9 +23,7 @@ #include "qemu_conf.h" #include "qemu_capabilities.h" #include "qemu_monitor.h" -#include "qemu_process.h" #include "qemu_backup.h" -#include "qemu_monitor_json.h" #include "qemu_checkpoint.h" #include "qemu_command.h" #include "qemu_security.h" @@ -35,9 +33,6 @@ #include "virerror.h" #include "virlog.h" #include "virbuffer.h" -#include "viralloc.h" -#include "virxml.h" -#include "virstring.h" #include "backup_conf.h" #include "virdomaincheckpointobjlist.h" =20 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 60e03d418e..3eef6024c5 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -26,7 +26,6 @@ =20 #include "storage_source.h" #include "viralloc.h" -#include "virstoragefile.h" #include "virstring.h" #include "virlog.h" =20 diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 8eafb8482a..8641c8a2d2 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -23,7 +23,6 @@ #include "qemu_conf.h" #include "qemu_domain.h" =20 -#include "virhash.h" #include "virjson.h" #include "viruri.h" =20 diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 8c2205118f..ed82ac5dc2 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -35,10 +35,8 @@ #include "storage_source_conf.h" #include "virlog.h" #include "virthread.h" -#include "virtime.h" #include "locking/domain_lock.h" #include "viralloc.h" -#include "virstring.h" #include "qemu_security.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4a03f4794b..d5a30ef1cb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -24,20 +24,15 @@ #include "qemu_capabilities.h" #include "viralloc.h" #include "virarch.h" -#include "vircrypto.h" #include "virlog.h" #include "virerror.h" #include "virfile.h" #include "virfilecache.h" -#include "virpidfile.h" -#include "virprocess.h" #include "cpu/cpu.h" #include "cpu/cpu_x86.h" #include "domain_conf.h" -#include "vircommand.h" #include "virbitmap.h" #include "virnodesuspend.h" -#include "virnuma.h" #include "virhostcpu.h" #include "qemu_monitor.h" #include "virstring.h" diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index baddb059b2..a14862e4db 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -22,8 +22,6 @@ #pragma once =20 #include "virobject.h" -#include "capabilities.h" -#include "vircommand.h" #include "qemu_monitor.h" #include "domain_capabilities.h" #include "virfirmware.h" diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index aa0c927578..6e26d965c5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -23,21 +23,14 @@ =20 #include "qemu_cgroup.h" #include "qemu_domain.h" -#include "qemu_process.h" #include "qemu_extdevice.h" #include "qemu_hostdev.h" #include "virlog.h" -#include "viralloc.h" #include "virerror.h" #include "domain_audit.h" #include "domain_cgroup.h" -#include "virscsi.h" -#include "virstring.h" #include "virfile.h" -#include "virtypedparam.h" -#include "virnuma.h" #include "virdevmapper.h" -#include "virutil.h" #include "virglibutil.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index f09134947f..3668034cde 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -21,9 +21,7 @@ =20 #pragma once =20 -#include "virusb.h" #include "vircgroup.h" -#include "domain_conf.h" #include "qemu_conf.h" =20 int qemuSetupImageCgroup(virDomainObj *vm, diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index a933230335..933ea41023 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -31,11 +31,8 @@ #include "datatypes.h" #include "viralloc.h" #include "domain_conf.h" -#include "libvirt_internal.h" #include "virxml.h" -#include "virstring.h" #include "virdomaincheckpointobjlist.h" -#include "virdomainsnapshotobjlist.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h index 351995a31d..fc1c35cdd2 100644 --- a/src/qemu/qemu_checkpoint.h +++ b/src/qemu/qemu_checkpoint.h @@ -19,7 +19,6 @@ #pragma once =20 #include "virconftypes.h" -#include "datatypes.h" #include "qemu_conf.h" =20 virDomainObj * diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8eac8edd79..cb076812bb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -41,23 +41,16 @@ #include "viruuid.h" #include "domain_nwfilter.h" #include "domain_addr.h" -#include "domain_audit.h" #include "domain_conf.h" #include "netdev_bandwidth_conf.h" -#include "snapshot_conf.h" -#include "storage_conf.h" -#include "secret_conf.h" #include "virnetdevopenvswitch.h" #include "device_conf.h" #include "storage_source_conf.h" #include "virtpm.h" -#include "virscsi.h" #include "virnuma.h" #include "virgic.h" #include "virmdev.h" -#include "virdomainsnapshotobjlist.h" #include "virutil.h" -#include "virsecureerase.h" =20 #include #include diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index a653ff7218..0a90ef42ee 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -21,17 +21,13 @@ =20 #pragma once =20 -#include "domain_addr.h" #include "domain_conf.h" #include "vircommand.h" #include "virenum.h" -#include "capabilities.h" #include "qemu_block.h" #include "qemu_conf.h" #include "qemu_domain.h" -#include "qemu_domain_address.h" #include "qemu_capabilities.h" -#include "logging/log_manager.h" =20 /* Config type for XML import/export conversions */ #define QEMU_CONFIG_FORMAT_ARGV "qemu-argv" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c22cf79cbe..3b75cdeb95 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -34,19 +34,14 @@ #include "qemu_namespace.h" #include "qemu_security.h" #include "viruuid.h" -#include "virbuffer.h" #include "virconf.h" #include "viralloc.h" -#include "datatypes.h" #include "virxml.h" #include "virlog.h" #include "cpu/cpu.h" #include "domain_driver.h" -#include "domain_nwfilter.h" #include "virfile.h" -#include "virsocket.h" #include "virstring.h" -#include "storage_conf.h" #include "virutil.h" #include "configmake.h" #include "security/security_util.h" diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index c71a666aea..d26a68b100 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -24,22 +24,14 @@ #include =20 #include "virebtables.h" -#include "internal.h" -#include "capabilities.h" -#include "network_conf.h" #include "domain_conf.h" #include "checkpoint_conf.h" #include "snapshot_conf.h" #include "domain_event.h" #include "virthread.h" #include "security/security_manager.h" -#include "virpci.h" -#include "virusb.h" -#include "virscsi.h" #include "cpu_conf.h" -#include "driver.h" #include "virportallocator.h" -#include "vircommand.h" #include "virthreadpool.h" #include "locking/lock_manager.h" #include "qemu_capabilities.h" diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index 2ed8f8640d..cb2694795e 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -18,13 +18,10 @@ =20 #include =20 -#include "qemu_extdevice.h" #include "qemu_dbus.h" #include "qemu_security.h" =20 -#include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virtime.h" #include "virpidfile.h" =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7974cdb00b..371d023e63 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -26,10 +26,8 @@ #include "qemu_block.h" #include "qemu_cgroup.h" #include "qemu_command.h" -#include "qemu_process.h" #include "qemu_capabilities.h" #include "qemu_hostdev.h" -#include "qemu_migration.h" #include "qemu_migration_params.h" #include "qemu_security.h" #include "qemu_slirp.h" @@ -46,17 +44,14 @@ #include "viruuid.h" #include "virfile.h" #include "domain_addr.h" -#include "domain_capabilities.h" #include "domain_driver.h" #include "domain_event.h" #include "domain_validate.h" #include "virtime.h" #include "virnetdevbandwidth.h" -#include "virnetdevopenvswitch.h" #include "virstoragefile.h" #include "storage_source.h" #include "virstring.h" -#include "virthreadjob.h" #include "virprocess.h" #include "vircrypto.h" #include "virrandom.h" @@ -68,7 +63,6 @@ #include "virdomaincheckpointobjlist.h" #include "backup_conf.h" #include "virutil.h" -#include "virqemu.h" #include "virsecureerase.h" =20 #include diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c7125722e0..718d9e423b 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -22,12 +22,10 @@ #pragma once =20 #include -#include "virthread.h" #include "vircgroup.h" #include "virperf.h" #include "domain_addr.h" #include "domain_conf.h" -#include "snapshot_conf.h" #include "qemu_monitor.h" #include "qemu_agent.h" #include "qemu_blockjob.h" @@ -37,7 +35,6 @@ #include "qemu_migration_params.h" #include "qemu_slirp.h" #include "qemu_fd.h" -#include "virmdev.h" #include "virchrdev.h" #include "virobject.h" #include "logging/log_manager.h" diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 4c360a0f70..dbb5de915e 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "domain_addr.h" -#include "domain_conf.h" #include "qemu_conf.h" #include "qemu_capabilities.h" =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e3582f62a7..fd89a0bad3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -39,7 +39,6 @@ #include "qemu_conf.h" #include "qemu_capabilities.h" #include "qemu_command.h" -#include "qemu_cgroup.h" #include "qemu_hostdev.h" #include "qemu_hotplug.h" #include "qemu_monitor.h" @@ -65,25 +64,20 @@ #include "virnetdevopenvswitch.h" #include "capabilities.h" #include "viralloc.h" -#include "virarptable.h" #include "viruuid.h" #include "domain_conf.h" #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" #include "domain_validate.h" -#include "node_device_conf.h" #include "virpci.h" -#include "virusb.h" #include "virpidfile.h" #include "virprocess.h" #include "libvirt_internal.h" #include "virxml.h" #include "cpu/cpu.h" #include "virsysinfo.h" -#include "domain_nwfilter.h" #include "virhook.h" -#include "virstoragefile.h" #include "storage_source_conf.h" #include "storage_file_probe.h" #include "storage_source.h" @@ -107,11 +101,9 @@ #include "virperf.h" #include "virnuma.h" #include "netdev_bandwidth_conf.h" -#include "virqemu.h" #include "virdomainsnapshotobjlist.h" #include "virenum.h" #include "virdomaincheckpointobjlist.h" -#include "virsocket.h" #include "virutil.h" #include "backup_conf.h" =20 diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 537b130394..a67f3af967 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -20,7 +20,6 @@ =20 #include =20 -#include "qemu_command.h" #include "qemu_extdevice.h" #include "qemu_vhost_user_gpu.h" #include "qemu_dbus.h" @@ -29,12 +28,8 @@ #include "qemu_slirp.h" #include "qemu_virtiofs.h" =20 -#include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virtime.h" -#include "virtpm.h" -#include "virpidfile.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 51223faadf..25852aff36 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -29,7 +29,6 @@ #include "virarch.h" #include "virjson.h" #include "virlog.h" -#include "virstring.h" #include "viralloc.h" #include "virenum.h" =20 diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 8af22bdd58..45cd1066f0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -28,11 +28,6 @@ #include "qemu_domain.h" #include "virlog.h" #include "virerror.h" -#include "viralloc.h" -#include "virpci.h" -#include "virusb.h" -#include "virscsi.h" -#include "virnetdev.h" #include "virfile.h" #include "virhostdev.h" #include "virutil.h" diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 09006851b1..2d484db878 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -22,7 +22,6 @@ #pragma once =20 #include "qemu_conf.h" -#include "domain_conf.h" =20 bool qemuHostdevNeedsVFIO(const virDomainHostdevDef *hostdev); =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 274f47c25d..e27b922bd4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -46,20 +46,16 @@ #include "viralloc.h" #include "virpci.h" #include "virfile.h" -#include "virprocess.h" #include "qemu_cgroup.h" #include "locking/domain_lock.h" #include "virnetdev.h" #include "virnetdevbridge.h" -#include "virnetdevtap.h" #include "virnetdevopenvswitch.h" #include "virnetdevmidonet.h" #include "device_conf.h" #include "storage_source.h" #include "storage_source_conf.h" -#include "virstring.h" #include "virtime.h" -#include "virqemu.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index a0a9ae47e2..2b1e8085a4 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -23,7 +23,6 @@ =20 #include "qemu_conf.h" #include "qemu_domain.h" -#include "domain_conf.h" =20 int qemuDomainChangeEjectableMedia(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index e5f4710988..49c77eede7 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -27,7 +27,6 @@ #include "qemu_interface.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" #include "virnetdevmacvlan.h" diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 438d548065..85fae64ed1 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "qemu_conf.h" #include "qemu_domain.h" #include "qemu_slirp.h" diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 24db722c0b..cdc710804f 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -22,13 +22,10 @@ =20 #include "qemu_interop_config.h" #include "configmake.h" -#include "viralloc.h" -#include "virenum.h" #include "virerror.h" #include "virfile.h" #include "virhash.h" #include "virlog.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b735bdb391..7c6d7052b3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -33,7 +33,6 @@ #include "qemu_process.h" #include "qemu_capabilities.h" #include "qemu_alias.h" -#include "qemu_cgroup.h" #include "qemu_hotplug.h" #include "qemu_blockjob.h" #include "qemu_security.h" @@ -48,9 +47,7 @@ #include "virnetdevopenvswitch.h" #include "datatypes.h" #include "virfdstream.h" -#include "viruuid.h" #include "virtime.h" -#include "locking/domain_lock.h" #include "rpc/virnetsocket.h" #include "storage_source_conf.h" #include "viruri.h" @@ -58,9 +55,7 @@ #include "virstring.h" #include "virtypedparam.h" #include "virprocess.h" -#include "nwfilter_conf.h" #include "virdomainsnapshotobjlist.h" -#include "virsocket.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 52ed2c518b..0738ad430f 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -22,7 +22,6 @@ #include =20 #include "locking/domain_lock.h" -#include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "virnetdevopenvswitch.h" diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index d9e1d949a8..2f0cdcf7b6 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -19,7 +19,6 @@ #pragma once =20 #include "qemu_domain.h" -#include "qemu_domainjob.h" #include "qemu_migration_params.h" #include "virenum.h" =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index df2384b213..b717413dbb 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -23,12 +23,10 @@ =20 #include "virlog.h" #include "virerror.h" -#include "viralloc.h" #include "virstring.h" =20 #include "qemu_alias.h" #include "qemu_hotplug.h" -#include "qemu_migration.h" #include "qemu_migration_params.h" #define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW #include "qemu_migration_paramspriv.h" diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index 4a8815e776..bd5fd7f164 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -21,11 +21,7 @@ =20 #pragma once =20 -#include "internal.h" - #include "virbuffer.h" -#include "virxml.h" -#include "qemu_monitor.h" #include "qemu_conf.h" #include "virenum.h" =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 316cff5b9b..7cb92c6eb5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -31,7 +31,6 @@ #include "qemu_monitor_text.h" #include "qemu_monitor_json.h" #include "qemu_domain.h" -#include "qemu_process.h" #include "qemu_capabilities.h" #include "virerror.h" #include "viralloc.h" @@ -42,7 +41,6 @@ #include "virprobe.h" #include "virstring.h" #include "virtime.h" -#include "virsocket.h" #include "virutil.h" =20 #ifdef WITH_DTRACE_PROBES diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5c2a749282..4c5ff51115 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -25,10 +25,8 @@ =20 #include "domain_conf.h" #include "virbitmap.h" -#include "virhash.h" #include "virjson.h" #include "virnetdev.h" -#include "device_conf.h" #include "cpu/cpu.h" #include "util/virgic.h" #include "virenum.h" diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d9f93bd2fa..b08d9725ea 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -27,18 +27,14 @@ =20 #include "qemu_monitor_json.h" #include "qemu_alias.h" -#include "qemu_capabilities.h" #include "viralloc.h" #include "virlog.h" -#include "driver.h" -#include "datatypes.h" #include "virerror.h" #include "virjson.h" #include "virprobe.h" #include "virstring.h" #include "cpu/cpu_x86.h" #include "virenum.h" -#include "virsocket.h" =20 #ifdef WITH_DTRACE_PROBES # include "libvirt_qemu_probes.h" diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 982fbad44e..b469dc5b35 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -24,7 +24,6 @@ #include "internal.h" =20 #include "qemu_monitor.h" -#include "virbitmap.h" #include "cpu/cpu.h" #include "util/virgic.h" =20 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 86af1e4975..65785f1dae 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -24,10 +24,8 @@ =20 #include "qemu_monitor_text.h" #include "qemu_monitor_json.h" -#include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index d959fc8889..e0b0c379b0 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" - #include "qemu_monitor.h" =20 int qemuMonitorTextAddDrive(qemuMonitor *mon, diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 23681b14a4..5df550366d 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -38,7 +38,6 @@ #include "qemu_hostdev.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virdevmapper.h" #include "virglibutil.h" =20 diff --git a/src/qemu/qemu_namespace.h b/src/qemu/qemu_namespace.h index 020aca13d8..fbea865c70 100644 --- a/src/qemu/qemu_namespace.h +++ b/src/qemu/qemu_namespace.h @@ -23,7 +23,6 @@ =20 #include "virenum.h" #include "qemu_conf.h" -#include "virconf.h" =20 typedef enum { QEMU_DOMAIN_NS_MOUNT =3D 0, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2b16298942..6b9d4159ea 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -87,9 +87,7 @@ #include "virnuma.h" #include "virstring.h" #include "virhostdev.h" -#include "virsecret.h" #include "configmake.h" -#include "nwfilter_conf.h" #include "netdev_bandwidth_conf.h" #include "virresctrl.h" #include "virvsock.h" diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index f81bfd930a..6dcdddda6d 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -23,7 +23,6 @@ =20 #include "qemu_conf.h" #include "qemu_domain.h" -#include "virstoragefile.h" #include "vireventthread.h" =20 int qemuProcessPrepareMonitorChr(virDomainChrSourceDef *monConfig, diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 426db8d30d..500d3c50b3 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -20,8 +20,6 @@ =20 #include "qemu_qapi.h" =20 -#include "viralloc.h" -#include "virstring.h" #include "virerror.h" #include "virlog.h" =20 diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 4fd4c5cfcd..79567bf17d 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -28,8 +28,6 @@ =20 #include "virerror.h" #include "virlog.h" -#include "viralloc.h" -#include "virqemu.h" =20 #include #include diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 391cd55ed0..30cf4b1ee0 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -19,10 +19,8 @@ #pragma once =20 #include "virconftypes.h" -#include "datatypes.h" =20 #include "qemu_conf.h" -#include "qemu_domainjob.h" #include "qemu_domain.h" =20 /* It would be nice to replace 'Qemud' with 'Qemu' but diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index eaf646f225..e01d4699e6 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -21,8 +21,6 @@ #pragma once =20 #include "qemu_conf.h" -#include "domain_conf.h" -#include "security/security_manager.h" =20 int qemuSecuritySetAllLabel(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index a06869a406..7b58583074 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -25,7 +25,6 @@ #include =20 #include "virfile.h" -#include "virstring.h" #include "virgettext.h" #include "virthread.h" =20 diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index c832cfc20b..546a77db30 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -22,14 +22,11 @@ #include "qemu_extdevice.h" #include "qemu_security.h" #include "qemu_slirp.h" -#include "viralloc.h" #include "virenum.h" #include "virerror.h" #include "virjson.h" #include "virlog.h" #include "virpidfile.h" -#include "virstring.h" -#include "virtime.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index b62fab7bb3..dc6bddd021 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -36,10 +36,6 @@ #include "domain_conf.h" #include "domain_audit.h" #include "locking/domain_lock.h" -#include "libvirt_internal.h" -#include "virxml.h" -#include "virstoragefile.h" -#include "virstring.h" #include "virdomainsnapshotobjlist.h" #include "virqemu.h" #include "storage_source.h" diff --git a/src/qemu/qemu_snapshot.h b/src/qemu/qemu_snapshot.h index 0cc38c0039..f69c05f68c 100644 --- a/src/qemu/qemu_snapshot.h +++ b/src/qemu/qemu_snapshot.h @@ -19,7 +19,6 @@ #pragma once =20 #include "virconftypes.h" -#include "datatypes.h" #include "qemu_conf.h" #include "qemu_domainjob.h" =20 diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 56bccee128..bb08cf8811 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -26,19 +26,14 @@ #include =20 #include "qemu_extdevice.h" -#include "qemu_domain.h" #include "qemu_security.h" =20 #include "conf/domain_conf.h" #include "vircommand.h" -#include "viralloc.h" -#include "virkmod.h" #include "viridentity.h" #include "virlog.h" -#include "virutil.h" #include "viruuid.h" #include "virfile.h" -#include "virstring.h" #include "virpidfile.h" #include "configmake.h" #include "qemu_tpm.h" diff --git a/src/qemu/qemu_validate.h b/src/qemu/qemu_validate.h index 1e0546633c..e06a43b8e3 100644 --- a/src/qemu/qemu_validate.h +++ b/src/qemu/qemu_validate.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "qemu_capabilities.h" =20 int diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 75cc718c09..7539afd50a 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -24,7 +24,6 @@ #include "qemu_interop_config.h" #include "virjson.h" #include "virlog.h" -#include "virstring.h" #include "viralloc.h" #include "virenum.h" #include "virutil.h" diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h index f4ae1839d1..d1aa6ca189 100644 --- a/src/qemu/qemu_vhost_user.h +++ b/src/qemu/qemu_vhost_user.h @@ -20,9 +20,7 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "qemu_conf.h" -#include "virarch.h" =20 typedef struct _qemuVhostUser qemuVhostUser; =20 diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 6f601cebde..7c5be4098e 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -27,11 +27,8 @@ #include "conf/domain_conf.h" #include "configmake.h" #include "vircommand.h" -#include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "virstring.h" -#include "virtime.h" #include "virpidfile.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/qemu/qemu_vhost_user_gpu.h b/src/qemu/qemu_vhost_user_gpu.h index 0d50dd2464..2b86982cb8 100644 --- a/src/qemu/qemu_vhost_user_gpu.h +++ b/src/qemu/qemu_vhost_user_gpu.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "qemu_domain.h" #include "qemu_security.h" =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277441357999.3988118400873; Wed, 11 May 2022 06:57:21 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-_JDTwU-YM2qtID61tj3udQ-1; Wed, 11 May 2022 09:57:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1F009221D1; Wed, 11 May 2022 13:57:11 +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 BAD1140D0165; Wed, 11 May 2022 13:57:11 +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 64C661956B85; Wed, 11 May 2022 13:57:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 314A51932200 for ; Wed, 11 May 2022 13:57:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 134B7463DF3; Wed, 11 May 2022 13:57:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F218A463DF0 for ; Wed, 11 May 2022 13:57:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 587A0811E90 for ; Wed, 11 May 2022 13:57:07 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-x7skG4OKNqCRZToQJkkwRw-1; Wed, 11 May 2022 09:56:58 -0400 Received: by mail-pf1-f176.google.com with SMTP id 204so2072780pfx.3 for ; Wed, 11 May 2022 06:56:57 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:56 -0700 (PDT) X-MC-Unique: _JDTwU-YM2qtID61tj3udQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: x7skG4OKNqCRZToQJkkwRw-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=Zw8j3rMS+r17g5mn/H+H4pUUstdA9UvjqpY3YCjQ6ZI=; b=5EXNxrGVVFNf0mK0A647Pos6/A47VNVMwUXtethBBeRJ8GFAYMemBuxv9eXCQCSJG7 NHMmmTrE4i51m5bRcLbu2ytxYw14TaDncEWLb9j8K/yYOUVuVj83dqhTFflG+QqhFwNi VFzIAlL1Y3Kj2oVt08J2RLF1fZ4GBQFic8C2sZeNXzEFFSGOOTh3nN+r5h1HqFU3pAXq s7JhuNDYDNXYhFOh9+zy3adlXniuHkrLqxzsNaEGgWRYPtw1rP7ZZVBoJLm6TOPXKxFg zWIqu8c77oUYxPaK10FHylxx5T7Gru+ZzGFpBTkCStNLXF/3YuNjEmtoYsHCgmhyQ3XX ceVQ== X-Gm-Message-State: AOAM532wVKGYcUnkY1gomzVaR0V34EiK5fGaS46kxYqV9bHO75fvJiUA av5fzeUg+qAJ6RBXOOFkZqTREyFzD6IW0Bqn X-Google-Smtp-Source: ABdhPJxDddlOSeWIoMHsxg7glgQct9Dxurm4Llpoll0xlTS8Mu9VMorhFOeJqJkhsI2b8AjGkmxoqg== X-Received: by 2002:a05:6a00:1306:b0:512:ca3d:392f with SMTP id j6-20020a056a00130600b00512ca3d392fmr254225pfu.79.1652277416652; Wed, 11 May 2022 06:56:56 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 17/29] remote: Remove unused includes Date: Wed, 11 May 2022 21:55:18 +0800 Message-Id: <20220511135530.951850-18-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.85 on 10.11.54.10 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.84 on 10.11.54.1 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: 1652277443135100005 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/remote/remote_daemon.c | 3 --- src/remote/remote_daemon.h | 1 - src/remote/remote_daemon_config.c | 1 - src/remote/remote_daemon_dispatch.c | 5 ----- src/remote/remote_daemon_dispatch.h | 1 - src/remote/remote_daemon_stream.c | 1 - src/remote/remote_driver.c | 3 --- src/remote/remote_driver.h | 1 - 8 files changed, 16 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 26469e0d9f..ca9d4fd4d1 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -32,7 +32,6 @@ #include "virfile.h" #include "virlog.h" #include "virpidfile.h" -#include "virprocess.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 @@ -43,14 +42,12 @@ #include "viruuid.h" #include "remote_driver.h" #include "viralloc.h" -#include "virconf.h" #include "virnetlink.h" #include "virnetdaemon.h" #include "remote_daemon_dispatch.h" #include "virhook.h" #include "viraudit.h" #include "virstring.h" -#include "locking/lock_manager.h" #include "viraccessmanager.h" #include "virutil.h" #include "virgettext.h" diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 1a69311029..7c3f50d9d4 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -25,7 +25,6 @@ =20 #include #include -#include "remote_protocol.h" #include "lxc_protocol.h" #include "qemu_protocol.h" #include "virthread.h" diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c= onfig.c index 30653e82cf..330db54651 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -31,7 +31,6 @@ #include "remote_protocol.h" #include "remote_driver.h" #include "util/virnetdevopenvswitch.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 2463386e39..305311c208 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -30,18 +30,13 @@ #include "viralloc.h" #include "virlog.h" #include "remote_daemon_stream.h" -#include "viruuid.h" -#include "vircommand.h" #include "virnetserverservice.h" #include "virnetserver.h" #include "virfile.h" #include "virtypedparam.h" -#include "virprocess.h" #include "remote_protocol.h" #include "qemu_protocol.h" #include "lxc_protocol.h" -#include "virstring.h" -#include "object_event.h" #include "domain_conf.h" #include "network_conf.h" #include "virprobe.h" diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon= _dispatch.h index 0d5f243203..e6cde23244 100644 --- a/src/remote/remote_daemon_dispatch.h +++ b/src/remote/remote_daemon_dispatch.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "remote_protocol.h" #include "rpc/virnetserverprogram.h" #include "rpc/virnetserverclient.h" =20 diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index a6d2c915e6..645be6eafd 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -22,7 +22,6 @@ #include =20 #include "remote_daemon_stream.h" -#include "remote_daemon_dispatch.h" #include "viralloc.h" #include "virlog.h" #include "virnetserverclient.h" diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 423f5f9fb9..85bda3b785 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -35,7 +35,6 @@ #include "node_device_event.h" #include "secret_event.h" #include "driver.h" -#include "virbuffer.h" #include "remote_driver.h" #include "remote_protocol.h" #include "remote_sockets.h" @@ -43,13 +42,11 @@ #include "qemu_protocol.h" #include "viralloc.h" #include "virfile.h" -#include "vircommand.h" #include "virtypedparam.h" #include "viruri.h" #include "virauth.h" #include "virauthconfig.h" #include "virstring.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_REMOTE =20 diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 5e9b04da63..68cac1c244 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "configmake.h" =20 int remoteRegister (void); --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277439212162.80871113368607; Wed, 11 May 2022 06:57:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-399-1DegjphCN0aqgHhF6MkHFw-1; Wed, 11 May 2022 09:57:06 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BFF0318A6585; Wed, 11 May 2022 13:57:03 +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 AA974400E86A; Wed, 11 May 2022 13:57:03 +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 72B171947B84; Wed, 11 May 2022 13:57:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 55C1A1947B84 for ; Wed, 11 May 2022 13:57:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4B898400DFA2; Wed, 11 May 2022 13:57:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47A67400E86A for ; Wed, 11 May 2022 13:57:02 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 2B48D811E84 for ; Wed, 11 May 2022 13:57:02 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-580-MHSmkCVJMrWILD2LuZvSAQ-1; Wed, 11 May 2022 09:57:00 -0400 Received: by mail-pg1-f180.google.com with SMTP id 137so1870714pgb.5 for ; Wed, 11 May 2022 06:57:00 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:56:58 -0700 (PDT) X-MC-Unique: 1DegjphCN0aqgHhF6MkHFw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: MHSmkCVJMrWILD2LuZvSAQ-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=z0etJpK42tfPanC7YKV7AXizSU9Y7r2BjG05Ei2tC+A=; b=R0W56DRMKRm2aSQHjSLyoub25zpr+Nxp5gzmwWiKCx5Plzw0XdP6JwF7Pp1wlhVQEz aU2dhjI6qWOAtWKtRQVlPsNYau8wcYbCnyituc7eUMP8PUBKlWBT2hFpH2Ck5Saxpkl/ SflEP9axmnW8zIjjcBgsOSaRdDSRnR6wUDp7D2GDbyrRraRuTYqV3FrA7hC8hbKzpkG6 OcmVV5Mv7UPNz1ToOeK8rtGGU+qt6uoxzVKlItuqNSNd4030D2RE/duVCqXvQsVEgZN+ mFKQiLu7OggR/IZ1rR1hahVnn+DONhoj1j+WStMv1s+6oXOykp6gKeywZPv2E0qDt+VN PLgA== X-Gm-Message-State: AOAM532FOxgxWzXt1fNXCEvO0hOTTMNqWUJgkL6NsNe5SFe+NkV6f8Nh h3FyuugTqZZZYm8m0rs12Di/NJu2VuHFz8JQ X-Google-Smtp-Source: ABdhPJwF8ChzHkgnqAp4CEp4p/QON9b/lu7mQQXoPvgYx2k+whsYzMgpEdMYds1oY2FdjppQlB9TUg== X-Received: by 2002:a05:6a00:198f:b0:50e:7e6:6d5c with SMTP id d15-20020a056a00198f00b0050e07e66d5cmr25376018pfl.20.1652277419077; Wed, 11 May 2022 06:56:59 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 18/29] rpc: Remove unused includes Date: Wed, 11 May 2022 21:55:19 +0800 Message-Id: <20220511135530.951850-19-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.1 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.84 on 10.11.54.1 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: 1652277441128100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/rpc/virkeepalive.c | 3 --- src/rpc/virnetclient.c | 1 - src/rpc/virnetclient.h | 1 - src/rpc/virnetclientprogram.h | 1 - src/rpc/virnetclientstream.c | 1 - src/rpc/virnetclientstream.h | 1 - src/rpc/virnetdaemon.c | 2 -- src/rpc/virnetdaemon.h | 3 --- src/rpc/virnetlibsshsession.h | 1 - src/rpc/virnetmessage.c | 1 - src/rpc/virnetsaslcontext.c | 3 --- src/rpc/virnetsaslcontext.h | 1 - src/rpc/virnetserver.c | 2 -- src/rpc/virnetserver.h | 1 - src/rpc/virnetserverclient.c | 1 - src/rpc/virnetserverprogram.h | 1 - src/rpc/virnetserverservice.h | 1 - src/rpc/virnetsocket.c | 1 - src/rpc/virnetsshsession.c | 1 - src/rpc/virnetsshsession.h | 1 - src/rpc/virnettlscontext.h | 1 - 21 files changed, 29 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 9d08c3bcca..a5d1d6c4fa 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -20,12 +20,9 @@ =20 #include =20 -#include "viralloc.h" #include "virthread.h" -#include "virfile.h" #include "virlog.h" #include "virerror.h" -#include "virnetsocket.h" #include "virkeepaliveprotocol.h" #include "virkeepalive.h" #include "virprobe.h" diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2998551cd8..3f79c03a58 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -34,7 +34,6 @@ #include "virutil.h" #include "virerror.h" #include "virprobe.h" -#include "virstring.h" #include "vireventglibwatch.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 5048033325..1647a6cc71 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -27,7 +27,6 @@ #endif #include "virnetclientprogram.h" #include "virnetclientstream.h" -#include "virobject.h" #include "viruri.h" =20 typedef enum { diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h index 8cd8d4f2c8..54f6278a30 100644 --- a/src/rpc/virnetclientprogram.h +++ b/src/rpc/virnetclientprogram.h @@ -24,7 +24,6 @@ #include =20 #include "virnetmessage.h" -#include "virobject.h" =20 typedef struct _virNetClient virNetClient; =20 diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index e8e8ca2af2..a03f67e542 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -22,7 +22,6 @@ =20 #include "virnetclientstream.h" #include "virnetclient.h" -#include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "virthread.h" diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h index 7428843f9b..7363969424 100644 --- a/src/rpc/virnetclientstream.h +++ b/src/rpc/virnetclientstream.h @@ -21,7 +21,6 @@ #pragma once =20 #include "virnetclientprogram.h" -#include "virobject.h" =20 typedef struct _virNetClientStream virNetClientStream; =20 diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 1f32bae35f..3c4adb2ca2 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -28,13 +28,11 @@ #include "viralloc.h" #include "virerror.h" #include "virthread.h" -#include "virthreadpool.h" #include "virutil.h" #include "virfile.h" #include "virnetserver.h" #include "virgdbus.h" #include "virhash.h" -#include "virstring.h" #include "virsystemd.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h index f91b59a4fd..d588f86799 100644 --- a/src/rpc/virnetdaemon.h +++ b/src/rpc/virnetdaemon.h @@ -22,12 +22,9 @@ =20 #include =20 -#include "virnettlscontext.h" -#include "virobject.h" #include "virjson.h" #include "virnetserverprogram.h" #include "virnetserverclient.h" -#include "virnetserverservice.h" #include "virnetserver.h" =20 virNetDaemon *virNetDaemonNew(void); diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h index c3b5f3e80d..f2d4566713 100644 --- a/src/rpc/virnetlibsshsession.h +++ b/src/rpc/virnetlibsshsession.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "viruri.h" =20 typedef struct _virNetLibsshSession virNetLibsshSession; diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 221da7c59b..f1f87be43e 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -28,7 +28,6 @@ #include "virlog.h" #include "virfile.h" #include "virutil.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index ede434ed4a..dbf777cfa3 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -21,13 +21,10 @@ #include =20 #include "virnetsaslcontext.h" -#include "virnetmessage.h" =20 #include "virerror.h" -#include "viralloc.h" #include "virthread.h" #include "virlog.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 diff --git a/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h index 7202822e5b..a774d4d7dc 100644 --- a/src/rpc/virnetsaslcontext.h +++ b/src/rpc/virnetsaslcontext.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include =20 #include "virobject.h" diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 371b72c8d6..2a77bf6d52 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -27,8 +27,6 @@ #include "virerror.h" #include "virthread.h" #include "virthreadpool.h" -#include "virstring.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 371f2d07cf..9f0cf3a3fc 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,7 +25,6 @@ #include "virnetserverprogram.h" #include "virnetserverclient.h" #include "virnetserverservice.h" -#include "virobject.h" #include "virjson.h" #include "virsystemd.h" =20 diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index da9956f2b4..bb70856351 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -35,7 +35,6 @@ #include "virthread.h" #include "virkeepalive.h" #include "virprobe.h" -#include "virstring.h" #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h index 218287f12f..cb7c67902c 100644 --- a/src/rpc/virnetserverprogram.h +++ b/src/rpc/virnetserverprogram.h @@ -23,7 +23,6 @@ =20 #include "virnetmessage.h" #include "virnetserverclient.h" -#include "virobject.h" =20 typedef struct _virNetDaemon virNetDaemon; =20 diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index f3d55a9cc0..d2049556f9 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -22,7 +22,6 @@ #pragma once =20 #include "virnetserverprogram.h" -#include "virobject.h" =20 typedef enum { VIR_NET_SERVER_SERVICE_AUTH_NONE =3D 0, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 1af2778b97..32f506d2d4 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -45,7 +45,6 @@ #include "virlog.h" #include "virfile.h" #include "virthread.h" -#include "virpidfile.h" #include "virprobe.h" #include "virprocess.h" #include "virstring.h" diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index f2862979c9..485318d09b 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -32,7 +32,6 @@ #include "virerror.h" #include "virfile.h" #include "virobject.h" -#include "virstring.h" #include "virauth.h" =20 #define VIR_FROM_THIS VIR_FROM_SSH diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h index 7a056df37f..2be62c4596 100644 --- a/src/rpc/virnetsshsession.h +++ b/src/rpc/virnetsshsession.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "viruri.h" =20 typedef struct _virNetSSHSession virNetSSHSession; diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index 11c954ce4b..843c6114c7 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virobject.h" =20 typedef struct _virNetTLSContext virNetTLSContext; --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277442036423.7811258999699; Wed, 11 May 2022 06:57:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-126-I_-_QBHAO7-A6rDJRk4O6w-1; Wed, 11 May 2022 09:57:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78A779221C0; Wed, 11 May 2022 13:57:08 +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 64705400E436; Wed, 11 May 2022 13:57:08 +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 1F91A194975B; Wed, 11 May 2022 13:57:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 394C7194707B for ; Wed, 11 May 2022 13:57:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 08E187AE2; Wed, 11 May 2022 13:57:06 +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 043C47AFA for ; Wed, 11 May 2022 13:57:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 5F96D398CA62 for ; Wed, 11 May 2022 13:57:05 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-586-qWR7jkdZOMKHaMBAJXaQHw-1; Wed, 11 May 2022 09:57:03 -0400 Received: by mail-pl1-f181.google.com with SMTP id c9so1980688plh.2 for ; Wed, 11 May 2022 06:57:03 -0700 (PDT) Received: from localhost.lan ([112.10.225.220]) by smtp.gmail.com with ESMTPSA id pc11-20020a17090b3b8b00b001dc4d22c0a7sm1919817pjb.10.2022.05.11.06.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:01 -0700 (PDT) X-MC-Unique: I_-_QBHAO7-A6rDJRk4O6w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: qWR7jkdZOMKHaMBAJXaQHw-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=O7fxcjCIvcy+mqzG1zTxE0xK9he3OLAl536+nZSAuSg=; b=d/c5QCgakGa+LP5n0V16TNd5MqleCBKl/gx41aAHeqXUquM2Rr0NvR2qb+LD2Uocv+ Zlh0S8XnVtJRE2ceyuC3jeZPqnYnNRo5abKPUX8TFC1EiyVBwU/qRIORLDgK1fx5AifW BHhHJs0vjmPXELJqFMnfHAPbLdPQpYFUPpRlgL4mcK0y3PEVm0I6oRE7vimRd4+gegTJ E8EJyTfWy+CHGvnLuiYTS5aj8t5AOQnlfYcIDy3ys+FEk88gdc5IqUHVFjJPfe8kH/rH bFfMBzXkVfdW5FGN4QelhE6I756jQ52Jb7FcMBz/SoiSvdRCfHBOU57pRQStuYFNSxzW 0A8Q== X-Gm-Message-State: AOAM531xE7pBp1F7rxkW8Z3GWe74dVfuwPmB/q4Kv+77DyArc0xYHecx K4Po+CCOvbBp8VEedmLpa3wNj0R7h6GtxacZ X-Google-Smtp-Source: ABdhPJyxiu5d5fzt+ACuCfCex4rGusDkJ6IgzE73qCD6qG+Dj8P1AZ+6yF3HHvdVqZNy6V+4/hhU4A== X-Received: by 2002:a17:90a:9b0d:b0:1dc:e81d:6c18 with SMTP id f13-20020a17090a9b0d00b001dce81d6c18mr5589802pjp.72.1652277421910; Wed, 11 May 2022 06:57:01 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 19/29] secret: Remove unused includes Date: Wed, 11 May 2022 21:55:20 +0800 Message-Id: <20220511135530.951850-20-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.79 on 10.11.54.5 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.84 on 10.11.54.2 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: 1652277443109100003 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/secret/secret_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 09782b38d3..080ed962a9 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -35,11 +35,9 @@ #include "virthread.h" #include "viruuid.h" #include "virerror.h" -#include "virfile.h" #include "viridentity.h" #include "virpidfile.h" #include "configmake.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "secret_event.h" #include "virutil.h" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277442038379.14573739088826; Wed, 11 May 2022 06:57:22 -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-513-F8wx-YU4MCqnapcAzNVGYw-1; Wed, 11 May 2022 09:57:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 531C13C1173A; Wed, 11 May 2022 13:57:09 +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 3311C40CF8EB; Wed, 11 May 2022 13:57:09 +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 0A7091947B84; Wed, 11 May 2022 13:57:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 946CC194707B for ; Wed, 11 May 2022 13:57:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8831214C3039; Wed, 11 May 2022 13:57:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8488114C1D5B for ; Wed, 11 May 2022 13:57:07 +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 6E354811E83 for ; Wed, 11 May 2022 13:57:07 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-T8JpFqBUMbyRMX_nLNM1jQ-1; Wed, 11 May 2022 09:57:05 -0400 Received: by mail-pj1-f46.google.com with SMTP id t11-20020a17090ad50b00b001d95bf21996so5026171pju.2 for ; Wed, 11 May 2022 06:57:05 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:04 -0700 (PDT) X-MC-Unique: F8wx-YU4MCqnapcAzNVGYw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: T8JpFqBUMbyRMX_nLNM1jQ-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=Kn7SKUOnUE0l2qq/nChDiMMJU2daZWjFww5+EhuIW1s=; b=X51T6uKTAD7oGKQEGtvZOinRbI7/LvQlZKyiCoUI7OE/QOZAOoJFRkfJ4QOaDnTsqh o05OUVFCRiAuW54uTeIiq8qNZGxduYGboYEb3OkgBVwfI58ICfPKr90zRRhXr5cCCjG4 Coh3Lm3w6FVz2tUo+HWlnEtu3FnWRCJm7AiRxDnfaJ/Lrg/y3gpNqzdBFNrCYk0CSZi3 oatyb+LBMRW18JF+9CuMj2mdpYogK8KElMHdzyptYbcndauoSMAbDrLAPo05fETeXO12 +gVX5ZHI02Mgk5mGNVTi3o92OQDRJEwQJfW3le09EpVKNS4gBas6885ntxo4AdblYYTl xmgQ== X-Gm-Message-State: AOAM530TcQwfUjsY+yZQy+nqug33U30XmQcFeqvZK5kZ+xLtw0sZaClQ hVJgHlVIMoZ4Zv6gGyeqDin7Mqzgyb+nXj+3 X-Google-Smtp-Source: ABdhPJwDXm00D9pJ36Pp7uFtA+g1Abyt/00Vc1a7AEu28U/wtdJdRwMBXeLhvsQr/YYNiR5LV/MCZw== X-Received: by 2002:a17:90a:94c2:b0:1d9:3fbd:bbe1 with SMTP id j2-20020a17090a94c200b001d93fbdbbe1mr5517304pjw.59.1652277424310; Wed, 11 May 2022 06:57:04 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 20/29] security: Remove unused includes Date: Wed, 11 May 2022 21:55:21 +0800 Message-Id: <20220511135530.951850-21-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.85 on 10.11.54.7 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.84 on 10.11.54.1 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: 1652277443111100004 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/security/security_dac.c | 1 - src/security/security_manager.h | 1 - src/security/security_nop.c | 2 -- src/security/security_selinux.c | 2 -- src/security/security_stack.c | 1 - src/security/security_util.c | 1 - 6 files changed, 8 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 5b840f4225..f749335bb4 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -39,7 +39,6 @@ #include "virusb.h" #include "virscsi.h" #include "virscsivhost.h" -#include "virstoragefile.h" #include "virstring.h" #include "virutil.h" =20 diff --git a/src/security/security_manager.h b/src/security/security_manage= r.h index 59020b1475..bb3855efef 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -22,7 +22,6 @@ =20 #include "domain_conf.h" #include "vircommand.h" -#include "virstoragefile.h" =20 typedef struct _virSecurityManager virSecurityManager; =20 diff --git a/src/security/security_nop.c b/src/security/security_nop.c index 0b3d37142a..0dbc547feb 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -20,8 +20,6 @@ #include =20 #include "security_nop.h" -#include "virstring.h" -#include "virerror.h" =20 #define VIR_FROM_THIS VIR_FROM_SECURITY =20 diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 6f02baf2ce..303a2bc505 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -26,7 +26,6 @@ #include =20 #include "security_driver.h" -#include "security_selinux.h" #include "security_util.h" #include "virerror.h" #include "viralloc.h" @@ -36,7 +35,6 @@ #include "virusb.h" #include "virscsi.h" #include "virscsivhost.h" -#include "virstoragefile.h" #include "virfile.h" #include "virhash.h" #include "virrandom.h" diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 3c2239910a..0c72f93a20 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -22,7 +22,6 @@ =20 #include "security_stack.h" =20 -#include "virerror.h" #include "viralloc.h" #include "virlog.h" =20 diff --git a/src/security/security_util.c b/src/security/security_util.c index 26a7861e29..83eb2edcae 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -23,7 +23,6 @@ #include "virstring.h" #include "virerror.h" #include "virlog.h" -#include "viruuid.h" #include "virhostuptime.h" =20 #include "security_util.h" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277446481460.7864369547814; Wed, 11 May 2022 06:57:26 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-325-d4nykaNKO7O-JQKvdNoUhw-1; Wed, 11 May 2022 09:57:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 45A31803D7C; 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 2FEA5C2811A; 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 D8E211937754; Wed, 11 May 2022 13:57:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 65B6E1932201 for ; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 54D6E416364; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5066F401E74 for ; Wed, 11 May 2022 13:57:13 +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 0D08A80C8F1 for ; Wed, 11 May 2022 13:57:10 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-fZs4Ln8_Mb6JhsuGa-f4ag-1; Wed, 11 May 2022 09:57:08 -0400 Received: by mail-pl1-f172.google.com with SMTP id n8so1984136plh.1 for ; Wed, 11 May 2022 06:57:07 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:06 -0700 (PDT) X-MC-Unique: d4nykaNKO7O-JQKvdNoUhw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: fZs4Ln8_Mb6JhsuGa-f4ag-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=iobSJ60ivKElh4zeRQAEX5F1x7Wnn+DaEzEFMmHF/mU=; b=detfID2Fa9/LWzabmf2wpDilx1PJg1dcVEC57Z31yAwPHjXu3QTlTjriSFobW5/zIq CUnwKaQFqkY7oMB525p8lRg02SqiPkxII6iqlpm9TbWXceFDf2jQvVc114NLsg9aCqcr hCpa2wI5a/kS4E+TYXYsRirWvTssxJqgiI2ewCrBbKVXQPhyj1KJW5s2sssHEm3Hkdrw c0vvvfsrt8oeBNog8zzGdc+OqlX0qkOr/4tH3TpSBf6FOjHT4lsY6wPH21VmFQEruupv btBOKhEXn3n018O0n3BXgDnzxpGFyZrgAuh5in5cQakVJmOx1uTs9WWcP++tKMQcodaj 7aLg== X-Gm-Message-State: AOAM533O4mrsBfsYsGZ9eW8AIIy8rYf8sCAky4hVH+/AVUhMGjSELk3F b/1udAq524Ozk1DwF6y5oyHooX1AEj0k9j2X X-Google-Smtp-Source: ABdhPJxdd83Vbpb7KJiCeyUuj0OOY26RyR40H5FfR+x5fkBDpNWnwC75NnAxuDPLWsqyIH8oLav/fw== X-Received: by 2002:a17:903:11c7:b0:151:7290:ccc with SMTP id q7-20020a17090311c700b0015172900cccmr25873720plh.95.1652277426705; Wed, 11 May 2022 06:57:06 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 21/29] storage: Remove unused includes Date: Wed, 11 May 2022 21:55:22 +0800 Message-Id: <20220511135530.951850-22-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.85 on 10.11.54.10 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.8 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: 1652277447185100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/storage/parthelper.c | 1 - src/storage/storage_backend.c | 3 --- src/storage/storage_backend.h | 1 - src/storage/storage_backend_fs.c | 1 - src/storage/storage_backend_gluster.c | 1 - src/storage/storage_backend_iscsi.c | 4 ---- src/storage/storage_backend_iscsi_direct.c | 2 -- src/storage/storage_backend_mpath.c | 1 - src/storage/storage_backend_rbd.c | 1 - src/storage/storage_backend_scsi.c | 3 --- src/storage/storage_backend_vstorage.c | 2 -- src/storage/storage_driver.c | 2 -- src/storage/storage_util.c | 3 --- src/storage/storage_util.h | 1 - 14 files changed, 26 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 73ae28f718..da67455335 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -37,7 +37,6 @@ #include =20 #include "virfile.h" -#include "virstring.h" #include "virgettext.h" #include "virdevmapper.h" #include "virerror.h" diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index c5b36801ba..3e7a5ae67d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -23,12 +23,9 @@ =20 #include =20 -#include "datatypes.h" #include "virerror.h" -#include "viralloc.h" #include "internal.h" #include "storage_backend.h" -#include "storage_source_conf.h" #include "virlog.h" #include "virmodule.h" #include "virfile.h" diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75b5220a7b..682e479b6f 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -20,7 +20,6 @@ =20 #include =20 -#include "internal.h" #include "virstorageobj.h" #include "storage_driver.h" =20 diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index be3c3c6839..ea5bf7ef83 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "virfile.h" #include "virlog.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 52007db2ba..1fe21b4a2b 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -28,7 +28,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "viruri.h" #include "storage_file_probe.h" #include "storage_util.h" diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index eef1d91062..968a70158b 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -26,19 +26,15 @@ #include #include =20 -#include "datatypes.h" #include "driver.h" #include "storage_backend_iscsi.h" #include "viralloc.h" -#include "vircommand.h" #include "virerror.h" #include "virfile.h" #include "viriscsi.h" #include "viridentity.h" #include "virlog.h" #include "virobject.h" -#include "virstring.h" -#include "viruuid.h" #include "virsecret.h" #include "storage_util.h" #include "virutil.h" diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/stora= ge_backend_iscsi_direct.c index 302a338ec6..5df5447066 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -27,14 +27,12 @@ #include "virsecret.h" #include "storage_backend_iscsi_direct.h" #include "storage_util.h" -#include "viralloc.h" #include "virerror.h" #include "viridentity.h" #include "virlog.h" #include "virobject.h" #include "virstring.h" #include "virtime.h" -#include "viruuid.h" #include "virsecureerase.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index ac90a38fa3..b33fe3846d 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "virstring.h" #include "virutil.h" #include "storage_util.h" =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 2559991bc0..52407f8e6f 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -30,7 +30,6 @@ #include "viridentity.h" #include "virlog.h" #include "viruuid.h" -#include "virstring.h" #include "virrandom.h" #include "rados/librados.h" #include "rbd/librbd.h" diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backe= nd_scsi.c index fc99e0414a..afc98960a8 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -26,11 +26,8 @@ =20 #include "virerror.h" #include "storage_backend_scsi.h" -#include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "vircommand.h" -#include "virstring.h" #include "storage_util.h" #include "node_device_conf.h" #include "node_device_util.h" diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_b= ackend_vstorage.c index 52e9895234..21e538f2a2 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -1,11 +1,9 @@ #include =20 -#include "viralloc.h" #include "virerror.h" #include "virfile.h" #include "storage_backend_vstorage.h" #include "virlog.h" -#include "virstring.h" #include "virutil.h" #include #include diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e3e1604311..8dc2cfa7c9 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -45,8 +45,6 @@ #include "virfdstream.h" #include "virpidfile.h" #include "configmake.h" -#include "virsecret.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "storage_util.h" #include "virutil.h" diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f543dc9f3d..6ed2078b65 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -47,9 +47,7 @@ #include "virerror.h" #include "viralloc.h" #include "internal.h" -#include "secret_conf.h" #include "virsecret.h" -#include "vircrypto.h" #include "viruuid.h" #include "virstoragefile.h" #include "storage_file_probe.h" @@ -59,7 +57,6 @@ #include "virlog.h" #include "virfile.h" #include "viridentity.h" -#include "virjson.h" #include "virqemu.h" #include "virstring.h" #include "virxml.h" diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index aa3c25e9fc..70b5d4e94d 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -22,7 +22,6 @@ =20 #include "internal.h" #include "vircommand.h" -#include "storage_driver.h" #include "storage_backend.h" =20 /* Storage Pool Namespace options to share w/ storage_backend_fs.c and --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277487332126.98549498436853; Wed, 11 May 2022 06:58:07 -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-554-dRhcqJFhOAWIzXSc-PZzKQ-1; Wed, 11 May 2022 09:57:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4631D28B8453; Wed, 11 May 2022 13:57:19 +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 3232114C3039; Wed, 11 May 2022 13:57:19 +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 BF9DA19376A0; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A017F1932201 for ; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D4BC20296AC; Wed, 11 May 2022 13:57:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 780A720296A7 for ; Wed, 11 May 2022 13:57:13 +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 35B97804199 for ; Wed, 11 May 2022 13:57:13 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-LxN9YxXwPHW_RiSkrf9Mvg-1; Wed, 11 May 2022 09:57:11 -0400 Received: by mail-pg1-f175.google.com with SMTP id a19so1655368pgw.6 for ; Wed, 11 May 2022 06:57:10 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:09 -0700 (PDT) X-MC-Unique: dRhcqJFhOAWIzXSc-PZzKQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: LxN9YxXwPHW_RiSkrf9Mvg-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=DEXV1hxwFj8uf+8V5lZAipMUbhXnMXFKCP1uan3s2d4=; b=ZblOCdMi3Ii5FplaLVORaeY3x/zh4gSE15TuGXt21hiQtxWSp3rSk8huE+Qw1+skHv 14p/hru3Ltb90MtcCWcsMW+LKXKuY7hJ8bPJEpW+mTkxQ70KQhNy8bB0fJRlV4m3PPr4 QuLAcmo0mOzk6BfewH0PCdXBmvkihtsnw64y1TydV1XmbTXk2Jaz1hhifuGhaBxylMlP 16b0wzwQVVyOOgyI0LENbVw+i9ZEGb4pSGrtrvEf4B3HssdXaX+7iivBEbw7hZ6gd9JZ yvKtz8F4/WycDwqGc5R07fMh3aZjNXF5S9XFVrw5c/Kr8Ry0GFS7WtLFEgPW5x0AUd56 YDXA== X-Gm-Message-State: AOAM531LEtZuEhcw0CruBti8zCMpIgtD/L7FnWnU+4Ibj9jH4Elmakwd cMq15DrBhryVf3lgwUD9uW8NZDMqh3RajeAu X-Google-Smtp-Source: ABdhPJzOxorV9SQYjtBAzHSitrdJ3ww126vqcIfB3UzOE5Jwpy8OCBoU9YV4XhO3CCcen8gBgo6V9A== X-Received: by 2002:a63:88c8:0:b0:3ab:1871:13b4 with SMTP id l191-20020a6388c8000000b003ab187113b4mr21193147pgd.85.1652277429701; Wed, 11 May 2022 06:57:09 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 22/29] storage_file: Remove unused includes Date: Wed, 11 May 2022 21:55:23 +0800 Message-Id: <20220511135530.951850-23-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.78 on 10.11.54.4 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.7 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: 1652277487893100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/storage_file/storage_file_backend.c | 2 -- src/storage_file/storage_file_backend_fs.c | 5 ----- src/storage_file/storage_file_backend_gluster.c | 2 -- src/storage_file/storage_source.c | 3 --- 4 files changed, 12 deletions(-) diff --git a/src/storage_file/storage_file_backend.c b/src/storage_file/sto= rage_file_backend.c index d63b6a7502..94944ea356 100644 --- a/src/storage_file/storage_file_backend.c +++ b/src/storage_file/storage_file_backend.c @@ -23,9 +23,7 @@ =20 #include =20 -#include "datatypes.h" #include "virerror.h" -#include "viralloc.h" #include "internal.h" #include "storage_file_backend.h" #include "virlog.h" diff --git a/src/storage_file/storage_file_backend_fs.c b/src/storage_file/= storage_file_backend_fs.c index 581261f1cc..a67b2d1f77 100644 --- a/src/storage_file/storage_file_backend_fs.c +++ b/src/storage_file/storage_file_backend_fs.c @@ -27,13 +27,8 @@ #include "virerror.h" #include "storage_file_backend.h" #include "storage_file_backend_fs.h" -#include "storage_util.h" -#include "vircommand.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" -#include "virstring.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 diff --git a/src/storage_file/storage_file_backend_gluster.c b/src/storage_= file/storage_file_backend_gluster.c index 2aee61bf33..72341cf2c5 100644 --- a/src/storage_file/storage_file_backend_gluster.c +++ b/src/storage_file/storage_file_backend_gluster.c @@ -28,8 +28,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstoragefile.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_s= ource.c index 698b9eb79d..a25ce39fc9 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -32,12 +32,9 @@ #include "viralloc.h" #include "virerror.h" #include "virfile.h" -#include "virhash.h" #include "virlog.h" #include "virobject.h" #include "virstoragefile.h" -#include "virstring.h" -#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 From nobody Fri Apr 19 11:59:49 2024 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 1652277450894437.8372313889091; Wed, 11 May 2022 06:57:30 -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-170-zLr4e705NyiFnseq6FND9A-1; Wed, 11 May 2022 09:57:25 -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 89E361C0012F; Wed, 11 May 2022 13:57:21 +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 74D894411C7; Wed, 11 May 2022 13:57:21 +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 489CA1947B84; Wed, 11 May 2022 13:57:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7FAE4193F6F3 for ; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 70F1F40CF8EB; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 699D540CF8E4 for ; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 513A13C161B0 for ; Wed, 11 May 2022 13:57:18 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-3-_OlwZrX6MZmaIdFXqRHEfw-1; Wed, 11 May 2022 09:57:16 -0400 Received: by mail-pf1-f180.google.com with SMTP id c14so2076567pfn.2 for ; Wed, 11 May 2022 06:57:16 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:14 -0700 (PDT) X-MC-Unique: zLr4e705NyiFnseq6FND9A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: _OlwZrX6MZmaIdFXqRHEfw-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=9GfTiGYYAkBbEGdw5Xn6POBBhKeoXKrn7wyb56EoezE=; b=lTD6+X1x48p7UT/hVGCpqiLVX54BUghatO2g9K7mblZ8JdrStOStUEEFJt5fFFLFDE 3MHkrrFrSMYXNxlEa0NViSJeIFWqCloHjH8oGL2+FMfzU+L0Dv4tKPoJnXULuMkevZZP LaRXdjcUeT4ERDOK8jH4QPiMYVh+hfH1k7Wgaeq8b2qoP2SORQ+FjDDilMohhWU05hoL l2xVwzN+mXsAjrpn3dyRtuLOwka9KuukbdOhjS0y1eRNFLJI58/yUEXHdlKZd6P2erz8 18l4xpXrmpc16DqUN3IKwyZPuGmTRYXgQQoJOQ0gGbH36yd6mHUJqXIZNVs94HXt5gvI Zg4Q== X-Gm-Message-State: AOAM532JCTupRV11MILFDET22Z/q87P6FC5U348aK2Ra73VZbsYMDFR6 FW/jvJPyCYMWPNfgIZE9JKSC25iGbUJKU4EP X-Google-Smtp-Source: ABdhPJxarbGW7U5jP8cxedKG6JA1kirY0naPx0HUKhcwCyOQAupeZV5n+yuKJ2kX51plDjiPIyp64Q== X-Received: by 2002:a63:3:0:b0:3c3:79e4:156 with SMTP id 3-20020a630003000000b003c379e40156mr20738418pga.506.1652277435059; Wed, 11 May 2022 06:57:15 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 24/29] vbox: Remove unused includes Date: Wed, 11 May 2022 21:55:25 +0800 Message-Id: <20220511135530.951850-25-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.1 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: 1652277451210100002 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/vbox/vbox_XPCOMCGlue.c | 3 --- src/vbox/vbox_common.h | 1 - src/vbox/vbox_driver.c | 2 -- src/vbox/vbox_driver.h | 2 -- src/vbox/vbox_get_driver.h | 2 -- src/vbox/vbox_network.c | 2 -- src/vbox/vbox_storage.c | 3 --- src/vbox/vbox_tmpl.c | 1 - src/vbox/vbox_uniformed_api.h | 2 -- 9 files changed, 18 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index d7b4ae9aad..77a3041612 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -34,11 +34,8 @@ #include "vbox_XPCOMCGlue.h" #include "internal.h" #include "viralloc.h" -#include "virutil.h" #include "virlog.h" -#include "virerror.h" #include "virfile.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_VBOX =20 diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index 1fb922aaf0..ce66c7aa7b 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -23,7 +23,6 @@ # error this file should not be included after vbox_CAPI_v*.h #endif =20 -#include "internal.h" #include #include "wchar.h" =20 diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 740af56a13..c64b1b3e43 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -38,8 +38,6 @@ #include "vbox_driver.h" #include "vbox_XPCOMCGlue.h" #include "virerror.h" -#include "domain_event.h" -#include "domain_conf.h" =20 #include "vbox_get_driver.h" =20 diff --git a/src/vbox/vbox_driver.h b/src/vbox/vbox_driver.h index bcbdf12bc9..bd53e8ee10 100644 --- a/src/vbox/vbox_driver.h +++ b/src/vbox/vbox_driver.h @@ -24,8 +24,6 @@ =20 #pragma once =20 -#include "internal.h" - #if defined(VBOX_NETWORK_DRIVER) int vboxNetworkRegister(void); #endif diff --git a/src/vbox/vbox_get_driver.h b/src/vbox/vbox_get_driver.h index 84b5d03bd9..edfae770dc 100644 --- a/src/vbox/vbox_get_driver.h +++ b/src/vbox/vbox_get_driver.h @@ -18,8 +18,6 @@ =20 #pragma once =20 -#include "internal.h" - virHypervisorDriver *vboxGetHypervisorDriver(uint32_t uVersion); virNetworkDriver *vboxGetNetworkDriver(uint32_t uVersion); virStorageDriver *vboxGetStorageDriver(uint32_t uVersion); diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 9c27ccda56..f687ebbf1a 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -22,10 +22,8 @@ =20 #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" #include "domain_event.h" #include "virlog.h" -#include "virstring.h" #include "viralloc.h" #include "network_conf.h" =20 diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 10eb35c654..be609033e1 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -22,10 +22,7 @@ =20 #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" -#include "domain_event.h" #include "virlog.h" -#include "virstring.h" #include "storage_conf.h" #include "virutil.h" =20 diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 7344882bbd..52b1c93b6d 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -42,7 +42,6 @@ #include "viralloc.h" #include "virlog.h" #include "virstring.h" -#include "virutil.h" =20 /* This one changes from version to version. */ #if VBOX_API_VERSION =3D=3D 5002000 diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 18f352d98e..c805ce03b2 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -18,8 +18,6 @@ =20 #pragma once =20 -#include "internal.h" - /* This file may be used in three place. That is vbox_tmpl.c, * vbox_common.c and vbox_driver.c. The vboxUniformedAPI and some * types used for vboxUniformedAPI is defined here. --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 1652277449524953.2388350227862; Wed, 11 May 2022 06:57:29 -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-216-86EDFDg4OLSYV3M6czdlFw-1; Wed, 11 May 2022 09:57:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E387B1C00144; Wed, 11 May 2022 13:57:21 +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 BEF4A1121319; Wed, 11 May 2022 13:57:21 +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 5F09E1932202; Wed, 11 May 2022 13:57:21 +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 327A91937429 for ; Wed, 11 May 2022 13:57:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 117CE40D2821; Wed, 11 May 2022 13:57:20 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D01440D2820 for ; Wed, 11 May 2022 13:57:20 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 EA91C28B8445 for ; Wed, 11 May 2022 13:57:19 +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-sSjJCkQkPtmziUnZGSPg7A-2; Wed, 11 May 2022 09:57:18 -0400 Received: by mail-pj1-f44.google.com with SMTP id e24so2323528pjt.2 for ; Wed, 11 May 2022 06:57:18 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:17 -0700 (PDT) X-MC-Unique: 86EDFDg4OLSYV3M6czdlFw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: sSjJCkQkPtmziUnZGSPg7A-2 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=AOuzComFJVnCsAxvqMfQ9JoFrK0jV87UzX2fGnziaNU=; b=S9jKeUxOIQcvm9Ta5DwVYyZia37mUvY7Bk7hiX7RgMER7NT75z0t0NQ/r4P7qLRIA1 WLiSc53ZAP1e5AJvFiPAwr6riXQajvIyKwalDIGe+zQG2xhxs8G2weZmm7d5coP2Nonn 4vd1C4hmCkdQbCixxvG1Xwz5jXU2AJ1tYx+vtvxf8VEaNJK/DyB3J8AuRBGGqdvSzqxG nlLO1n9OB6UK5dxA5swnA8bReXdx5TWyU7DKzPXBAGQfhvKXWXFZXaUhjM5vfujmpbCe ai9nZHvTeWBvieQhXulOD8MhyWMSKwQrHB80Sk1Vo9e9Ugn6sV/5+RkTZco/mU4i4vK9 EHAQ== X-Gm-Message-State: AOAM530XICiuO6CVsDSG2j+m+aGW4CHhbrZ791BXNfdLEPSEp75bRTGU RoM9gHBctePlxX4gTqoGCVXqfl2rHyKRIGU0 X-Google-Smtp-Source: ABdhPJxyXgOno60gUACbuVT7ChfwM1MqihGb3aJA3jJdfVyGZVyK/fyPLltifAaIhmtxTJS+7kCgQw== X-Received: by 2002:a17:903:240f:b0:158:b871:33ac with SMTP id e15-20020a170903240f00b00158b87133acmr25187984plo.135.1652277437556; Wed, 11 May 2022 06:57:17 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 25/29] vmware: Remove unused includes Date: Wed, 11 May 2022 21:55:26 +0800 Message-Id: <20220511135530.951850-26-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.78 on 10.11.54.3 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: 1652277451190100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/vmware/vmware_conf.c | 1 - src/vmware/vmware_conf.h | 1 - src/vmware/vmware_driver.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..80a85f4d0f 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -26,7 +26,6 @@ #include "cpu/cpu.h" #include "viralloc.h" #include "virfile.h" -#include "viruuid.h" #include "virerror.h" #include "vmx.h" #include "vmware_conf.h" diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index d91b84f38f..5c3eaa9219 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -22,7 +22,6 @@ =20 #define NOGUI "nogui" =20 -#include "internal.h" #include "virdomainobjlist.h" #include "virthread.h" #include "virenum.h" diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index da66f98db0..2a18d73988 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -34,7 +34,6 @@ #include "vmx.h" #include "vmware_conf.h" #include "vmware_driver.h" -#include "virstring.h" =20 /* Various places we may find the "vmrun" binary, * without a leading / it will be searched in PATH --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277453731335.0875714889032; Wed, 11 May 2022 06:57:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-IHzIZ61VM_WRQuudftqN3w-1; Wed, 11 May 2022 09:57:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF22C100BAB1; Wed, 11 May 2022 13:57:25 +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 D9D922026D64; Wed, 11 May 2022 13:57:25 +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 A3B82193F6F7; Wed, 11 May 2022 13:57:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D59DE194707B for ; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C4BDA1121315; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0FCC1121314 for ; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 4B85C100BAB4 for ; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-wXLIpM7FNbenATUjuBGAVQ-1; Wed, 11 May 2022 09:57:22 -0400 Received: by mail-pf1-f172.google.com with SMTP id j6so2034517pfe.13 for ; Wed, 11 May 2022 06:57:21 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:19 -0700 (PDT) X-MC-Unique: IHzIZ61VM_WRQuudftqN3w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: wXLIpM7FNbenATUjuBGAVQ-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=VAd/tQ/M4DHEOhZPvlmg3NWvJ+WeXl4RqsobF9NHImE=; b=3Af/pGq/YkNVyOVnWdCH5oz2FA7cz5/lT+7SfrRMnd8KROhrfbmfcgAPacNMx+rDbY RU+YmfOSrrDPGbjhD3GvHH/iC2qosfNPWmYJBSnRh71CFMQx70XBN5yhLxNbBaARvswD jzc3NZby7HTI9gp0+WJqSNFFdymk70bHRasqGaULTeWrisuzt7WnQN6AirG1j3xWAgom i/m4gqSmC6IgW67D4GEnEPcMVfxw60q0jZ5/lVwP8mezCjn8VmrScPAfMcCaSPSrAeYV Tu3cwoHKDaRkwUWDVBx0h3YAmESkLpFHB8wK8g0RTjoSBQejLP2aX8yWw1e8EOIcl7bb lEhQ== X-Gm-Message-State: AOAM533qOzvvq4bSS+WWf8L2tvMQ0Wtb9OoyenT8jm5q34UhuKaUo/i5 GY3UxtakISY0gNm0AKYIiwmMAdOXk2ZMXjPw X-Google-Smtp-Source: ABdhPJzPcNW/5co3RtbhKfID9cTdGYH6vJPITDatdWQ4HvTPr3aN4yVAgHlGWRVAUiTrfB6Pf7oWOA== X-Received: by 2002:a63:b45:0:b0:3c1:9a7c:8cb2 with SMTP id a5-20020a630b45000000b003c19a7c8cb2mr20895500pgl.197.1652277440052; Wed, 11 May 2022 06:57:20 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 26/29] vmx: Remove unused includes Date: Wed, 11 May 2022 21:55:27 +0800 Message-Id: <20220511135530.951850-27-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.78 on 10.11.54.3 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.78 on 10.11.54.4 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: 1652277455199100007 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/vmx/vmx.c | 1 - src/vmx/vmx.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 8150bbfaa9..ac4f068a67 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -24,7 +24,6 @@ =20 #include "internal.h" #include "virerror.h" -#include "virfile.h" #include "virconf.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index f05c7db33a..7acd03e5c7 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -21,8 +21,6 @@ =20 #pragma once =20 -#include "internal.h" -#include "virconf.h" #include "domain_conf.h" =20 #define VMX_CONFIG_FORMAT_ARGV "vmware-vmx" --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277451813697.8902955838987; Wed, 11 May 2022 06:57:31 -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-261-lP9cYekpPp2CP26anwxCcw-1; Wed, 11 May 2022 09:57:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 64A703C1E344; Wed, 11 May 2022 13:57:27 +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 1B7F01121315; Wed, 11 May 2022 13:57:27 +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 BBFE419376A0; Wed, 11 May 2022 13:57:26 +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 17C2A193F6F6 for ; Wed, 11 May 2022 13:57:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E40EE4010A1B; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E004F4010E23 for ; Wed, 11 May 2022 13:57:24 +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 C9BEA1801387 for ; Wed, 11 May 2022 13:57:24 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-5-xanZ6RGhO4OgmA-QArbB0Q-2; Wed, 11 May 2022 09:57:23 -0400 Received: by mail-pg1-f175.google.com with SMTP id v10so1846459pgl.11 for ; Wed, 11 May 2022 06:57:23 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:22 -0700 (PDT) X-MC-Unique: lP9cYekpPp2CP26anwxCcw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: xanZ6RGhO4OgmA-QArbB0Q-2 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=eL7KFx4x4QMQ2w0gMXzNR+CxV5hfcsr+zdUt+komthQ=; b=zjDQtKED7CaSZA/CZiIC/UU1z2obQNfMWYiTBqEW3HTykreS/5nafssxNyprAhfJdK XwSmr3gNobSVKw9JS0KEjDJ9paxH3a85FUkxEI4+fLaOTxlgofHAQ2VrBE/jEX16Qugq UmvYYWK88YKrHTZwanLGLOfFH+xZwfvKraaEKM5xXMkujgcJy30hLId7wACe9rVNZdth p65Unp/WhPvnBc1enNa8hGltHEs2w6+B4SahEDpGd86o1eIkiDMdlgZ1o7Gcjf4F0BE2 kcj7GtvoVzSXuao1az7cSe4RHO5kX9XzOJens34uKOaB67qnJuOeODEcbb5h8gv9C7gP ANDw== X-Gm-Message-State: AOAM533BC2QjhKq5sZj0LwXay2C86EPVw2py5XjkHCHSK+EZYjs1ln/n 29l0SCdcXgbSxmcMiMEXtHjBa6BhYvlY0W6E X-Google-Smtp-Source: ABdhPJxAMlrxlEUYJaNIpw+0t9p3m7QZKX/FrzzPbNLouEH9axumyGA9ajfFK8IM5zV12DqTpBge7Q== X-Received: by 2002:a63:86c6:0:b0:3ab:2c2c:42e9 with SMTP id x189-20020a6386c6000000b003ab2c2c42e9mr20689071pgd.230.1652277442508; Wed, 11 May 2022 06:57:22 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 27/29] test_driver: Remove unused includes Date: Wed, 11 May 2022 21:55:28 +0800 Message-Id: <20220511135530.951850-28-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.78 on 10.11.54.3 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: 1652277453163100005 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- src/test/test_driver.c | 2 -- src/test/test_driver.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a824ef0186..24ff6e8967 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -31,7 +31,6 @@ #include "virerror.h" #include "datatypes.h" #include "test_driver.h" -#include "virbuffer.h" #include "viruuid.h" #include "capabilities.h" #include "configmake.h" @@ -56,7 +55,6 @@ #include "virlog.h" #include "virfile.h" #include "virtypedparam.h" -#include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" #include "virauth.h" diff --git a/src/test/test_driver.h b/src/test/test_driver.h index 8c8a462db7..c7821b1975 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -21,6 +21,4 @@ =20 #pragma once =20 -#include "internal.h" - int testRegister(void); --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 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 165227745813761.84639291535416; Wed, 11 May 2022 06:57:38 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-300-E2p6RKvwNDqrf-6UYuV_9g-1; Wed, 11 May 2022 09:57:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6C1C100BAB5; Wed, 11 May 2022 13:57:31 +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 D1724401E74; Wed, 11 May 2022 13:57:31 +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 B34041932208; Wed, 11 May 2022 13:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BDEA91947B84 for ; Wed, 11 May 2022 13:57:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B361D1121315; Wed, 11 May 2022 13:57:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF4D31121314 for ; Wed, 11 May 2022 13:57:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 940B6811E90 for ; Wed, 11 May 2022 13:57:29 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-97S6N5ykPFy8-v-ftISs3A-1; Wed, 11 May 2022 09:57:26 -0400 Received: by mail-pf1-f182.google.com with SMTP id d25so2046165pfo.10 for ; Wed, 11 May 2022 06:57:26 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:24 -0700 (PDT) X-MC-Unique: E2p6RKvwNDqrf-6UYuV_9g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 97S6N5ykPFy8-v-ftISs3A-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=cLTnnIdRrvduwdrP1CF9DvDoOrVZjHL/kzI0/nDw1hc=; b=suW3UhnGWkzPdNiiNwoPYTEARv1Lewepp0EB5Vjj80Tad53bWL8H+m32+4uAo03T4/ Jc+XYAeqrA6pNhmJA0t8RX+eM93LJxegFmGURSWK6xvAmp8wN8/C7wrjVKlLyogdjlxc 7WGNx7NVAMcdY/gVAAUhx9sjOHZyAQWjTQDMZRYoYFywwcWcDa2yTu1MNTJFfN3ehZ9p RUUJI+cGEtkHoXQBTS/pl6RXeu6YWUfouiZBBZ/OE93BpsCnxjHQZJbB+RHtGmSksJUL CwuhVMS260ldhbVy9A7ekc8bRDKADuB/NMEePl5diUe1FSIzDzu7qSBp07hgDYOPUphO jhLQ== X-Gm-Message-State: AOAM5312P2HjD+XqbWuokDl5Sv6zTz2Jfck3ql33ifjIBUCSDoAxpGTt yEMOh50FBSv9bQQxVJ9Cj5C1QZH/Y/ClifME X-Google-Smtp-Source: ABdhPJxIeymnzyFv7rJAD/HNY3+mw+dShWF2PB5XmAKKyHcrM1d6uncn0fgl0pvcYUExXhAo91crww== X-Received: by 2002:a62:a516:0:b0:505:722e:15d5 with SMTP id v22-20020a62a516000000b00505722e15d5mr25591035pfm.52.1652277444919; Wed, 11 May 2022 06:57:24 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 28/29] tools: Remove unused includes Date: Wed, 11 May 2022 21:55:29 +0800 Message-Id: <20220511135530.951850-29-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.78 on 10.11.54.3 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.10 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: 1652277459322100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- tools/virsh-checkpoint.c | 2 -- tools/virsh-completer-checkpoint.c | 2 -- tools/virsh-completer-domain.c | 1 - tools/virsh-completer-host.c | 1 - tools/virsh-completer-interface.c | 2 -- tools/virsh-completer-network.c | 1 - tools/virsh-completer-nodedev.c | 2 -- tools/virsh-completer-nwfilter.c | 2 -- tools/virsh-completer-pool.c | 2 -- tools/virsh-completer-secret.c | 2 -- tools/virsh-completer-snapshot.c | 2 -- tools/virsh-completer-volume.c | 2 -- tools/virsh-completer.c | 2 -- tools/virsh-console.c | 1 - tools/virsh-domain-event.c | 2 -- tools/virsh-domain.c | 1 - tools/virsh-nodedev.c | 1 - tools/virsh-pool.c | 1 - tools/virsh-snapshot.c | 1 - tools/virsh-util.c | 1 - tools/virsh.c | 4 ---- tools/virsh.h | 2 -- tools/virt-admin.c | 1 - tools/virt-admin.h | 1 - tools/virt-host-validate-common.h | 1 - tools/vsh.h | 1 - 26 files changed, 41 deletions(-) diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 8ad37ece69..ee04418bc0 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -33,9 +33,7 @@ #include "viralloc.h" #include "virfile.h" #include "virsh-util.h" -#include "virstring.h" #include "virxml.h" -#include "conf/checkpoint_conf.h" #include "vsh-table.h" =20 /* Helper for checkpoint-create and checkpoint-create-as */ diff --git a/tools/virsh-completer-checkpoint.c b/tools/virsh-completer-che= ckpoint.c index b6d6c93e85..bdd3a4d850 100644 --- a/tools/virsh-completer-checkpoint.c +++ b/tools/virsh-completer-checkpoint.c @@ -21,10 +21,8 @@ #include =20 #include "virsh-completer-checkpoint.h" -#include "viralloc.h" #include "virsh-util.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshCheckpointNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index d4c877cd04..b54baf3577 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -27,7 +27,6 @@ #include "virsh-domain-monitor.h" #include "virsh-util.h" #include "virsh.h" -#include "virstring.h" #include "virxml.h" #include "virperf.h" #include "virbitmap.h" diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 68bc6cfe25..05a84a43bb 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -21,7 +21,6 @@ #include =20 #include "virsh-completer-host.h" -#include "viralloc.h" #include "virsh.h" #include "virstring.h" #include "virxml.h" diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-inte= rface.c index 44ba35550a..72a32dcfe3 100644 --- a/tools/virsh-completer-interface.c +++ b/tools/virsh-completer-interface.c @@ -22,9 +22,7 @@ =20 #include "virsh-completer-interface.h" #include "virsh-util.h" -#include "viralloc.h" #include "virsh.h" -#include "virstring.h" =20 typedef const char * (*virInterfaceStringCallback)(virInterfacePtr iface); diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-networ= k.c index 839d71e961..f28d724ca8 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -25,7 +25,6 @@ #include "viralloc.h" #include "virsh-network.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshNetworkNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodede= v.c index 57544da15d..d743df460e 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -24,10 +24,8 @@ #include "virsh-util.h" #include "conf/node_device_conf.h" #include "conf/domain_conf.h" -#include "viralloc.h" #include "virsh-nodedev.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshNodeDeviceNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfil= ter.c index 9850dbba5d..3a0ddecead 100644 --- a/tools/virsh-completer-nwfilter.c +++ b/tools/virsh-completer-nwfilter.c @@ -22,9 +22,7 @@ =20 #include "virsh-completer-nwfilter.h" #include "virsh-util.h" -#include "viralloc.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshNWFilterNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index 1a966d95b9..0600394411 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -23,10 +23,8 @@ #include "virsh-completer-pool.h" #include "virsh-util.h" #include "conf/storage_conf.h" -#include "viralloc.h" #include "virsh-pool.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshStoragePoolNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index 396997244d..f31127d0ce 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -21,11 +21,9 @@ #include =20 #include "virsh-completer-secret.h" -#include "viralloc.h" #include "virsh-secret.h" #include "virsh-util.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshSecretUUIDCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-snapshot.c b/tools/virsh-completer-snaps= hot.c index 535841cf2e..c7974d715c 100644 --- a/tools/virsh-completer-snapshot.c +++ b/tools/virsh-completer-snapshot.c @@ -21,10 +21,8 @@ #include =20 #include "virsh-completer-snapshot.h" -#include "viralloc.h" #include "virsh-util.h" #include "virsh.h" -#include "virstring.h" =20 char ** virshSnapshotNameCompleter(vshControl *ctl, diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index a1ebadccac..9a80112e59 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -22,10 +22,8 @@ =20 #include "virsh-completer-volume.h" #include "virsh-util.h" -#include "viralloc.h" #include "virsh-pool.h" #include "virsh.h" -#include "virstring.h" #include "virsh-volume.h" =20 char ** diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index e5610d0fe8..d4defba86e 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -21,8 +21,6 @@ #include =20 #include "virsh-completer.h" -#include "viralloc.h" -#include "virstring.h" =20 /** * A completer callback is a function that accepts three arguments: diff --git a/tools/virsh-console.c b/tools/virsh-console.c index b8780c714d..13ee811a92 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -35,7 +35,6 @@ # include "virsh-console.h" # include "virsh-util.h" # include "virlog.h" -# include "virfile.h" # include "viralloc.h" # include "virthread.h" # include "virerror.h" diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 6dbb64a655..8a4ffca6f6 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -17,13 +17,11 @@ */ =20 #include -#include "virsh-domain-event.h" #include "virsh-util.h" =20 #include "internal.h" #include "viralloc.h" #include "virenum.h" -#include "virutil.h" #include "virtime.h" #include "virtypedparam.h" =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ba492e807e..8b3bca281e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -44,7 +44,6 @@ #include "virsh-console.h" #include "virsh-domain-monitor.h" #include "virsh-host.h" -#include "virerror.h" #include "virtime.h" #include "virtypedparam.h" #include "virxml.h" diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 90066249af..1be912dd54 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -26,7 +26,6 @@ #include "internal.h" #include "viralloc.h" #include "virfile.h" -#include "virstring.h" #include "virtime.h" #include "conf/node_device_conf.h" #include "virenum.h" diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 7e7a8d511f..5fdc78470b 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -27,7 +27,6 @@ #include "viralloc.h" #include "virfile.h" #include "conf/storage_conf.h" -#include "virstring.h" #include "virtime.h" #include "vsh-table.h" #include "virenum.h" diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 7cd76f39e2..47a96e082b 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -31,7 +31,6 @@ #include "viralloc.h" #include "virfile.h" #include "virsh-util.h" -#include "virstring.h" #include "virxml.h" #include "conf/virdomainsnapshotobjlist.h" #include "vsh-table.h" diff --git a/tools/virsh-util.c b/tools/virsh-util.c index dc6ed7a86d..ef275a4369 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -22,7 +22,6 @@ =20 #include "virfile.h" #include "virstring.h" -#include "viralloc.h" #include "virxml.h" =20 static virDomainPtr diff --git a/tools/virsh.c b/tools/virsh.c index f7adb90be8..beee1dbe6b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -32,18 +32,14 @@ =20 #include "internal.h" #include "virerror.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "virthread.h" -#include "vircommand.h" -#include "virtypedparam.h" #include "virstring.h" #include "virgettext.h" =20 #include "virsh-backup.h" #include "virsh-checkpoint.h" -#include "virsh-console.h" #include "virsh-domain.h" #include "virsh-domain-event.h" #include "virsh-domain-monitor.h" diff --git a/tools/virsh.h b/tools/virsh.h index d7a60b135d..f9841c8da2 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -23,8 +23,6 @@ #include =20 #include "internal.h" -#include "virerror.h" -#include "virthread.h" #include "virpolkit.h" #include "vsh.h" #include "virsh-completer.h" diff --git a/tools/virt-admin.c b/tools/virt-admin.c index e010763e21..952999ca3c 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -32,7 +32,6 @@ #include "virstring.h" #include "virthread.h" #include "virgettext.h" -#include "virtime.h" #include "virt-admin-completer.h" #include "vsh-table.h" #include "virenum.h" diff --git a/tools/virt-admin.h b/tools/virt-admin.h index 81f5937eed..8ee84729d6 100644 --- a/tools/virt-admin.h +++ b/tools/virt-admin.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "internal.h" #include "vsh.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-c= ommon.h index 9334fa8588..acc45d1039 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -21,7 +21,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virbitmap.h" #include "virenum.h" =20 diff --git a/tools/vsh.h b/tools/vsh.h index 663dc1ffce..a43660b63d 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -26,7 +26,6 @@ #endif =20 #include "internal.h" -#include "virerror.h" #include "virthread.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE --=20 2.36.1 From nobody Fri Apr 19 11:59:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1652277461179960.2189670874897; Wed, 11 May 2022 06:57:41 -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-269-Hy2LbYADOTqjfsUJiuf0oQ-1; Wed, 11 May 2022 09:57:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79A1428B8441; Wed, 11 May 2022 13:57:33 +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 5FA3214C3B37; Wed, 11 May 2022 13:57:33 +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 45948194975B; Wed, 11 May 2022 13:57:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 70B20194975B for ; Wed, 11 May 2022 13:57:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 65E0E40CF8F0; Wed, 11 May 2022 13:57:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DB1C40CF8F9 for ; Wed, 11 May 2022 13:57:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 3A97F80159B for ; Wed, 11 May 2022 13:57:32 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-nskkkvYSNu68gHADnWah2A-1; Wed, 11 May 2022 09:57:30 -0400 Received: by mail-pg1-f179.google.com with SMTP id 7so1848562pga.12 for ; Wed, 11 May 2022 06:57:30 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 06:57:27 -0700 (PDT) X-MC-Unique: Hy2LbYADOTqjfsUJiuf0oQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: nskkkvYSNu68gHADnWah2A-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=38K9lLpFR86C0my33O3rMSWsr6MA6tvC5mm/hXX0ksI=; b=kwdjtp3mrfmxuzxbwe0rsbVV6n7rxPoKAg2Ubxm8JK8qcj9ygk9S4pvZEBFhSVvqow zz8OB6KQZz4G+l/HBiR9ZDPwKyMan4Rk5hF7OIrkB5GEjbvyasqL14VC0AAxzk6/sEFU KtLLqk9Eckp9CxmFvBcoDjPr3XK+2f8E27bmzFRTMD1gWTjTVcMU2ihB/0L9RTXgPl7B Ef9WAofS98m7HmQBzCrk0PGVndBihkei2xZ8uE1xt/Qj+Q9NgRK3NeKLqdTmG399mwDf s5OcVT3l/SiPje2vJWfKG8pOpG8PdnxjS7znAFPleZya3qmjZKb7tAH+AtPL4DX+xYW+ 1O5A== X-Gm-Message-State: AOAM530/cCFT3dw3hf16IJsErE2oBJlzxlgqdrcYlkBOrbWQGsCUbPb7 aATBfQ14t3iGeT0YODyr7mzu46LM42l/81dz X-Google-Smtp-Source: ABdhPJwJ1qYPwfSuSXhU7cPR9VLXMR2UMluPPD7apvmOuVsByQqHcppiU3yA0qj2Uy/gQyxHTRNzsw== X-Received: by 2002:a65:6e0b:0:b0:3aa:6146:15a8 with SMTP id bd11-20020a656e0b000000b003aa614615a8mr20672393pgb.181.1652277448004; Wed, 11 May 2022 06:57:28 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH 29/29] tests: Remove unused includes Date: Wed, 11 May 2022 21:55:30 +0800 Message-Id: <20220511135530.951850-30-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.1 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.7 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: 1652277464429100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Adam Tao Signed-off-by: Peng Liang --- tests/commandtest.c | 2 -- tests/cputest.c | 2 -- tests/domainconftest.c | 2 -- tests/esxutilstest.c | 1 - tests/eventtest.c | 2 -- tests/fchosttest.c | 1 - tests/fdstreamtest.c | 3 --- tests/genericxml2xmltest.c | 2 -- tests/interfacexml2xmltest.c | 2 -- tests/libxlmock.c | 2 -- tests/libxlxml2domconfigtest.c | 6 ------ tests/lxcxml2xmltest.c | 2 -- tests/networkxml2conftest.c | 2 -- tests/networkxml2firewalltest.c | 2 -- tests/networkxml2xmltest.c | 3 --- tests/networkxml2xmlupdatetest.c | 3 --- tests/nodedevmdevctltest.c | 2 -- tests/nodedevxml2xmltest.c | 3 --- tests/nssmock.c | 2 -- tests/nsstest.c | 1 - tests/nwfilterebiptablestest.c | 1 - tests/nwfilterxml2firewalltest.c | 1 - tests/nwfilterxml2xmltest.c | 6 ------ tests/objecteventtest.c | 3 --- tests/openvzutilstest.c | 2 -- tests/qemuagenttest.c | 2 -- tests/qemublocktest.c | 4 ---- tests/qemucapsprobemock.c | 1 - tests/qemucommandutiltest.c | 1 - tests/qemucpumock.c | 1 - tests/qemudomaincheckpointxml2xmltest.c | 2 -- tests/qemudomainsnapshotxml2xmltest.c | 2 -- tests/qemuhotplugmock.c | 1 - tests/qemuhotplugtest.c | 3 --- tests/qemumemlocktest.c | 2 -- tests/qemumigparamstest.c | 1 - tests/qemumigrationcookiexmltest.c | 1 - tests/qemumonitorjsontest.c | 2 -- tests/qemumonitortestutils.c | 2 -- tests/qemumonitortestutils.h | 1 - tests/qemusecuritymock.c | 2 -- tests/qemuxml2argvmock.c | 5 ----- tests/qemuxml2argvtest.c | 8 -------- tests/qemuxml2xmltest.c | 3 --- tests/scsihosttest.c | 2 -- tests/seclabeltest.c | 1 - tests/secretxml2xmltest.c | 2 -- tests/securityselinuxhelper.c | 1 - tests/securityselinuxlabeltest.c | 2 -- tests/securityselinuxtest.c | 3 --- tests/sockettest.c | 1 - tests/storagebackendsheepdogtest.c | 1 - tests/storagepoolxml2argvtest.c | 4 ---- tests/storagepoolxml2xmltest.c | 3 --- tests/storagevolxml2argvtest.c | 4 ---- tests/storagevolxml2xmltest.c | 3 --- tests/sysinfotest.c | 1 - tests/testutils.c | 4 ---- tests/testutils.h | 1 - tests/testutilslxc.c | 1 - tests/testutilslxc.h | 2 -- tests/testutilsqemu.c | 1 - tests/utiltest.c | 1 - tests/virauthconfigtest.c | 2 -- tests/virbuftest.c | 2 -- tests/vircaps2xmltest.c | 1 - tests/vircgroupmock.c | 2 -- tests/vircgrouptest.c | 1 - tests/virconftest.c | 1 - tests/virdriverconnvalidatetest.c | 2 -- tests/virdrivermoduletest.c | 2 -- tests/virfilemock.c | 2 -- tests/virfiletest.c | 1 - tests/virfilewrapper.c | 2 -- tests/virfirewallmock.c | 1 - tests/virfirewalltest.c | 1 - tests/virhostcputest.c | 1 - tests/viridentitytest.c | 4 ---- tests/virkeycodetest.c | 4 ---- tests/virkmodtest.c | 1 - tests/virlockspacetest.c | 3 --- tests/virmigtest.c | 1 - tests/virmockstathelpers.c | 1 - tests/virnetdaemonmock.c | 1 - tests/virnetdevmock.c | 2 -- tests/virnetdevtest.c | 2 -- tests/virnetmessagetest.c | 2 -- tests/virnetserverclientmock.c | 1 - tests/virnetsockettest.c | 1 - tests/virnettlscontexttest.c | 5 ----- tests/virnettlshelpers.c | 1 - tests/virnettlssessiontest.c | 4 ---- tests/virnetworkportxml2xmltest.c | 2 -- tests/virnumamock.c | 3 --- tests/virnwfilterbindingxml2xmltest.c | 4 ---- tests/virpcimock.c | 1 - tests/virportallocatortest.c | 3 --- tests/virrandommock.c | 1 - tests/virschematest.c | 2 -- tests/virshtest.c | 2 -- tests/virstoragetest.c | 3 --- tests/virstorageutiltest.c | 3 --- tests/virstringtest.c | 3 --- tests/virtestmock.c | 2 -- tests/virtimetest.c | 2 -- tests/viruritest.c | 1 - tests/virusbmock.c | 3 --- tests/virusbtest.c | 2 -- tests/vmx2xmltest.c | 2 -- tests/vshtabletest.c | 1 - tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 2 -- tests/xml2vmxtest.c | 1 - 113 files changed, 238 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 74e60a072b..95d1bfa91b 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -35,8 +35,6 @@ #include "virfile.h" #include "virpidfile.h" #include "virerror.h" -#include "virthread.h" -#include "virstring.h" #include "virprocess.h" #include "virutil.h" =20 diff --git a/tests/cputest.c b/tests/cputest.c index ddf05b779b..b7ec79dfc6 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -33,8 +33,6 @@ #include "cpu_conf.h" #include "cpu/cpu.h" #include "cpu/cpu_x86.h" -#include "cpu/cpu_map.h" -#include "virstring.h" =20 #if WITH_QEMU # include "testutilsqemu.h" diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 14d84b0071..b483e1221a 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -19,8 +19,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" =20 #include "domain_conf.h" diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index db49dcd6e0..4591cf49db 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -7,7 +7,6 @@ # include =20 # include "internal.h" -# include "viralloc.h" # include "vmx/vmx.h" # include "esx/esx_util.h" # include "esx/esx_vi_types.h" diff --git a/tests/eventtest.c b/tests/eventtest.c index 1e93c70e74..470de4c630 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -31,10 +31,8 @@ #include "testutils.h" #include "internal.h" #include "virfile.h" -#include "virthread.h" #include "virlog.h" #include "virutil.h" -#include "virevent.h" =20 VIR_LOG_INIT("tests.eventtest"); =20 diff --git a/tests/fchosttest.c b/tests/fchosttest.c index dc1503e9a7..d050458a58 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -20,7 +20,6 @@ #include =20 #include "virlog.h" -#include "virstring.h" #include "virvhba.h" #include "testutils.h" =20 diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 96519e91c2..5e6b347949 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -24,10 +24,7 @@ =20 #include "virfdstream.h" #include "datatypes.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "virfile.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 87014e3e53..b5560e3a45 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -6,8 +6,6 @@ #include =20 #include "testutils.h" -#include "internal.h" -#include "virstring.h" #include "conf/backup_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 15fab88107..b23e0f589b 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -8,8 +8,6 @@ #include "internal.h" #include "testutils.h" #include "interface_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/libxlmock.c b/tests/libxlmock.c index a52d4bc2ed..0e4bf7df52 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -28,8 +28,6 @@ # include # include =20 -# include "virfile.h" -# include "virsocket.h" # include "libxl/libxl_capabilities.h" =20 VIR_MOCK_IMPL_RET_VOID(xs_daemon_open, diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 015597eb44..27783d0014 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -30,13 +30,7 @@ =20 #if defined(WITH_LIBXL) && defined(WITH_YAJL) =20 -# include "internal.h" -# include "viralloc.h" # include "libxl/libxl_conf.h" -# include "datatypes.h" -# include "virstring.h" -# include "virmock.h" -# include "virjson.h" # include "testutilsxen.h" =20 # define VIR_FROM_THIS VIR_FROM_LIBXL diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 8ab32acf42..e6e4989099 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -9,10 +9,8 @@ =20 #ifdef WITH_LXC =20 -# include "internal.h" # include "lxc/lxc_conf.h" # include "testutilslxc.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 0bc9e128e3..3141bff512 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -8,10 +8,8 @@ #include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "vircommand.h" #include "viralloc.h" #include "network/bridge_driver.h" -#include "virstring.h" #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" =20 diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 11be85e06f..2648115a12 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -22,7 +22,6 @@ #include =20 #include "testutils.h" -#include "viralloc.h" =20 #if defined (__linux__) =20 @@ -31,7 +30,6 @@ # include "network/bridge_driver_platform.h" # include "virbuffer.h" # include "virmock.h" -# include "virfirewall.h" =20 # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index ca24305ace..0c0ead9877 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -5,11 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" #include "network/bridge_driver.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index 4471b4dd9e..4ba6f08690 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -5,11 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "network_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index d660d4cc21..94579edc79 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -1,8 +1,6 @@ #include =20 -#include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "node_device/node_device_driver.h" #include "vircommand.h" #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 557347fb07..f24472bb6a 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -5,11 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "node_device_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/nssmock.c b/tests/nssmock.c index b1c1aba957..9ead6d8f97 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -27,8 +27,6 @@ # include =20 # include "configmake.h" -# include "virstring.h" -# include "viralloc.h" =20 static int (*real_open)(const char *path, int flags, ...); static DIR * (*real_opendir)(const char *name); diff --git a/tests/nsstest.c b/tests/nsstest.c index 2c2e57769b..e90d870b77 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -23,7 +23,6 @@ #ifdef WITH_NSS =20 # include "libvirt_nss.h" -# include "virsocket.h" =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 35c1c772ae..f76f13fd25 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -24,7 +24,6 @@ #include "testutils.h" #include "nwfilter/nwfilter_ebiptables_driver.h" #include "virbuffer.h" -#include "virfirewall.h" =20 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index ec37a4ae11..1514002b8f 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -26,7 +26,6 @@ # include "testutils.h" # include "nwfilter/nwfilter_ebiptables_driver.h" # include "virbuffer.h" -# include "virfirewall.h" =20 # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 7a7e05965b..ee7b9c243b 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -5,14 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" -#include "virxml.h" -#include "virthread.h" -#include "nwfilter_params.h" #include "nwfilter_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 5f63f6f5cb..7110f54139 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -23,9 +23,6 @@ =20 #include "testutils.h" =20 -#include "virerror.h" -#include "virxml.h" - #define VIR_FROM_THIS VIR_FROM_NONE =20 =20 diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 7e6c0b60bb..77e086e390 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -7,9 +7,7 @@ # include =20 # include "internal.h" -# include "viralloc.h" # include "openvz/openvz_conf.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_OPENVZ =20 diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index b23177385c..dd2d4984e2 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -24,9 +24,7 @@ #include "qemumonitortestutils.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_agent.h" -#include "virthread.h" #include "virerror.h" -#include "virstring.h" =20 =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 6329096a68..57116c930b 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -21,8 +21,6 @@ #include "testutils.h" #include "testutilsqemu.h" #include "testutilsqemuschema.h" -#include "virstoragefile.h" -#include "virstring.h" #include "virlog.h" #include "qemu/qemu_block.h" #include "qemu/qemu_qapi.h" @@ -31,8 +29,6 @@ #include "qemu/qemu_checkpoint.h" #include "qemu/qemu_validate.h" =20 -#include "qemu/qemu_command.h" - #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW #include "conf/snapshot_conf_priv.h" =20 diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 2717ed5d84..0263b0ad01 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -20,7 +20,6 @@ #include =20 #include "internal.h" -#include "viralloc.h" #include "virjson.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_monitor_json.h" diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index ae86ef9ea0..f92fb8f177 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -22,7 +22,6 @@ #include "util/virjson.h" #include "util/virqemu.h" #include "testutils.h" -#include "testutilsqemu.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index e84a0294d4..5a63308347 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -18,7 +18,6 @@ =20 =20 #include "conf/cpu_conf.h" -#include "cpu/cpu.h" #include "qemu/qemu_capabilities.h" #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu/qemu_capspriv.h" diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index 25613c8452..d49dcd9143 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -14,10 +14,8 @@ =20 # include "internal.h" # include "qemu/qemu_conf.h" -# include "qemu/qemu_domain.h" # include "checkpoint_conf.h" # include "testutilsqemu.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 3fa932e755..2f66839ae8 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -11,9 +11,7 @@ =20 # include "internal.h" # include "qemu/qemu_conf.h" -# include "qemu/qemu_domain.h" # include "testutilsqemu.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index d618ff9d06..89d287945a 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -24,7 +24,6 @@ #include "testutilsqemu.h" #include "conf/domain_conf.h" #include "virdevmapper.h" -#include "virutil.h" #include "virmock.h" #include =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 21302e0fce..dbbeecdd68 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -27,9 +27,6 @@ #include "testutilsqemu.h" #include "testutilsqemuschema.h" #include "virhostdev.h" -#include "virerror.h" -#include "virstring.h" -#include "virthread.h" #include "virfile.h" =20 #define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 86057e9a3a..b303f70e9d 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -9,9 +9,7 @@ =20 #ifdef WITH_QEMU =20 -# include "datatypes.h" # include "internal.h" -# include "virstring.h" # include "conf/domain_conf.h" # include "qemu/qemu_domain.h" =20 diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index ae59ff6757..bcdee5f32b 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -22,7 +22,6 @@ #include "virjson.h" #include "virbuffer.h" #include "virxml.h" -#include "virhash.h" #include "testutils.h" #include "testutilsqemu.h" #include "tests/testutilsqemuschema.h" diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index 316bfedd15..acc1a46e57 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -23,7 +23,6 @@ =20 #include "testutils.h" =20 -#include "internal.h" #include "testutilsqemu.h" #include "testutilsqemuschema.h" #include "configmake.h" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 278d7ba765..ee6608cd5b 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -28,9 +28,7 @@ #include "qemu/qemu_monitor_json.h" #include "qemu/qemu_qapi.h" #include "qemu/qemu_alias.h" -#include "virthread.h" #include "virerror.h" -#include "virstring.h" #include "cpu/cpu.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_migration_params.h" diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 86300da68a..9281f90bcf 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -30,12 +30,10 @@ #include "qemu/qemu_processpriv.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" -#include "qemu/qemu_qapi.h" #include "rpc/virnetsocket.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "vireventthread.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 56e3d56056..b50884e1fe 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -19,7 +19,6 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 03c818d8a3..a6f9d6b917 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -33,8 +33,6 @@ #include "virfile.h" #include "virthread.h" #include "virhash.h" -#include "virstring.h" -#include "viralloc.h" #include "qemusecuritytest.h" #include "security/security_manager.h" #include "virhostuptime.h" diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 08f176667d..005635fd52 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -23,20 +23,15 @@ #include "internal.h" #include "viralloc.h" #include "vircommand.h" -#include "vircrypto.h" #include "viridentitypriv.h" #include "virmock.h" -#include "virlog.h" #include "virnetdev.h" #include "virnetdevbandwidth.h" #include "virnetdevip.h" #include "virnetdevtap.h" #include "virnetdevopenvswitch.h" #include "virnuma.h" -#include "virrandom.h" -#include "virscsi.h" #include "virscsivhost.h" -#include "virstring.h" #include "virtpm.h" #include "virutil.h" #include "qemu/qemu_interface.h" diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1d6e03490d..94c406ee77 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -12,24 +12,16 @@ # include "internal.h" # include "viralloc.h" # include "viridentity.h" -# include "qemu/qemu_alias.h" # include "qemu/qemu_capabilities.h" -# include "qemu/qemu_command.h" # include "qemu/qemu_domain.h" # include "qemu/qemu_migration.h" # include "qemu/qemu_process.h" # include "qemu/qemu_slirp.h" -# include "qemu/qemu_qapi.h" # include "datatypes.h" # include "conf/storage_conf.h" -# include "cpu/cpu_map.h" -# include "virstring.h" -# include "storage/storage_driver.h" -# include "virmock.h" # include "virfilewrapper.h" # include "configmake.h" # include "testutilsqemuschema.h" -# include "qemu/qemu_monitor_json.h" =20 # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 518842112e..e9506b1b96 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -8,10 +8,7 @@ #include "testutils.h" =20 #include "internal.h" -#include "qemu/qemu_domain_address.h" -#include "qemu/qemu_domain.h" #include "testutilsqemu.h" -#include "virstring.h" #include "virfilewrapper.h" #include "configmake.h" =20 diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index cb66a479e3..28ad59f39d 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -26,8 +26,6 @@ # include # include # include -# include "virstring.h" -# include "virerror.h" # include "virlog.h" # include "virscsihost.h" =20 diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index b2a11b278c..769d6e1f29 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -2,7 +2,6 @@ =20 #include #include "security/security_driver.h" -#include "virrandom.h" #include "testutils.h" =20 static int diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 828e44a32b..da7daef6ba 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -1,7 +1,5 @@ #include =20 - -#include "internal.h" #include "testutils.h" #include "secret_conf.h" =20 diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index c3d6505ef2..24c9f3841c 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -39,7 +39,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE =20 #include "viralloc.h" -#include "virstring.h" =20 static int (*real_statfs)(const char *path, struct statfs *buf); static int (*real_security_get_boolean_active)(const char *name); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index dfe9d38d34..4f97edad17 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -30,13 +30,11 @@ #include "internal.h" #include "testutils.h" #include "testutilsqemu.h" -#include "qemu/qemu_domain.h" #include "viralloc.h" #include "virerror.h" #include "virfile.h" #include "virlog.h" #include "security/security_manager.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 4912cc3483..6a0f1617ae 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -27,10 +27,7 @@ =20 #include "internal.h" #include "testutils.h" -#include "viralloc.h" #include "virlog.h" -#include "virerror.h" -#include "virfile.h" #include "security/security_manager.h" #include "virstring.h" =20 diff --git a/tests/sockettest.c b/tests/sockettest.c index 2a35b6a829..f2b75a2e53 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -25,7 +25,6 @@ #include "virsocketaddr.h" #include "testutils.h" #include "virlog.h" -#include "viralloc.h" =20 VIR_LOG_INIT("tests.sockettest"); =20 diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheep= dogtest.c index c7dabd976b..8f27e40d46 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -29,7 +29,6 @@ #include "testutils.h" #define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW #include "storage/storage_backend_sheepdog_priv.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 449b745519..9fe31207fb 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -1,11 +1,7 @@ #include =20 -#include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "storage/storage_util.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index f21f20357a..f0460afcf5 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -5,11 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "storage_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #include "storage/storage_util.h" =20 diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 94e2de1730..0764c8e29c 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -1,11 +1,7 @@ #include =20 -#include "internal.h" #include "testutils.h" -#include "datatypes.h" #include "storage/storage_util.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index be38f50a51..627bf24ddf 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -5,11 +5,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "storage_conf.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 973b8317b5..287c40c6f9 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -29,7 +29,6 @@ #include "virsysinfo.h" #include "testutils.h" #include "virfile.h" -#include "virstring.h" =20 #define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW #include "virsysinfopriv.h" diff --git a/tests/testutils.c b/tests/testutils.c index 9d454c23bc..30f91dcd28 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -29,13 +29,9 @@ #include "testutils.h" #include "internal.h" #include "viralloc.h" -#include "virthread.h" #include "virerror.h" #include "virbuffer.h" #include "virlog.h" -#include "vircommand.h" -#include "virrandom.h" -#include "virprocess.h" #include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/testutils.h b/tests/testutils.h index ff5661bb3f..869b58bd1e 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -24,7 +24,6 @@ #include "virfile.h" #include "virstring.h" #include "virjson.h" -#include "capabilities.h" #include "domain_conf.h" =20 #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c index ac7a01a4e8..356c118646 100644 --- a/tests/testutilslxc.c +++ b/tests/testutilslxc.c @@ -3,7 +3,6 @@ =20 # include "testutilslxc.h" # include "testutils.h" -# include "viralloc.h" # include "domain_conf.h" =20 # define VIR_FROM_THIS VIR_FROM_LXC diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h index 0f7345b1c1..c8f2ad6dff 100644 --- a/tests/testutilslxc.h +++ b/tests/testutilslxc.h @@ -16,8 +16,6 @@ =20 #pragma once =20 -#include "capabilities.h" - #include "lxc/lxc_conf.h" =20 #define FAKEDEVDIR0 "/fakedevdir0/bla/fasl" diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7f6d9ee06f..628834910b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -6,7 +6,6 @@ # include "testutils.h" # include "viralloc.h" # include "cpu_conf.h" -# include "qemu/qemu_driver.h" # include "qemu/qemu_domain.h" # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" diff --git a/tests/utiltest.c b/tests/utiltest.c index 419dfea913..e7a79f808f 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -3,7 +3,6 @@ #include =20 #include "internal.h" -#include "viralloc.h" #include "testutils.h" #include "virutil.h" =20 diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 6fd7407b97..5301fd9dea 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -21,8 +21,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" =20 #include "virauthconfig.h" diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 79bd0cae8e..0ca7927c3f 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -4,8 +4,6 @@ #include "internal.h" #include "testutils.h" #include "virbuffer.h" -#include "viralloc.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index b143f873a1..26a512e87f 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -20,7 +20,6 @@ =20 #include "testutils.h" #include "capabilities.h" -#include "virbitmap.h" #include "virfilewrapper.h" =20 =20 diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index a213c8e686..8a0e3aec0f 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -26,8 +26,6 @@ # include # include # include "testutilslxc.h" -# include "virstring.h" -# include "virfile.h" # include "viralloc.h" # include "vircgroupv2devices.h" =20 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7d54df1a85..e29bc094b1 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -25,7 +25,6 @@ =20 # define LIBVIRT_VIRCGROUPPRIV_H_ALLOW # include "vircgrouppriv.h" -# include "virstring.h" # include "virerror.h" # include "virlog.h" # include "virfile.h" diff --git a/tests/virconftest.c b/tests/virconftest.c index 3b203b6ae6..34a8232790 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -23,7 +23,6 @@ =20 #include #include "virconf.h" -#include "viralloc.h" #include "testutils.h" =20 =20 diff --git a/tests/virdriverconnvalidatetest.c b/tests/virdriverconnvalidat= etest.c index 6f4cefb61e..6d10628a73 100644 --- a/tests/virdriverconnvalidatetest.c +++ b/tests/virdriverconnvalidatetest.c @@ -19,8 +19,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "driver.h" =20 diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index e7930d3453..27d0f15ac5 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -19,8 +19,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "driver.h" =20 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index d4863bd12c..093a8d7cf0 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -26,8 +26,6 @@ #endif =20 #include "virmock.h" -#include "virstring.h" -#include "viralloc.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 1e95c77d06..9fbfc37e56 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -23,7 +23,6 @@ =20 #include "testutils.h" #include "virfile.h" -#include "virstring.h" =20 #ifdef __linux__ # include diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index aaff39866d..9cdfcfdc3f 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -23,10 +23,8 @@ # include =20 # include "viralloc.h" -# include "virfile.h" # include "virfilewrapper.h" # include "virmock.h" -# include "virstring.h" =20 =20 /* Mapping for prefix overrides */ diff --git a/tests/virfirewallmock.c b/tests/virfirewallmock.c index 6b096701c9..aa6b83a340 100644 --- a/tests/virfirewallmock.c +++ b/tests/virfirewallmock.c @@ -16,7 +16,6 @@ =20 #include =20 -#include "internal.h" #include "virfile.h" =20 char * diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 8a0ca6be07..e3d15fb67b 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -31,7 +31,6 @@ # include "vircommandpriv.h" # define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW # include "virfirewalldpriv.h" -# include "virmock.h" =20 # define VIR_FROM_THIS VIR_FROM_FIREWALL =20 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 746e65727f..196f4c29b9 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -8,7 +8,6 @@ #define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" #include "virfile.h" -#include "virstring.h" #include "virfilewrapper.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 99c7899ed7..73ed9f73df 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -28,12 +28,8 @@ #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW =20 #include "viridentitypriv.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" =20 -#include "virlockspace.h" - #define VIR_FROM_THIS VIR_FROM_NONE =20 VIR_LOG_INIT("tests.identitytest"); diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 0f0c7b17da..cd1ea1c81a 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -22,12 +22,8 @@ #include "testutils.h" =20 #include "virkeycode.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" =20 -#include "virlockspace.h" - #define VIR_FROM_THIS VIR_FROM_NONE =20 VIR_LOG_INIT("tests.keycodetest"); diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index d2df3bdb04..0e662878b2 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -25,7 +25,6 @@ # define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # include "virkmod.h" -# include "virstring.h" =20 # define MODNAME "vfio-pci" =20 diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 109edf34d5..49d2c60ff7 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -23,11 +23,8 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" -#include "virutil.h" =20 #include "virlockspace.h" =20 diff --git a/tests/virmigtest.c b/tests/virmigtest.c index af6643397e..adc123b802 100644 --- a/tests/virmigtest.c +++ b/tests/virmigtest.c @@ -22,7 +22,6 @@ =20 #include "testutils.h" #include "virlog.h" -#include "viruri.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index ecb39bb4f7..39e270eaac 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -21,7 +21,6 @@ */ =20 #include "virmock.h" -#include "viralloc.h" =20 #include #include diff --git a/tests/virnetdaemonmock.c b/tests/virnetdaemonmock.c index c523da0791..a5bb01c34c 100644 --- a/tests/virnetdaemonmock.c +++ b/tests/virnetdaemonmock.c @@ -18,7 +18,6 @@ =20 #include =20 -#include "internal.h" #include =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index f26991a48c..71a7922152 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -19,8 +19,6 @@ #include =20 #ifdef __linux__ -# include "internal.h" -# include "virstring.h" # include "virnetdev.h" =20 # define NET_DEV_TEST_DATA_PREFIX abs_srcdir "/virnetdevtestdata/sys/class= /net" diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 3fd7b70ad0..aec84c6c35 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -21,8 +21,6 @@ #include "internal.h" #include "testutils.h" =20 -#include "virnetlink.h" - #define LIBVIRT_VIRNETDEVPRIV_H_ALLOW =20 #ifdef __linux__ diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 386c339c2c..14790c0ece 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -21,10 +21,8 @@ #include =20 #include "testutils.h" -#include "virerror.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "rpc/virnetmessage.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC diff --git a/tests/virnetserverclientmock.c b/tests/virnetserverclientmock.c index 277d6ce930..08ec7d7e73 100644 --- a/tests/virnetserverclientmock.c +++ b/tests/virnetserverclientmock.c @@ -20,7 +20,6 @@ =20 #include "rpc/virnetsocket.h" #include "virutil.h" -#include "internal.h" =20 int virEventAddTimeout(int frequency G_GNUC_UNUSED, virEventTimeoutCallback cb G_GNUC_UNUSED, diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 4e8edb05c3..396005899a 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -29,7 +29,6 @@ #include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "virstring.h" =20 #include "rpc/virnetsocket.h" #include "rpc/virnetclient.h" diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 0ad42a77ed..403cd8d0ac 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -23,12 +23,7 @@ =20 #include "testutils.h" #include "virnettlshelpers.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" -#include "virfile.h" -#include "vircommand.h" -#include "virsocket.h" =20 #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >=3D 0x0= 20600 =20 diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index ca293eb6d6..a46381fdf9 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -25,7 +25,6 @@ #include "virlog.h" #include "virfile.h" #include "virsocketaddr.h" -#include "virutil.h" =20 #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >=3D 0x0= 20600 =20 diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 9e0d6a46e6..5b98a6de3e 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -23,12 +23,8 @@ #include "testutils.h" #include "virnettlshelpers.h" #include "virutil.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "vircommand.h" -#include "virsocket.h" =20 #if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >=3D 0x0= 20600 =20 diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xm= ltest.c index 176f52d675..0c13068912 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -25,10 +25,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" #include "virnetworkportdef.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 7f2653cb53..87c9a58c6f 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -19,11 +19,8 @@ #include =20 #include "internal.h" -#include "virmock.h" #include "virnuma.h" #include "virfile.h" -#include "viralloc.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindi= ngxml2xmltest.c index ccdad3daa5..adce70010c 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -26,12 +26,8 @@ #include #include =20 -#include "internal.h" #include "testutils.h" -#include "virxml.h" #include "virnwfilterbindingdef.h" -#include "testutilsqemu.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 77d46f0952..b2111794e6 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -31,7 +31,6 @@ # include # include # include "viralloc.h" -# include "virstring.h" # include "virfile.h" =20 static int (*real_access)(const char *path, int mode); diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 5c0a76de6f..9e17a88eb5 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -26,11 +26,8 @@ =20 #if defined(__linux__) && defined(RTLD_NEXT) =20 -# include "virerror.h" -# include "viralloc.h" # include "virlog.h" # include "virportallocator.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_RPC =20 diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 6dd15213e3..e295f74446 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -23,7 +23,6 @@ # include =20 # include "internal.h" -# include "virstring.h" # include "virrandom.h" # include "virmock.h" =20 diff --git a/tests/virschematest.c b/tests/virschematest.c index 29a5546418..dd13d82c62 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -21,8 +21,6 @@ =20 #include "testutils.h" =20 -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virxml.h" =20 diff --git a/tests/virshtest.c b/tests/virshtest.c index c2c892c60d..a53a6273b9 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -3,10 +3,8 @@ #include =20 #include "internal.h" -#include "virxml.h" #include "testutils.h" #include "vircommand.h" -#include "virstring.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ccfc9f7001..11f7abbda6 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -23,11 +23,8 @@ #include "storage_source.h" #include "testutils.h" #include "vircommand.h" -#include "virerror.h" #include "virfile.h" #include "virlog.h" -#include "virstoragefile.h" -#include "virstring.h" =20 #include "storage/storage_driver.h" =20 diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c index d4ab818f5f..ba92ec8bcc 100644 --- a/tests/virstorageutiltest.c +++ b/tests/virstorageutiltest.c @@ -18,10 +18,7 @@ =20 =20 #include "testutils.h" -#include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virstring.h" =20 #include "storage/storage_util.h" =20 diff --git a/tests/virstringtest.c b/tests/virstringtest.c index b406076020..7d8d9204cc 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -20,9 +20,6 @@ =20 =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "virstring.h" =20 diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 7951f3d00f..19559aee7a 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -26,8 +26,6 @@ =20 #include "virsocket.h" #include "configmake.h" -#include "virstring.h" -#include "viralloc.h" #include "virfile.h" =20 static int (*real_open)(const char *path, int flags, ...); diff --git a/tests/virtimetest.c b/tests/virtimetest.c index f98165b106..5972ce585e 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -21,8 +21,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virlog.h" =20 #include "virtime.h" diff --git a/tests/viruritest.c b/tests/viruritest.c index 96f29aafc0..94c8aa806d 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -21,7 +21,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" #include "viralloc.h" #include "virlog.h" =20 diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 5b09895197..971d98aa9a 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -24,9 +24,6 @@ #include #include =20 -#include "viralloc.h" -#include "virfile.h" -#include "virstring.h" #include "virusb.h" =20 #define USB_SYSFS "/sys/bus/usb" diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 65050d5e5f..870e136321 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -18,9 +18,7 @@ =20 #include =20 -#include "viralloc.h" #include "virerror.h" -#include "virfile.h" #include "virusb.h" =20 #include "testutils.h" diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 257bda3b0e..dbd771017b 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -7,9 +7,7 @@ # include =20 # include "internal.h" -# include "viralloc.h" # include "vmx/vmx.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_VMWARE =20 diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 83d7f9b5ab..bb75a41418 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -27,7 +27,6 @@ =20 #include "internal.h" #include "testutils.h" -#include "viralloc.h" #include "../tools/vsh-table.h" =20 static int diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index d6505f9e12..962a1f2c4b 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -28,7 +28,6 @@ #include "internal.h" #include "datatypes.h" #include "libxl/xen_xl.h" -#include "viralloc.h" #include "virstring.h" #include "testutils.h" #include "testutilsxen.h" diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index c99d1f2bd9..dbf9f7a4c7 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -28,8 +28,6 @@ #include "libxl/xen_xm.h" #include "testutils.h" #include "testutilsxen.h" -#include "viralloc.h" -#include "virstring.h" #include "libxl/libxl_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index cd6d81947b..1a7f2e4f33 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -9,7 +9,6 @@ # include "internal.h" # include "viralloc.h" # include "vmx/vmx.h" -# include "virstring.h" =20 # define VIR_FROM_THIS VIR_FROM_VMWARE =20 --=20 2.36.1