From nobody Tue May 7 06:22:05 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 165251563088361.112597866020565; Sat, 14 May 2022 01:07:10 -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-178-W4Ka5QsGNY23Ec0030D6yw-1; Sat, 14 May 2022 04:07:05 -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 4B5E8804192; Sat, 14 May 2022 08:07: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 737695521E5; Sat, 14 May 2022 08:07:02 +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 992BA194705C; Sat, 14 May 2022 08:07:01 +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 9D4D41947058 for ; Sat, 14 May 2022 08:07:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8E5B540CF8FE; Sat, 14 May 2022 08:07:00 +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 89EBA40CF8FB for ; Sat, 14 May 2022 08:07:00 +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 7268A101AA44 for ; Sat, 14 May 2022 08:07:00 +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-465--GNVzsjuNk-EzFhac5v-2g-1; Sat, 14 May 2022 04:06:58 -0400 Received: by mail-pf1-f177.google.com with SMTP id p12so9682049pfn.0 for ; Sat, 14 May 2022 01:06:58 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id h20-20020aa786d4000000b0050dc76281a5sm3024215pfo.127.2022.05.14.01.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:06:56 -0700 (PDT) X-MC-Unique: W4Ka5QsGNY23Ec0030D6yw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: -GNVzsjuNk-EzFhac5v-2g-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=/A4fnJdMIybhInXHEu7N40rMi2FbdqD38jK+GQp7Lt0=; b=bHDve13iS46nK2ip4wxHqjLz0mACTSrUnuS0iF0FoSkdGP7Zy+iyWYRCHEnZJgmaZi Yhec5CWu2SDysbYA4Mqx6K/m5Iow2CiKv9yQfe/xRhGxO9lzvf5wb/tewIPY+D97qQfX Cf1zUXCwbsAfvIjs6VBHHs27YMdFF00U4/MQuVZVMaHNqkvq18yie/oDr4qy1Fut2bPV rjqt1mogoxazbS7cbthl/9S7qFQnh3bgfRLegPP+uJkDpyUYK4cZyPZ5kcieKMknePsf iGl0JYp7oAIxnvpaQzMJLy6FrKOe0PxYT426HM7tkwZ0dY4JwNwkeyFbLSGVXfcLYNCK jUrA== X-Gm-Message-State: AOAM532J6exBb2fgAlWhRnkvOqQq5C24ocoaVpElVqrzgUmczV8k03Ck uTwCpi+XezMzDrslh+8Z8QG0bd1u8l7BqQ== X-Google-Smtp-Source: ABdhPJzBwkKmvtLM4FbKc5BWfArJk4PJp85hlOcaG+8fLXQF/lXennTeIsMnRnaUAK1NmfxD80j75g== X-Received: by 2002:a62:ce82:0:b0:50d:512f:7b76 with SMTP id y124-20020a62ce82000000b0050d512f7b76mr8156224pfg.79.1652515617021; Sat, 14 May 2022 01:06:57 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 01/30] access: Remove unused includes Date: Sat, 14 May 2022 16:05:10 +0800 Message-Id: <20220514080539.2371140-2-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515631461100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515657976122.77950923454648; Sat, 14 May 2022 01:07:37 -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-250-bc6NY-wjPUmtZVjnzbnaqg-1; Sat, 14 May 2022 04:07:30 -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 7632A18812CF; Sat, 14 May 2022 08:07:28 +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 5E6797C58; Sat, 14 May 2022 08:07:28 +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 EF299194F4BB; Sat, 14 May 2022 08:07:27 +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 08F8D1947058 for ; Sat, 14 May 2022 08:07:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DBBC82024CBB; Sat, 14 May 2022 08:07:25 +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 D7CCE2024CB9 for ; Sat, 14 May 2022 08:07:04 +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 333C9101A52C for ; Sat, 14 May 2022 08:07:04 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-547-wiqDEFXBN4abmnja2lS34A-1; Sat, 14 May 2022 04:07:01 -0400 Received: by mail-pj1-f43.google.com with SMTP id x88so10006797pjj.1 for ; Sat, 14 May 2022 01:07:01 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id m12-20020a1709026bcc00b0015e8d4eb214sm3084285plt.94.2022.05.14.01.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:00 -0700 (PDT) X-MC-Unique: bc6NY-wjPUmtZVjnzbnaqg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: wiqDEFXBN4abmnja2lS34A-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=OQ2/K71xHHXhy5odA3xGKfUzjRdmh8tuJwt1Ede/PNI=; b=bql//ZtOiiveICcMbBtsaoXkzQsY2KumWS06QWjeyqAZzhx+SQOnhXVOe+cFpCSZoF cA37lktARW2Xpb3sh3kX7umw6p6/YCJTQ0rrzkGbUHgKRAXD0SiDSfMw7/ahWNUmBzjx LNG7drUkDXqEiWk6M/HVBhUF0/vN7Z43EAT0r9yF5MYCAPEYLVG8D28X4HEdRzP47mDr r0/QWbf8EqehegLoNFtvbiSmq/oCFyMDnZtdpI2PBNuK3jHGjq3y+POOZu8A1kC9TYFd qaMjQ15TMSuYWZMws1bU5MXo06kF/kFKkPKSCcLED2lMymWMRT7XA0fAPgOJpqf734/7 n5uw== X-Gm-Message-State: AOAM531AfwHthDLCn1V6G1lZXBgrRPTDDSJ5TYznzR4ptNfsijoPtWwC wvHABqMEiHBscr4RdKAsZJzpuXuOgHrknQ== X-Google-Smtp-Source: ABdhPJzLTQuJ1o7dWkvfv+7nqBaFXPoRGoICW4pGL+ehdszwHU+fV807OU4t0ME+ISdyHNr0mbGBEw== X-Received: by 2002:a17:902:e74d:b0:15e:94f7:611e with SMTP id p13-20020a170902e74d00b0015e94f7611emr8547215plf.37.1652515620402; Sat, 14 May 2022 01:07:00 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 02/30] admin: Remove unused includes Date: Sat, 14 May 2022 16:05:11 +0800 Message-Id: <20220514080539.2371140-3-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515659526100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang --- src/admin/admin_server.c | 4 ---- src/admin/admin_server.h | 1 - src/admin/admin_server_dispatch.c | 3 --- src/admin/libvirt-admin.c | 2 -- 4 files changed, 10 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..8c34586ab3 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -21,17 +21,14 @@ #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" 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 Tue May 7 06:22:05 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 1652515687116730.6173195635971; Sat, 14 May 2022 01:08:07 -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-156-2kMfpJWaMTOEkDc_vwDt3Q-1; Sat, 14 May 2022 04:07:11 -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 27B2C185A7BA; Sat, 14 May 2022 08:07: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 14CE2111F3DB; Sat, 14 May 2022 08:07: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 D5575194705A; Sat, 14 May 2022 08:07:08 +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 466581947058 for ; Sat, 14 May 2022 08:07:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 38ECD416369; Sat, 14 May 2022 08:07:07 +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 34D8A416156 for ; Sat, 14 May 2022 08:07:07 +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 1CB8B294EDF4 for ; Sat, 14 May 2022 08:07:07 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-eyt_O3O_O6-pZVMli4Gaew-1; Sat, 14 May 2022 04:07:05 -0400 Received: by mail-pg1-f170.google.com with SMTP id x12so9524832pgj.7 for ; Sat, 14 May 2022 01:07:04 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id y6-20020a655a06000000b003f24a2be89asm486539pgs.8.2022.05.14.01.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:03 -0700 (PDT) X-MC-Unique: 2kMfpJWaMTOEkDc_vwDt3Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: eyt_O3O_O6-pZVMli4Gaew-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=B61M0S0DiQugk3igwLsZRTR8exxFgpYxBLdHAkqCwHs=; b=B47vI4yKr/UnmiAebDWllP3zc5zHF7ztt7Yirp7RdXKrK6LLjk0CaNaXNjfp3CbHK5 R4tf52mFHOLxvmCnRhWUcJicR4KqOik9zBjWdk/RQWYbvNwlpNgkqSqBDPmjsr56rjH7 gJDAV3MDju7no5i49Lk3kecG0YY5g84/BgmcX/tu98JHL4bueUWuyXFshN82l+cjIHDy l61yM/2m9m0DDND7AiDX/z1Qa5sbvafn6yWq0AMCD64AWHIsH3p809oEK42djy72OHsi XUzrgjHyNDt7R2WTJ9ciLnjAMG+7K3Ncrj1tyO1465V76+ytFi8ow+PNH7SkjxOaLDqo yk7w== X-Gm-Message-State: AOAM530LMjxKhGomD/D4MsExSGZKmJbAv/4+Wt8u05F/SsxzPStCy+F6 t1ziP+/SjQWA/615ATJPpSXRwEqt6J4jVA== X-Google-Smtp-Source: ABdhPJzIb6oTOKk1g9IVGnmqGCdQDq1JCrTsb2d9pwsK3pPl+KVLfPOXVz7U//2mFd53f0T6x3qZ4A== X-Received: by 2002:a63:111f:0:b0:3da:ed0d:7623 with SMTP id g31-20020a63111f000000b003daed0d7623mr7136639pgl.586.1652515623729; Sat, 14 May 2022 01:07:03 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 03/30] ch: Remove unused includes Date: Sat, 14 May 2022 16:05:12 +0800 Message-Id: <20220514080539.2371140-4-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515687711100002 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515650371537.5867446910656; Sat, 14 May 2022 01:07:30 -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-583-4CQp4-1aM-yaHpt_0Y7HZQ-1; Sat, 14 May 2022 04:07:26 -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 CED8F800B21; Sat, 14 May 2022 08:07:24 +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 B5EE45521ED; Sat, 14 May 2022 08:07:24 +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 95ECF194705A; Sat, 14 May 2022 08:07:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE9731947058 for ; Sat, 14 May 2022 08:07:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 907462166B1A; Sat, 14 May 2022 08:07:23 +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 8AA3A2166B17 for ; Sat, 14 May 2022 08:07:11 +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 21E09800B21 for ; Sat, 14 May 2022 08:07:11 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-498-v3e64G5jP1mpXSkXRnk6Zg-1; Sat, 14 May 2022 04:07:09 -0400 Received: by mail-pf1-f174.google.com with SMTP id a11so9648537pff.1 for ; Sat, 14 May 2022 01:07:09 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id p1-20020aa78601000000b00512ee8a74a9sm1303769pfn.217.2022.05.14.01.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:07 -0700 (PDT) X-MC-Unique: 4CQp4-1aM-yaHpt_0Y7HZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: v3e64G5jP1mpXSkXRnk6Zg-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=mba4ilxKGN5lZjLaKGH2YgPhCe0Kj3uLAwQlNXnkBJY=; b=Uj0IpcR8GeL9iMfxLOGWAyN7dxkvCGxSoZKV1uZbOfYrdyrfuFyqWOjwm8WAfpWtjB 0Kh0lBm0sePBjwp6K3fSk34k2EuChnfq3gMWJcYNN4dXjomT5XqgFOZQ+XgiWtJPUHD6 aPhdllaZvh6I5DkdYWYCLoySe/dBYyDXODuGFARWFodz6NWucrAR2RNcgjozwx99k9I5 q5YAw/uIHiU7f3p2YfW8ZR52iLA3EJ75HGzxbNTLMy33UUQV3HoRBLbgKH1FYRAfFjQq ipIL4ssvf/HoiKYQOcgPXb7m98Pi8xLszfGiuVkvnBrCuJCJigWDidd1fLOUFfuXRVLe NaZw== X-Gm-Message-State: AOAM531dkqNxRAj+cqcaNUUFDdPjgnbSDm9zeukOks/0FZ4erATdn0cg lMdqH9VpuG4jZnMKeFhpg2OD3yVQ/xTSTA== X-Google-Smtp-Source: ABdhPJxJDNOyPYO12dU/Y44mPbO9s9j+KZcnH6unTzpek3riJBcmnBZKJWbkYan41ufrwffHTnuckQ== X-Received: by 2002:a63:9141:0:b0:3c6:270f:cec2 with SMTP id l62-20020a639141000000b003c6270fcec2mr6874405pge.182.1652515627521; Sat, 14 May 2022 01:07:07 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 04/30] conf: Remove unused includes Date: Sat, 14 May 2022 16:05:13 +0800 Message-Id: <20220514080539.2371140-5-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.6 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: Peng Liang 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: 1652515651546100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 d9b55c80aa..9c5206cf87 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 2e2da0c69c..74eaa02e54 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 Tue May 7 06:22:05 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 1652515642858557.78378236883; Sat, 14 May 2022 01:07: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-567-JXTf3aDAO1emm6WJmGNfhA-1; Sat, 14 May 2022 04:07:17 -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 A89C61C05152; Sat, 14 May 2022 08:07:15 +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 7017441636E; Sat, 14 May 2022 08:07:15 +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 2BC30194705A; Sat, 14 May 2022 08:07:15 +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 5AFE21947058 for ; Sat, 14 May 2022 08:07:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2F3985521E5; Sat, 14 May 2022 08:07:14 +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 2A8895521CA for ; Sat, 14 May 2022 08:07:14 +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 121143802B84 for ; Sat, 14 May 2022 08:07:14 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-62-_7HFcwDKO9qGtA-FoUdUkA-1; Sat, 14 May 2022 04:07:12 -0400 Received: by mail-pf1-f173.google.com with SMTP id c14so9648635pfn.2 for ; Sat, 14 May 2022 01:07:11 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id w2-20020a62c702000000b0050dc762815fsm3017807pfg.57.2022.05.14.01.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:10 -0700 (PDT) X-MC-Unique: JXTf3aDAO1emm6WJmGNfhA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: _7HFcwDKO9qGtA-FoUdUkA-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=djCvZ1vjtj1LxG+YLypvY1AtcPurOZuUqxdo31KSwBw=; b=ndlf73BXfXiKoKWQ8XHIMdk2amGzQ17QxmpAQlU9Q52qQO6C6PyyUvQiwwodCkCGqd LWZHFK4K7Ti+0Hzj9E/dSebOjogB+W9Pf2QKKpJhrAdQWeGHPB+0xgUoVuAvtTO3FJWM aZfmJ8ibNTLGIMXzWXevp5/HJ7jUJd0J4z5ueq4SyLT5py3VrChSMVN+scWMR2tbT9Vg wXp1YP4PUYjDUxYmwzTm1gx+3Tp4vkRMscwEQbHtURJzXYsu7yV+55MD/2OUfVrh9yvx idhjDANKk+XftZQHbJ6gvfWT0vhjzWXzQfOpfsXBk45tOJXREGvU9zEZGOLObiLmW++4 p1KA== X-Gm-Message-State: AOAM530EjL13v7ZcQM3VvkXeQSiQwWTjDdi9JMF5rfi73Q6eRvdmjCZ5 kbjrwsOSPwj2/Vahb4jrt7+5LQS6K1S1/A== X-Google-Smtp-Source: ABdhPJzEfmxwlZdlwJkotRSdxkI5RcbzMUEwhUtfypiCxGl71hG45F5on7DgweRCKKsBMB2DaMlPOA== X-Received: by 2002:a63:87c1:0:b0:3c6:a988:61de with SMTP id i184-20020a6387c1000000b003c6a98861demr7033364pge.412.1652515630807; Sat, 14 May 2022 01:07:10 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 05/30] cpu: Remove unused includes Date: Sat, 14 May 2022 16:05:14 +0800 Message-Id: <20220514080539.2371140-6-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515643528100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515647352735.9981964905866; Sat, 14 May 2022 01:07:27 -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-641-2DGanNORMGS2zfM4DTIAkA-1; Sat, 14 May 2022 04:07:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 64D2138025E4; Sat, 14 May 2022 08:07: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 50D612166B16; Sat, 14 May 2022 08:07: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 EE750194705A; Sat, 14 May 2022 08:07: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 D73CA1947058 for ; Sat, 14 May 2022 08:07:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B1C5240D2822; Sat, 14 May 2022 08:07:17 +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 AD48440D2820 for ; Sat, 14 May 2022 08:07:17 +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 8FA70811E75 for ; Sat, 14 May 2022 08:07:17 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-537-DeEDtk8VP1Wjhpo7sLDj9A-1; Sat, 14 May 2022 04:07:15 -0400 Received: by mail-pj1-f47.google.com with SMTP id n10so9964635pjh.5 for ; Sat, 14 May 2022 01:07:15 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id c14-20020a170902848e00b0015e8da1f9e8sm3110166plo.77.2022.05.14.01.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:14 -0700 (PDT) X-MC-Unique: 2DGanNORMGS2zfM4DTIAkA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: DeEDtk8VP1Wjhpo7sLDj9A-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=T9s0luhlPbHH9YexkobacL2ikNGL1ZYI5iCOHWkwOVI=; b=GKlXLmqCqnPpnT+T8LxK+/yjl2LXvWZrjoOWrL8lP9eoCecn9OY6jRdDEaEZPM+W2r QaoK+1VPPOecWDHzywXkWxo6nsiOioIz4BLFj3A2bbFXm5CvcV1iSn0WIZfW3P7japJc WR/hgl9ZQ3eH0vKEbOPEj1s9dHTkSLLiXPbjR0hI0GawYkVeRbp6XQWyijk+W/SHcSqv wR+qryVJnS0107KzIeBIQxAgtDoFR999vukNIOu1jN5V5r9dfgQ3p7zEfitx4IUjWNek HgHUxu9t4dquvjZ6j7NJCKo6ffOnmRkOknanntShHqH8VlZkfvGWAy9wY2KQwuaigoTt RBkw== X-Gm-Message-State: AOAM531RMqVJ5m8T9toVzzJFT/U3j2Z9x3he4YEKxoJSE+Wnd297G9yn gSszr0194CCsNOH5RjHQebli786Wn/cqcw== X-Google-Smtp-Source: ABdhPJxSHutFYn8i1f8SxjQzw9sdgBwTqIRjMKsmD39DhniR9hLyZeZfjGxgrky2dEaKxcKae2LsgQ== X-Received: by 2002:a17:902:dac2:b0:15e:c69c:d2fb with SMTP id q2-20020a170902dac200b0015ec69cd2fbmr8121876plx.135.1652515634346; Sat, 14 May 2022 01:07:14 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 06/30] esx: Remove unused includes Date: Sat, 14 May 2022 16:05:15 +0800 Message-Id: <20220514080539.2371140-7-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: 1652515649494100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 16525156460740.180913473768328; Sat, 14 May 2022 01:07: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-400-0HW5uFXgMAGN1kkeZQWuoQ-1; Sat, 14 May 2022 04:07:23 -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 8B1EE80A0B9; Sat, 14 May 2022 08:07: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 76EE040CF8FB; Sat, 14 May 2022 08:07: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 527FF194705A; Sat, 14 May 2022 08:07: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 CF7B01947058 for ; Sat, 14 May 2022 08:07:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C291A40D2824; Sat, 14 May 2022 08:07:20 +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 BE32D40D2820 for ; Sat, 14 May 2022 08:07: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 A73BE803D47 for ; Sat, 14 May 2022 08:07:20 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-163-LIsqjOv8MROVXALvit88EA-1; Sat, 14 May 2022 04:07:18 -0400 Received: by mail-pj1-f53.google.com with SMTP id cq17-20020a17090af99100b001dc0386cd8fso9761141pjb.5 for ; Sat, 14 May 2022 01:07:18 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id h198-20020a6283cf000000b0050dc7628133sm3104917pfe.13.2022.05.14.01.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:17 -0700 (PDT) X-MC-Unique: 0HW5uFXgMAGN1kkeZQWuoQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: LIsqjOv8MROVXALvit88EA-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=lOQbLuzDPfFMN7mS6SklL+brhH1aey32Qt1jC+6DqRs=; b=XnIHsLs2uT79SCxKUWjgvw37gFyBvd3+lxnZOsuNFroxaFfuOxSKBMB4bY6j+72QWY uqeHwsVwtxQ9CrnKQI9LO9yerQu8xD15dDB6R4gXB0TtOFxvCnVnZocun0Tg830AWFjf WbqC2nS17IUq3f5nc1wv3AfL6uwsQCxAcwB6WrnywepGV5RNzeRW3yeXHioYABdMzVIU qwj6syuVChaK/iIA/Of7cizAial1T+WDmw5AcOxauPYQQ+TubyfHRCLRiK0xaK0rUWgH 4SoG3RDVfgw0lVbbjjfXdIt8Ww2sIng5q9oaXz0f1FxAHPh0mYEzj+H8ZYStODyGbD3K FjCg== X-Gm-Message-State: AOAM533iVdp4z3fExSLgipYL0kFOWcfBMw8x2vSosxZJv0KwziZhf5Y3 hsfQcfGsCtQ+RBqfUfZ0RNmXAJuwEqT7Qg== X-Google-Smtp-Source: ABdhPJypPS5WlgpcUfzZIGb3yIzlWesLamVrNPLTtFYQ02g1y+9TpawKfwCDxfg3KaJs6NAhpKM7Ng== X-Received: by 2002:a17:90b:3d0b:b0:1dc:1953:462d with SMTP id pt11-20020a17090b3d0b00b001dc1953462dmr8758496pjb.122.1652515637611; Sat, 14 May 2022 01:07:17 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 07/30] hyperv: Remove unused includes Date: Sat, 14 May 2022 16:05:16 +0800 Message-Id: <20220514080539.2371140-8-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515647470100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515661489448.5115692523457; Sat, 14 May 2022 01:07: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-658-X2HCDV0YMuqxf0VEMCVIqQ-1; Sat, 14 May 2022 04:07:31 -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 1C4F72919ECD; Sat, 14 May 2022 08:07: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 0077D9D7A; Sat, 14 May 2022 08:07: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 7F871194705A; Sat, 14 May 2022 08:07:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 775131947058 for ; Sat, 14 May 2022 08:07:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 45687C27E9A; Sat, 14 May 2022 08:07: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 41C6FC27E98 for ; Sat, 14 May 2022 08:07: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 29E43100BAAB for ; Sat, 14 May 2022 08:07:24 +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-494-FN8I2iYnMrOazFyIwrfJiw-1; Sat, 14 May 2022 04:07:22 -0400 Received: by mail-pf1-f176.google.com with SMTP id v11so9627738pff.6 for ; Sat, 14 May 2022 01:07:22 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id 26-20020aa7915a000000b00512ee2f2363sm1407523pfi.99.2022.05.14.01.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:20 -0700 (PDT) X-MC-Unique: X2HCDV0YMuqxf0VEMCVIqQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: FN8I2iYnMrOazFyIwrfJiw-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=OTyAwXahFHDEd1fWretJ1/KL8Qcw7OxQyrKWGnUEPdc=; b=Cg48zVeFBcgmdGjCKCXLLKq5+/Ad7BMpmqy5WvdPBiXreGgAI8VPZ051ABLaeZmIq8 DGdvHXhj+eJUGRzkNWQt4OMINbQEHusIB1Z17roXtIIXy9JJQXDjqYMekl3qi6as+GQ2 DvQpsh/BXJFSrBvvuGKzjVM4JJVQzXR+css5gvMYJlqebjhfmmIuB4quZu+jfDUTvn5N PZscMzTbkZeWh8HnQ40ZhJSfXNNO/tKMeTKDyV/FQaFrkBKzhF6te5tRTRcn5kQBgH45 xXcZmg0u9nNOze7sv8e1eFW0KyNM4WTC3/LJNI8dW1brbBwZRSbOr+5IXNppUOY5jbxa ih/Q== X-Gm-Message-State: AOAM532Dtz0e8DS5GspHEhvblxAqk4hw2evv3w27bL+YlZodXhNzNxdo 1nhkhJd8F3p8mTma9gBfcF7IPMaLpLZcXA== X-Google-Smtp-Source: ABdhPJyxN7frdgapXEU+kB8YQ9t5vpr0w4XGqNY59x308ZrseGGQIb3ypSHcv2Q59eS9OfNjbKb7bQ== X-Received: by 2002:a05:6a00:2908:b0:4fa:9297:f631 with SMTP id cg8-20020a056a00290800b004fa9297f631mr8157022pfb.3.1652515640864; Sat, 14 May 2022 01:07:20 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 08/30] hypvervisor: Remove unused includes Date: Sat, 14 May 2022 16:05:17 +0800 Message-Id: <20220514080539.2371140-9-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.8 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: Peng Liang 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: 1652515663596100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang --- src/hypervisor/domain_driver.h | 1 - src/hypervisor/domain_job.h | 1 - src/hypervisor/virhostdev.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/hypervisor/domain_driver.h b/src/hypervisor/domain_driver.h index 7b0fbae2fd..4241c86932 100644 --- a/src/hypervisor/domain_driver.h +++ b/src/hypervisor/domain_driver.h @@ -20,7 +20,6 @@ =20 #pragma once =20 -#include "domain_conf.h" #include "node_device_conf.h" #include "virhostdev.h" =20 diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index db8b8b1390..2d8ba02989 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -5,7 +5,6 @@ =20 #pragma once =20 -#include "internal.h" #include "virenum.h" =20 #define JOB_MASK(job) (job =3D=3D 0 ? 0 : 1 << (job - 1)) diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 9a83f23854..c0ce867596 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -28,8 +28,6 @@ =20 #include "virhostdev.h" #include "viralloc.h" -#include "virstring.h" -#include "virfile.h" #include "virerror.h" #include "virlog.h" #include "virutil.h" --=20 2.36.1 From nobody Tue May 7 06:22:05 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 1652515690004580.5159133947199; Sat, 14 May 2022 01:08:10 -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-643-4xWlvOd2NeK-j1O7MY-apA-1; Sat, 14 May 2022 04:07:31 -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 3AAE81C05AFF; Sat, 14 May 2022 08:07: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 1FFF940CF8F1; Sat, 14 May 2022 08:07: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 96DAE1932117; Sat, 14 May 2022 08:07:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8CAE0193223A for ; Sat, 14 May 2022 08:07:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 808A0C2810A; Sat, 14 May 2022 08:07:27 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C90EC28106 for ; Sat, 14 May 2022 08:07:27 +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 6404585A5A8 for ; Sat, 14 May 2022 08:07:27 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-IcOaH13JP2aIOTyXisUagw-1; Sat, 14 May 2022 04:07:25 -0400 Received: by mail-pl1-f170.google.com with SMTP id q18so9985572pln.12 for ; Sat, 14 May 2022 01:07:25 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id d4-20020a170903230400b0015e8d4eb22bsm3295528plh.117.2022.05.14.01.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:23 -0700 (PDT) X-MC-Unique: 4xWlvOd2NeK-j1O7MY-apA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: IcOaH13JP2aIOTyXisUagw-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=j13IfAZKiD/V0vZGfnNqi/paIedWuBi7xOTs9wONj5Q=; b=hfPlZ8pkij+gTODMC6tWZByMNwJ2LoJGBAyJlN9ElUN7KOl6LdSiUBAdWEVblmIKlv Vi5eZFk0//UVjXIB2i3fW/HGJHe7jS6hMoQVPDOzs48d/cHlkDs8/0lsZ3C5OoIQX/+O 0f4NKzQ6fPLQ36F5RWARL/gB7rcJFYwQZ8dat2CzXtYN6N2WHWIqHTdb2JYKljpWEMEi g6uqmbhd/sIBUjshInuHUT9CcC8TfWNZWq6Wsity22MN978jc4fgCQmYPuGX7Ub9uJEI MBYy9PwoO85vx5KFgRU2bfDgLP6WOLHioda2yXvplp98DfbXOsC9lNMqvllZRgJsOI6T eOHg== X-Gm-Message-State: AOAM531FCpv0xoyvCVHo43BqLs+RnlA6F/u6KjkjlBYgNodpAyP07JNT 8VteQD5JvRGZ6q62h22Uzz/Ytf8eVSdo4Q== X-Google-Smtp-Source: ABdhPJzKRj4+DSdtlDMUPyyiXDBbsVGEWQeQkhGhDh0uZRpOgwvjt/WnmHQKoTgZqSpY9JP4ES4+bw== X-Received: by 2002:a17:902:f28b:b0:15c:5c21:dc15 with SMTP id k11-20020a170902f28b00b0015c5c21dc15mr8504475plc.16.1652515644071; Sat, 14 May 2022 01:07:24 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 09/30] interface: Remove unused includes Date: Sat, 14 May 2022 16:05:18 +0800 Message-Id: <20220514080539.2371140-10-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.8 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: Peng Liang 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: 1652515691724100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang Reviewed-by: J=C3=A1n Tomko --- 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 Tue May 7 06:22:05 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 1652515661009650.8619155001777; Sat, 14 May 2022 01:07: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-418-L9ZUTUsENgWBWiMIP66vrQ-1; Sat, 14 May 2022 04:07:35 -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 2B5FF382ECC4; Sat, 14 May 2022 08:07: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 12D3E7AF9; Sat, 14 May 2022 08:07: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 CDB6619451EF; Sat, 14 May 2022 08:07:32 +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 434111947058 for ; Sat, 14 May 2022 08:07:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 12AD75521EC; Sat, 14 May 2022 08:07:31 +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 0EAF65521E5 for ; Sat, 14 May 2022 08:07:31 +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 EBB89800B21 for ; Sat, 14 May 2022 08:07:30 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-42-UaSZSCHMO22IJUpTuPAfKw-1; Sat, 14 May 2022 04:07:28 -0400 Received: by mail-pj1-f53.google.com with SMTP id iq2-20020a17090afb4200b001d93cf33ae9so12787196pjb.5 for ; Sat, 14 May 2022 01:07:28 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id p23-20020aa78617000000b005104aa308e8sm2968466pfn.135.2022.05.14.01.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:27 -0700 (PDT) X-MC-Unique: L9ZUTUsENgWBWiMIP66vrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: UaSZSCHMO22IJUpTuPAfKw-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=otyeArUf6lI04ycHPG0kamrYHwW1N9AC+NNNf9lL7UQ=; b=uloibEa5UDzjudvupANNz6AHpNTkf2J5KVLSHMbMRx7WK1Qysx6+T2f9+i2kJOgjpb +1RQV/SPmWcGgZdSleiHynBD7UwHcuH15LlZOEmULbfqfv7shEDxQteLwF1hE99KHZUZ OYFL8CWF5rM8By7ytPvEorgHX+8If6k0eRt7OW6KrKoV7ZhpyMlfsNa7i1S5qeS2nibx DAIe500BgZymJ+1KkkDisBNqg972/Uta5GSlXQIxUFxMMekrelUQKmJgKrqregSrRezz KWsUYFk9Y56F4nMJsPbQTjSPBsV3mU5jcHdhdp0NwQ4fuC19DhrzU2RtcxjJ2qvo3ahY 01zQ== X-Gm-Message-State: AOAM533WrcA69KzQzdlHmWKTIjuBvk17LMfPqSdEn5BlaSnlY1icXtio 7K9Xtni10AktTzFB3KrfiZ/jqqVEjiJnkw== X-Google-Smtp-Source: ABdhPJyrgyChJ/y3tfhXZM0LK38xmjhCOADuRhcWLzCELd7UBgLer0YLDSJhb1JgiJtbBj9fkLWe6g== X-Received: by 2002:a17:903:22c1:b0:15e:c3b2:d632 with SMTP id y1-20020a17090322c100b0015ec3b2d632mr8627458plg.0.1652515647335; Sat, 14 May 2022 01:07:27 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 10/30] libxl: Remove unused includes Date: Sat, 14 May 2022 16:05:19 +0800 Message-Id: <20220514080539.2371140-11-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515661591100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515664400189.28760891396882; Sat, 14 May 2022 01:07: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-325-ALdKKqgbOp66ho1AEwYo7g-1; Sat, 14 May 2022 04:07:37 -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 65B553C025B9; Sat, 14 May 2022 08:07: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 51B92111E3E6; Sat, 14 May 2022 08:07: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 1EEF1194705A; Sat, 14 May 2022 08:07:35 +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 F0CEC194705C for ; Sat, 14 May 2022 08:07:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E42819D61; Sat, 14 May 2022 08:07:33 +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 E040B9D42 for ; Sat, 14 May 2022 08:07:33 +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 C9B5D1C0515D for ; Sat, 14 May 2022 08:07:33 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-588-3w4I4FzvMhStypoTfxpoVA-1; Sat, 14 May 2022 04:07:32 -0400 Received: by mail-pl1-f182.google.com with SMTP id d22so9993704plr.9 for ; Sat, 14 May 2022 01:07:31 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id t15-20020a1709028c8f00b0015e8d4eb290sm3059423plo.218.2022.05.14.01.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:30 -0700 (PDT) X-MC-Unique: ALdKKqgbOp66ho1AEwYo7g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 3w4I4FzvMhStypoTfxpoVA-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=XXPnmJ7C7Lb1sZpfhzx5f784nhi97eED9wTA+K9fthE=; b=yprlcW3Ld9MjcUIK0tRWdrnSoUF+6WQmmFhJiKyoHZ7w+22thi8Brs/AjNB9ryuWUT lk2SqyBB0vEn6m4tZQcGI2ToaFtNeeWh3qs1vo+Q1gCpGeUphn/Xs0KNcqb74Pcs0ZAX BVAKbdF466dRM88WkxNQQ0hicc0JbzOsT+2WbvSM0teUwa0fyqWk6nUmC2CsOSocJLDA Ges4PMIuwRdkUsk4HhvHdPAVbncGOsedDaspaShCmwmaMDJ0YspR5sQ5Xgcx704ds0+y lw93f8wQ0iNov4QSLD8BDVY1/OvX55XulKD3QVgh0jcrC4tsQuYcA77LGXltzF7gbaXZ zkdg== X-Gm-Message-State: AOAM530Epdv/UIsBpkbmPoT5cxVZv8mrrSZX3zMOdfJ4NS7cXhtzNcWJ l0FHCPkJSRTL/6xdqI3FGVCJ4Rkjtt5hlw== X-Google-Smtp-Source: ABdhPJz+aQ6LNirjJp+AAq7ziErYUkU8Md1LDP8YpqusByR0qfCcWTNnf+d/hoIgayEsldWb6dj3FA== X-Received: by 2002:a17:902:e80d:b0:15e:b27b:931c with SMTP id u13-20020a170902e80d00b0015eb27b931cmr8389586plg.5.1652515650742; Sat, 14 May 2022 01:07:30 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 11/30] locking: Remove unused includes Date: Sat, 14 May 2022 16:05:20 +0800 Message-Id: <20220514080539.2371140-12-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515665618100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515686735276.6334290757695; Sat, 14 May 2022 01:08:06 -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-6256dkiBNfGoM6Z4JtLQJQ-1; Sat, 14 May 2022 04:07:47 -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 2743486B8B5; Sat, 14 May 2022 08:07:46 +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 0630EC27EA3; Sat, 14 May 2022 08:07:46 +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 B275E19451F0; Sat, 14 May 2022 08:07:45 +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 08800194705A for ; Sat, 14 May 2022 08:07:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E447A111F3DD; Sat, 14 May 2022 08:07:44 +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 E0542111F3D9 for ; Sat, 14 May 2022 08:07:44 +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 C90421C0514E for ; Sat, 14 May 2022 08:07:44 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-41-Vv2QELVBMmuduPx4S1vhvQ-1; Sat, 14 May 2022 04:07:35 -0400 Received: by mail-pg1-f169.google.com with SMTP id 137so9531177pgb.5 for ; Sat, 14 May 2022 01:07:35 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id bd34-20020a056a0027a200b005108a492701sm2985692pfb.38.2022.05.14.01.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:33 -0700 (PDT) X-MC-Unique: 6256dkiBNfGoM6Z4JtLQJQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: Vv2QELVBMmuduPx4S1vhvQ-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=O2VFopWnYbYGa+EEWvjdqXaS2oB2kZDV0mXEfeWqWrw=; b=ITW6/nc0+sDnRPBx9Fj026tvTPYQAMzrV2qMZgIlzW5Ha/+/BmouV/QALtqhrNUx2x 4hgjeaNvLPYnZ6wFMM7bBxqERKrGpkwPUIUqtVQSTOMjdLT+vvYuCaS218zVgbwYXw5L bZboc1BBHmvtz3kFInueTU1ugMkyMPyNhXIbkbrkg83CcQXWGW7vpnIsCAbJpW2Elxuu ojs+fVRFBpKgdwlIt0oFqwk04fdEDUa7lQUiLcgV/Zvz89XR+Nf9S+3DcMlDYn5sTeLs nTTmzv82YZWyK4FKoC6sgHPZ5CPOyI+MJao2vLtNi/t/B5dfELar06z4Jq1lR5T9FFN5 Qxng== X-Gm-Message-State: AOAM531xV5xjf6aKg1z882n8AcP/oSfHQcHWsfo47LhwNY1Qe910yWXG C4+JP+tzUu84bZgWKeHW9DohMXOgpI2eYQ== X-Google-Smtp-Source: ABdhPJzvwPQ7WxOIwZZlayLohjVOF2LCl00qboJNhj7JTXj4ncDxio6Qcox1SO0HzNTkswkJViNTPA== X-Received: by 2002:a05:6a02:113:b0:3c6:4389:cd6e with SMTP id bg19-20020a056a02011300b003c64389cd6emr6929118pgb.414.1652515654029; Sat, 14 May 2022 01:07:34 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 12/30] logging: Remove unused includes Date: Sat, 14 May 2022 16:05:21 +0800 Message-Id: <20220514080539.2371140-13-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515687710100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515669243379.9546162093385; Sat, 14 May 2022 01:07:49 -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-190-sacGZ_9XPIKyGwBxv23nQA-1; Sat, 14 May 2022 04:07:44 -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 CBD8E2A59546; Sat, 14 May 2022 08:07: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 B4C7AC07F43; Sat, 14 May 2022 08:07: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 7FC16194705A; Sat, 14 May 2022 08:07:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D4620194705A for ; Sat, 14 May 2022 08:07:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C368DC159B3; Sat, 14 May 2022 08:07:40 +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 BFA88C27E9A for ; Sat, 14 May 2022 08:07:40 +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 A6C6A1C0514A for ; Sat, 14 May 2022 08:07:40 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-568-NljpRwK6PlGRHqnv08GyQQ-1; Sat, 14 May 2022 04:07:38 -0400 Received: by mail-pf1-f173.google.com with SMTP id bo5so9630751pfb.4 for ; Sat, 14 May 2022 01:07:38 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id n12-20020a1709026a8c00b0015ea9aabd19sm3030676plk.241.2022.05.14.01.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:37 -0700 (PDT) X-MC-Unique: sacGZ_9XPIKyGwBxv23nQA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: NljpRwK6PlGRHqnv08GyQQ-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=wIWUo29EGSdd6rBBBoGcn3svd9fHkUpIj2s4vZiAdw8=; b=K5jrnBglKB7pBMoO+B7HdrIKZT0XV+LENwqQW6h/9lWROnraf4spivL97Alyr0fPiT I3dpAoSp4elpLakBtknGlETdLaQp5UGEsjCzkrWlwVveWE3xjiaItW+mVxbEPEmLXd2+ kHTEudx9P4ZsFhkii+IYpWfIHw+2ATIKNdSkYhK0VnbT23JiT1THkisjLQCE5QSxfGs2 uX5yWahCA0eNBI3dAHu/KWIPSuozc1WUYnMZH2jptTVvmAMvTV1hPuYj8gDNujqcCOcu XWP6LWbrfz/OYBweav7N1GrYVnEOY8/oPwc1CHi6NayMQslYT7RiU8UDHswmhc6K956p NfqA== X-Gm-Message-State: AOAM5337deJykiDon36HjdtQy/MIGAm6gKAulcB7LDXrFjys2RK8gEJX hDNnu3H8PDg2hB1/0v+f2tWf0YWAWDbThQ== X-Google-Smtp-Source: ABdhPJw8qMDldSO5OFiJqyQZJI8BVJGtMLh+JTXvxzNl+lznVRG550yzdTn34KZZ1Py1t/qmGx1ciw== X-Received: by 2002:a05:6a00:18a9:b0:50d:d41b:7240 with SMTP id x41-20020a056a0018a900b0050dd41b7240mr8144033pfh.66.1652515657528; Sat, 14 May 2022 01:07:37 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 13/30] network: Remove unused includes Date: Sat, 14 May 2022 16:05:22 +0800 Message-Id: <20220514080539.2371140-14-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.8 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: Peng Liang 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: 1652515669919100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 3 --- 5 files changed, 13 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..ed1bc49346 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -24,12 +24,9 @@ #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" --=20 2.36.1 From nobody Tue May 7 06:22:05 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 1652515683120176.9447054325559; Sat, 14 May 2022 01:08:03 -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-356-QKzjoQLjO-2JNPR_DN0r8A-1; Sat, 14 May 2022 04:07:47 -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 96421382ECC3; Sat, 14 May 2022 08:07:45 +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 8228A1544F27; Sat, 14 May 2022 08:07:45 +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 5A75A194705C; Sat, 14 May 2022 08:07:45 +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 085341947058 for ; Sat, 14 May 2022 08:07:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DD5B9111F3DB; Sat, 14 May 2022 08:07:44 +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 D9039111F3D9 for ; Sat, 14 May 2022 08:07:44 +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 C1A24811E75 for ; Sat, 14 May 2022 08:07:44 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-zpob0RBOPpyBFRptOy4BQw-1; Sat, 14 May 2022 04:07:42 -0400 Received: by mail-pg1-f182.google.com with SMTP id h24so4219077pgh.12 for ; Sat, 14 May 2022 01:07:41 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id v1-20020a056a00148100b0050dc76281b5sm3151965pfu.143.2022.05.14.01.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:40 -0700 (PDT) X-MC-Unique: QKzjoQLjO-2JNPR_DN0r8A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: zpob0RBOPpyBFRptOy4BQw-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=jRodGybWlnIYRWm3l4sYSpeYzPdYfXNxygwDGMDFuUM=; b=S/gSBkXQ8W+8qnKdZ/rbb6q4b5ofiPVRziOoid68IYfi9rIdOxX3GsYbkNeVNi3z19 J+Vo/Fs5Wtp0Y47ugyc5y/jjr3yly09GfT3V/UvPqvlOjCzaW5R84TeZRfkSW69d3YKH w9+oagNpmJKdNSPyF57v6RpMCFgzJYh0JC4IvOOuuXzM7SDq/7VNt/WPZxOmkorAVgjd JIl1kNyT7fSi0YypT+oglzNkqB5Um8FTloiMMfEDcSXG7Co4qtuazTijGbVrm1aY1RSF YRJEY/oyy4KjsGXAhnKx5O5ZXAQiesBGdA9a62ZaXf6Re5iuaNvWFK4W2luKqdS0vRDc xVIw== X-Gm-Message-State: AOAM531KNjVniUApkZLg3EvFRUIBIC6ZBDhBJZbCMoYnfvbruZBmpyNx FOoT/u0pgjOyVJj5vWWzQWEwKf0Eiz0mEQ== X-Google-Smtp-Source: ABdhPJzyuPMoHs+tvnowjh4eoHGEuh9xW3iziEMATS5ohsm1FPP8mg3+7SpqWfn7rnlvyh5CQjvQBg== X-Received: by 2002:a63:2103:0:b0:3d5:dff1:30e1 with SMTP id h3-20020a632103000000b003d5dff130e1mr6838130pgh.376.1652515660726; Sat, 14 May 2022 01:07:40 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 14/30] node_device: Remove unused includes Date: Sat, 14 May 2022 16:05:23 +0800 Message-Id: <20220514080539.2371140-15-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515683684100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515675332152.73530659414166; Sat, 14 May 2022 01:07:55 -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-92-ptNSHBj3MzC16obQU63E0g-1; Sat, 14 May 2022 04:07:50 -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 664A680088A; Sat, 14 May 2022 08:07:48 +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 52229111F3D9; Sat, 14 May 2022 08:07:48 +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 EBF36194705A; Sat, 14 May 2022 08:07:47 +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 F1D0B194705A for ; Sat, 14 May 2022 08:07:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E7B23111F3DB; Sat, 14 May 2022 08:07:46 +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 E36BF111F3D9 for ; Sat, 14 May 2022 08:07:46 +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 CC52A80013E for ; Sat, 14 May 2022 08:07:46 +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-494-f7Jj7ZSUM6yrR7zxZOXL1w-2; Sat, 14 May 2022 04:07:44 -0400 Received: by mail-pf1-f176.google.com with SMTP id v11so9627738pff.6 for ; Sat, 14 May 2022 01:07:44 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id p9-20020a170902780900b0015e8d4eb294sm2342161pll.222.2022.05.14.01.07.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:43 -0700 (PDT) X-MC-Unique: ptNSHBj3MzC16obQU63E0g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: f7Jj7ZSUM6yrR7zxZOXL1w-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=Bu7Q8WeQ1z+SDExGtzH9kebFUflRnl22W5/7WZBGxVg=; b=ghgmlGJRt76vrAt9HCcUfxo7G7+zcqV1jfTH0hLlRxp9TuNHCdpH7CzrjRPjV1hq+2 F0qHkz4ES/pX0Y/jIVPe3aYoW4yfyxPcbFF7+umMUBhSQ2Rf3EU+bvJynwmMLInNATJY x73KQazLsojRAu+sjQRUFS1h3CPzXfwCnPP0nsTvr19hHE2chTC36eGyLxYmQ4mbr51i 8JOa4idcJH6EAjhgSJy7VfIWPoy+qNFnFTrV9XySKkJP5CimAYXCdEqngLN70vc8OP/E MT2crr8XHsp0II+IaybYWNkrJ6BeBaHqftgHuEaR52wMj0srIk/fLj0jE6C2TOnTtwGk Kx4g== X-Gm-Message-State: AOAM532QWiWe5+iEKPcgtzZ3cFB8nfVhRKtn82nu+TMOxdH2fts6CXKA hQhjsLMKf/PmZJvs4aWelSiCdtPSw+DGZw== X-Google-Smtp-Source: ABdhPJyCG+aPbl3N25P5k2kBQxCHskC4oVjW8VsM0HiP7VZXcDduESc7Sjh0ib5CL0Xo7mlWpXSf1A== X-Received: by 2002:a65:5801:0:b0:3db:141d:43fa with SMTP id g1-20020a655801000000b003db141d43famr6892566pgr.41.1652515664087; Sat, 14 May 2022 01:07:44 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 15/30] nwfilter: Remove unused includes Date: Sat, 14 May 2022 16:05:24 +0800 Message-Id: <20220514080539.2371140-16-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515675679100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang Reviewed-by: J=C3=A1n Tomko --- src/nwfilter/nwfilter_dhcpsnoop.c | 2 -- 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, 25 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index d26e787453..a10a14cfc1 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -45,11 +45,9 @@ =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 Tue May 7 06:22:05 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 1652515680662862.8560957909958; Sat, 14 May 2022 01:08:00 -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-468-iibh5P8yN8-qkyz28znR_w-1; Sat, 14 May 2022 04:07:53 -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 85CD385A5A8; Sat, 14 May 2022 08:07:51 +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 71F20C27E9A; Sat, 14 May 2022 08:07:51 +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 50109194705A; Sat, 14 May 2022 08:07:51 +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 8E9001947058 for ; Sat, 14 May 2022 08:07:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7095E1544F26; Sat, 14 May 2022 08:07:50 +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 6CEF51544F20 for ; Sat, 14 May 2022 08:07:50 +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 560AC800B21 for ; Sat, 14 May 2022 08:07:50 +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-416-4ey4r7JIOuq_E157FdWwjw-1; Sat, 14 May 2022 04:07:48 -0400 Received: by mail-pf1-f172.google.com with SMTP id x23so9628381pff.9 for ; Sat, 14 May 2022 01:07:48 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id a12-20020a170902710c00b0015f2b3bc97asm709976pll.13.2022.05.14.01.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:46 -0700 (PDT) X-MC-Unique: iibh5P8yN8-qkyz28znR_w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 4ey4r7JIOuq_E157FdWwjw-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=GJrEORxr+Tjz76SQfZ2I+kgh4eqcrouYJ+Uh4JWxrpQ=; b=hXCrzdKfzOVUEXEvWfjBFIw/QqRuuaNKqTSXjOSazwV9tTCN6O8ADF793TNnMIXjSG y4m2j3CTLD2yPurulndQ1zQXlYMjRarEpg4WEGFuvxMmdbi1dlHzkZN44uhMl7IyAqDd 8A2CQTKQhKppXITNPZTvkzMg4lkHSxqlZatM9lm+Bu9GuYJ2O5rjesHi8Dk6eVq8ygiu Ja0ro/CLfHZXg851MuHJFrjweZ0qk40xqtV4wJvvO3tXzFGaB39/l4r+YD4cOPvJd/1t gO7kM+x68oixtz7ymLsNSX4CAqNsjU6vR7gPJVlpkqVENJg5sZU5DPAIxSYs7jiA/X9R jMDA== X-Gm-Message-State: AOAM5335gWgvEt34WZtFl1egbZQrZSbUiAPD8+lP0L5jSng+P3Y2vovo ayvcqLre6dOrHal+hQi8X1x5xRljIVb77g== X-Google-Smtp-Source: ABdhPJxPVo18+HdINH8AF8ZaFIT2MmrZU7fhGz8ZGhAG1aLTRtSnXZRF4nOGnQzTWxhKR7a5NFfTYA== X-Received: by 2002:a63:2ad0:0:b0:3c1:5f7e:fd78 with SMTP id q199-20020a632ad0000000b003c15f7efd78mr7137317pgq.56.1652515667281; Sat, 14 May 2022 01:07:47 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 16/30] openvz: Remove unused includes Date: Sat, 14 May 2022 16:05:25 +0800 Message-Id: <20220514080539.2371140-17-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515681684100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 165251568998180.39504804190733; Sat, 14 May 2022 01:08:09 -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-591-1Xmve70oOWOheVr_F2QuJw-1; Sat, 14 May 2022 04:08:05 -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 45C7F380391E; Sat, 14 May 2022 08:08: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 290E1C07F43; Sat, 14 May 2022 08:08: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 9D4BA1932238; Sat, 14 May 2022 08:08:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3107A1947058 for ; Sat, 14 May 2022 08:08:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 24F5EC27E9A; Sat, 14 May 2022 08:08:01 +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 2053FC27E98 for ; Sat, 14 May 2022 08:08:01 +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 F296F101A52C for ; Sat, 14 May 2022 08:08:00 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-376-UI_rnySFNOKTVJXCVnDdag-1; Sat, 14 May 2022 04:07:52 -0400 Received: by mail-pg1-f174.google.com with SMTP id a19so9333299pgw.6 for ; Sat, 14 May 2022 01:07:52 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id w127-20020a628285000000b0050dc762813esm3012237pfd.24.2022.05.14.01.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:50 -0700 (PDT) X-MC-Unique: 1Xmve70oOWOheVr_F2QuJw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: UI_rnySFNOKTVJXCVnDdag-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=VfrLjsAsUQVQqWapoZxxL5Uu6AqqPvmh1SfZbQLPnk4=; b=kPklov6GNScxtQXH4BQ7N4fdLrL9phsJwRotidyV44Tcq5pAp3W2ao57KPKKvHVWbL RD0bGUlq9nUfdDTRGrIL0nQCmBzsFp3SebYmVDa5jXzqyUe6HC+893a7V8oPFwyQIT7a 7tKHhGcdOmo0RoHEXEZcjgjMxCaw05NRId+5D1v4cP5Gps76ce/CFsTfod305dCd2ny1 wgQAsQVMiDVc4LLHs0LGZRfe5dy7kCgBVELeE3L5sX6Z3LFI8mwris3R8Yi3d1Xd/jAl 33V5N40S1sX1ptf0bCcI0zRIB/bNV9KscBznlFUH6WKguxy6R9tVBdnzf2ZIUv6m7ZOQ b2fw== X-Gm-Message-State: AOAM533WeJ0Keh7YdeCLbIe43uWGM+1tBVLKdGIgsLD9oFRVk6wfExdx 41AZmnZBZcATcw5OOz8YF4eCDyMKEH0kZw== X-Google-Smtp-Source: ABdhPJy5uy5c1wX0yXqvlCG9iASqlHu5xmEywQm9vNSsa+W/N+3FVpo6xliXVEryymu494iXOlmfKg== X-Received: by 2002:a63:6904:0:b0:3c6:5a3c:64bd with SMTP id e4-20020a636904000000b003c65a3c64bdmr6941892pgc.371.1652515670908; Sat, 14 May 2022 01:07:50 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 17/30] qemu: Remove unused includes Date: Sat, 14 May 2022 16:05:26 +0800 Message-Id: <20220514080539.2371140-18-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.8 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: Peng Liang 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: 1652515691729100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 6 ------ 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 | 10 ---------- 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, 167 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 a59d839d85..d5e799e6b5 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" @@ -54,7 +49,6 @@ #include #include #include -#include #include #ifdef __APPLE__ # include diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 59c09903f3..dc628268fe 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 4d4be0683a..93faacf38e 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 248af92649..5075134efc 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 702fd0239c..abe33a158d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -25,11 +25,9 @@ #include #include #include -#include #include #include #include -#include #include =20 #include "qemu_driver.h" @@ -39,7 +37,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 +62,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 +99,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 25af291dc6..8e6505edc2 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 95fd773645..4e83d8d8bd 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 a0909b9f3d..838bb00e36 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 fd4db43a42..425d0a54ef 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 Tue May 7 06:22:05 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 1652515687199949.8702567926003; Sat, 14 May 2022 01:08:07 -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-557-lM2ghoOXPme-7JYb66SEUg-1; Sat, 14 May 2022 04:08:01 -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 7A49785A5A8; Sat, 14 May 2022 08:07: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 6654AC27E98; Sat, 14 May 2022 08:07: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 2D55B194705A; Sat, 14 May 2022 08:07:59 +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 BD7161947058 for ; Sat, 14 May 2022 08:07:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B24072027EB4; Sat, 14 May 2022 08:07:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ADE412026987 for ; Sat, 14 May 2022 08:07:58 +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 959C485A5A8 for ; Sat, 14 May 2022 08:07:58 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-V7Zer7ZeMXqQ8eM7M8pyPQ-1; Sat, 14 May 2022 04:07:56 -0400 Received: by mail-pl1-f176.google.com with SMTP id i17so9984865pla.10 for ; Sat, 14 May 2022 01:07:56 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id a12-20020a170902710c00b0015f2b3bc97asm710203pll.13.2022.05.14.01.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:54 -0700 (PDT) X-MC-Unique: lM2ghoOXPme-7JYb66SEUg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: V7Zer7ZeMXqQ8eM7M8pyPQ-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=vXsYG/+G5ZFcIIy5GFiqGxup2llLZ8dFps70B6PqqjY=; b=NzuVcmyvqy8lmd6PLiqdGhdcctsocyP9l0zOO+cD1aYBz3dcylQNJ1Mk2Ag7vtk3JR UAiTsrA9pBsFALOz5SlH7AG7PAM5QdnW8uLfebp2TUgRCLZHU1JoOdvG5kwDOx26GZoh d9UsDoDkm92IE02RxhW9+58oqkFFAlnPKwDaHUlgPUoPX8OSF00hMU8nUYIfCuPtAioq WY45OIb+6xOzVY5tDjiJ0opPSz6yjND2O5xpOtswawmfFcVm3Hz1WvAlMPlxHLQx3z2t JvpB0UCyLGm6ToK+N2iQ/a+eor1HiGXim6c7HAIzhMKsdETw4/JnDZ9n/Zr3V/bVabl0 h86A== X-Gm-Message-State: AOAM531vaapa+hUIzqeKv5fXyvmDfmXGJGGDLePEI9zpZjhxLk9BRllf fprvaWhizAwb9Z1wg1JAcOk5wYbt43CeXA== X-Google-Smtp-Source: ABdhPJzinM8cdtViWQFxZ4m9UIMYhroKdSMWpr/AoLxHSdJ/aDWA/DVdpZJWMddNeTwFh9Ua19dbrg== X-Received: by 2002:a17:902:e94e:b0:15b:22a7:f593 with SMTP id b14-20020a170902e94e00b0015b22a7f593mr8016451pll.148.1652515675126; Sat, 14 May 2022 01:07:55 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 18/30] remote: Remove unused includes Date: Sat, 14 May 2022 16:05:27 +0800 Message-Id: <20220514080539.2371140-19-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515687726100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 2 -- src/remote/remote_driver.h | 1 - 8 files changed, 15 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..becbfc6589 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,7 +42,6 @@ #include "qemu_protocol.h" #include "viralloc.h" #include "virfile.h" -#include "vircommand.h" #include "virtypedparam.h" #include "viruri.h" #include "virauth.h" 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 Tue May 7 06:22:05 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 1652515690727871.1166374364584; Sat, 14 May 2022 01:08:10 -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-150-vua1HOv7NP6eX4cToymnsA-1; Sat, 14 May 2022 04:08:07 -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 E9EAB1010364; Sat, 14 May 2022 08:08:04 +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 D4F441543C22; Sat, 14 May 2022 08:08:04 +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 9990F194705C; Sat, 14 May 2022 08:08:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BA0EF194705C for ; Sat, 14 May 2022 08:08:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A8DE12166B17; Sat, 14 May 2022 08:08:02 +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 A45D02166B16 for ; Sat, 14 May 2022 08:08:02 +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 8807C380391B for ; Sat, 14 May 2022 08:08:02 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-16-pWUaCO-NNRymwRP-jee81A-1; Sat, 14 May 2022 04:08:00 -0400 Received: by mail-pg1-f182.google.com with SMTP id h186so6887749pgc.3 for ; Sat, 14 May 2022 01:07:59 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id w23-20020a1709026f1700b0015f300ed0b7sm3048764plk.76.2022.05.14.01.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:07:58 -0700 (PDT) X-MC-Unique: vua1HOv7NP6eX4cToymnsA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: pWUaCO-NNRymwRP-jee81A-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=fS2Wvm9RPPWX/WMX3fksQFxdt3tCgQexkJSp0cyKQtk=; b=1tvm4pJQIsiY8ck3u4K1VNHn0EWXOWB1Bog0C362SYTAd2kvqbGOaQF5KwIi4yaJW0 73Sh9ezBQNd1YcDJOarGPYxSRkUgXUmU1HxlSGyUFqzlUNio5IOF8KbDTQv8RiHDx1oM k4yh85tmiWj2EEVUyzPSLE3cwEYSTKfl+iNa6+QnnCB+QJ4f2jb25mZc+QoGYGBnlQAZ x3M7RTGkRgvP0Hhsuio2EVki/zyhfE6frldSpoKz0RQ2/Yw4meq4IRIYSaiV7gLzoyUl hQczVTanqZfj60k6tuf3wb4LOooXNWFGx+ouYZxOEeYA6mwiqKWK/Qw6ZI2yHqZgf1Sv Li/w== X-Gm-Message-State: AOAM531QXCsUFbDhI7o6dcrUNGDO0Hw+Z3Bhngy2bzqssnKcO+8BrboL DD6iSC72OsD71Jm7HrLmXpABD3PWhhjYUw== X-Google-Smtp-Source: ABdhPJw8OCYNopy9QusRe2hiupcaeFoqqpTuyQR2HtPwzOJADWCluIIE8vF9Q5wPLw8kglE9d4RJDQ== X-Received: by 2002:a63:80c6:0:b0:3c2:8bd5:723b with SMTP id j189-20020a6380c6000000b003c28bd5723bmr6980434pgd.378.1652515678642; Sat, 14 May 2022 01:07:58 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 19/30] rpc: Remove unused includes Date: Sat, 14 May 2022 16:05:28 +0800 Message-Id: <20220514080539.2371140-20-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.6 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: Peng Liang 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: 1652515691715100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 1 - 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, 28 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..17ab61b882 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -27,7 +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 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 Tue May 7 06:22:05 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 1652515695458748.5953312259309; Sat, 14 May 2022 01:08:15 -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-218-NwGgBF-tPsS7ZqjSpOz0Hw-1; Sat, 14 May 2022 04:08:09 -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 9A4E185A5BC; Sat, 14 May 2022 08:08:07 +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 86140111F3DB; Sat, 14 May 2022 08:08:07 +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 4B10E19451EF; Sat, 14 May 2022 08:08:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 91C08194705A for ; Sat, 14 May 2022 08:08:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8789BC07F43; Sat, 14 May 2022 08:08:05 +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 82E17C159B3 for ; Sat, 14 May 2022 08:08:05 +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 6BF3A3802B8D for ; Sat, 14 May 2022 08:08:05 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-8YtiQZnCP6KKOCm4ZTuh2A-1; Sat, 14 May 2022 04:08:03 -0400 Received: by mail-pl1-f174.google.com with SMTP id m12so10019187plb.4 for ; Sat, 14 May 2022 01:08:03 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id i1-20020a056a00224100b0050dc7628142sm3041385pfu.28.2022.05.14.01.08.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:01 -0700 (PDT) X-MC-Unique: NwGgBF-tPsS7ZqjSpOz0Hw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 8YtiQZnCP6KKOCm4ZTuh2A-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=MaBdfkxnW2zJ2ZVJBnfGRsNyNNaegcwpLcmsv8He1+8=; b=j8OJbJoI/cAoq9IOtY2bn8oqwUTqqNuqzcRXKmYUH8JX8Repjs8KlFSqVmQI/heWtT Jxzy7C/p9uUuxqGiGcZe2YcCmrZDN/Dsa/aWigegGXdUSQZWEdPkz9f54TON1OflZxhV pMdG0onWRRj8gRv5jNDDt/HgMO89xlpajSNRUnsXxYptdVF2ltNVqM8e9Ns+VOn0sche BzUOFlh1P+5gBQ+Z2Uoc7zgfBlatfVrz+oytMPMOPpdBG8q4v4TSOaP0tXKfkocJyuOt O/1LvRihaQm096NxuGuYFY1Fpa+ln+G9U4VW9UCuqiFXkbGkYdvrHwY7fIMOJbRHJ1zb k2Fw== X-Gm-Message-State: AOAM531mxuuUXgaWRFVO+IGLs5D3fwwMMDq5Pc290HEXl9OniiT8Y7Zk TDL+o8GDTOl2idmKdqtv1s51f+QGK9bKWg== X-Google-Smtp-Source: ABdhPJwtp3xu8cznLXFzVHBVBPpXytAV/UZxWrEp+2799JGr6Ufbwmaa21snYjPyuGTJq0cPkHxqaQ== X-Received: by 2002:a17:90a:4282:b0:1de:c783:4e79 with SMTP id p2-20020a17090a428200b001dec7834e79mr8698153pjg.235.1652515682170; Sat, 14 May 2022 01:08:02 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 20/30] secret: Remove unused includes Date: Sat, 14 May 2022 16:05:29 +0800 Message-Id: <20220514080539.2371140-21-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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.8 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: Peng Liang 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: 1652515695770100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang Reviewed-by: J=C3=A1n Tomko --- 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 Tue May 7 06:22:05 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 1652515703389533.6647469771643; Sat, 14 May 2022 01:08:23 -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-18-LqM-h6v-Mxu2TY2VTha8GA-1; Sat, 14 May 2022 04:08:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7CD34185A794; Sat, 14 May 2022 08:08:10 +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 66DC32166B4E; Sat, 14 May 2022 08:08:10 +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 28CA81932238; Sat, 14 May 2022 08:08:10 +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 8895A1947058 for ; Sat, 14 May 2022 08:08:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 724A8111E3E9; Sat, 14 May 2022 08:08:09 +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 6E0D3111E3E6 for ; Sat, 14 May 2022 08:08:09 +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 4DEF11C0514D for ; Sat, 14 May 2022 08:08:09 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-19-smNquS0IP5OYNRfGUYLI6g-1; Sat, 14 May 2022 04:08:07 -0400 Received: by mail-pf1-f179.google.com with SMTP id y41so9607251pfw.12 for ; Sat, 14 May 2022 01:08:07 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id s35-20020a056a001c6300b0050dc7628137sm3204831pfw.17.2022.05.14.01.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:05 -0700 (PDT) X-MC-Unique: LqM-h6v-Mxu2TY2VTha8GA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: smNquS0IP5OYNRfGUYLI6g-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=QI0V3iCdZRTL0xQcHtaNdm0YlKQ5UC2hnh50fjUaNEM=; b=iHF7XkSQT4J2o98JDyT5BgIvt2ChCMoWhfIMTL1C2C8M6NRIvGQd9dfu4ENS4hvj8L HCkQmtEdFQ1BK+6QywwBSSYb6ZcUULcLrWzJS+Ph86DXrQz4WQieNQ0O/oK2D6GGfwuT tfcfvqL+lJG2A/UHlcPCmntT5mT5QGTCWYL7yEIBZ23B0x5MA4HKeLSSIyjw97FJlBZB tmfMmODgJqCKuR/JDgYPlw0BkG2Au4MUpwBS8Ly/6J8EFHVGtAbQ95IWaJIIVPOmx+1I VE2lEGuwiCDBgDGjUPjw5fBSW/yyGhFVkCwK4hjEuuMB0eYWDI8PDL7HNMcOOml8pWUK uO/A== X-Gm-Message-State: AOAM532GFZZhn9NaDJ8JecJ4PJGllQwWXFq3EQoy4BZi77Sv/FRHX+Yf RyBOveIsffe5OSGtrudwswZoENdGXqU20A== X-Google-Smtp-Source: ABdhPJy1WSIGaN2jzbj2wcUtm0Vbh01GdqAYFTBAeVMMIoD+UB3lFNG5b3WrzkETuGAOq+BpukMAVg== X-Received: by 2002:a65:6a05:0:b0:3db:27cb:9123 with SMTP id m5-20020a656a05000000b003db27cb9123mr7075829pgu.497.1652515685806; Sat, 14 May 2022 01:08:05 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 21/30] security: Remove unused includes Date: Sat, 14 May 2022 16:05:30 +0800 Message-Id: <20220514080539.2371140-22-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: 1652515703797100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang Reviewed-by: J=C3=A1n Tomko --- 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 Tue May 7 06:22:05 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 1652515701395604.2034711367957; Sat, 14 May 2022 01:08: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-37-502uRBZXMm2QmuCucIyOzw-1; Sat, 14 May 2022 04:08:16 -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 0C48380B71A; Sat, 14 May 2022 08:08:14 +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 EA85D5521ED; Sat, 14 May 2022 08:08:13 +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 C36241947058; Sat, 14 May 2022 08:08:13 +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 780131947058 for ; Sat, 14 May 2022 08:08:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6D036416157; Sat, 14 May 2022 08:08:12 +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 692DE416156 for ; Sat, 14 May 2022 08:08:12 +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 508D93C025BC for ; Sat, 14 May 2022 08:08:12 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-664-O6w3jPEbNDacSY_ch8AfvA-1; Sat, 14 May 2022 04:08:10 -0400 Received: by mail-pl1-f170.google.com with SMTP id s14so10013329plk.8 for ; Sat, 14 May 2022 01:08:10 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id a15-20020a1709027e4f00b0015eaa9797e8sm3055184pln.172.2022.05.14.01.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:08 -0700 (PDT) X-MC-Unique: 502uRBZXMm2QmuCucIyOzw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: O6w3jPEbNDacSY_ch8AfvA-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=wy8aauoHPJPteuIue1gcjI0mY1dK9rQlI1ufX6jMSuE=; b=bq5hmQnzp5Sg+VGaPEe1IJC9TJhNYvtnTSVKrz0DsMZdy835DJVFfy5Ndxu1vbe/O5 7AcGI8Z+DGQ7LhaezKMBAIsfqjimtygFQf1fKiaDptRTodEz1aKE0q7opJa5yTw9j3lK BJt4o9nWg4SC9g1dScrU8hfg/qCZ/XoSw/uzQZ9mkAlFPPhn/pBNpeZYjtxh0ZlUPX8N 1wXb8rvqIs/O+05dzr3sZb23AuuzixW+i1cHiELT6dtl9EeT2TLyse4OpNYZgKp00m3f ijYOkNTwaOhqs3kLOTIlqWR1XcKZCJrvHXP5Fcmeh/N1F8rRmq9h8V3TMgSoeFh/N0pH fnzw== X-Gm-Message-State: AOAM530RGOXiSpF5DmreDmcXdvhtz4eIrd3M+oZlIkqO0PaP20BKRlxK gI4t7ghw3STXIbWKAYlazGM1eaikbQ8WtA== X-Google-Smtp-Source: ABdhPJzdfpVLbMjE4BXE2z59reLRwrB+j8PHkeM+nI9RE9jAwUZn9XyJ5XpW66y2n9N/WpT9hVuycg== X-Received: by 2002:a17:902:e808:b0:15e:b27b:9302 with SMTP id u8-20020a170902e80800b0015eb27b9302mr8496846plg.54.1652515689240; Sat, 14 May 2022 01:08:09 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 22/30] storage: Remove unused includes Date: Sat, 14 May 2022 16:05:31 +0800 Message-Id: <20220514080539.2371140-23-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515701851100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515709536446.0847043208347; Sat, 14 May 2022 01:08: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-175-zLjZndzXMK-f0kq-iixDSw-1; Sat, 14 May 2022 04:08:19 -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 86E2F3802B8E; Sat, 14 May 2022 08:08:17 +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 748E9111E3E6; Sat, 14 May 2022 08:08:17 +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 D91BA194705C; Sat, 14 May 2022 08:08:16 +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 A92231947058 for ; Sat, 14 May 2022 08:08:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9F88240D2822; Sat, 14 May 2022 08:08:15 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B98F40D2820 for ; Sat, 14 May 2022 08:08:15 +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 8437F85A5BC for ; Sat, 14 May 2022 08:08:15 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-383-rAMrK7bUNDGyiFn51HYt2Q-1; Sat, 14 May 2022 04:08:13 -0400 Received: by mail-pj1-f41.google.com with SMTP id c1-20020a17090a558100b001dca2694f23so9778037pji.3 for ; Sat, 14 May 2022 01:08:13 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id x71-20020a62864a000000b0050dc7628196sm2980155pfd.112.2022.05.14.01.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:12 -0700 (PDT) X-MC-Unique: zLjZndzXMK-f0kq-iixDSw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: rAMrK7bUNDGyiFn51HYt2Q-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=O2e+tMP4eQ9ueruUQiSTwOsuL3TLN9bhkTEMPUKDhHk=; b=6tF6Y2uBTMZtMMPal/mab0YXoVIrRl0aOOC4nkkEmA58HfnxRsk3kO8Lax/dsg4rtk ytnkbu69U89uqPSOfkwpacJrxy8kYSYMFInJJGIDS1T/ekuvVG3CQhX+uAToGf9stNdC ANP0C/NfkUIehhbbDKIkdjG7IA5SVortnt7Qu+owjcT9Vb/xlywW5OE47oBm4U2K2Ofs GRBavrYFwpXLeVKYS76g2J/n7wkcdco8uwhkzNZA9e8r6ylJfLAFnfVL8kGXMOSBft+G IYxa6rqAVR3rvnZBaVoLdxR94zHhU+YNd8eytgfc2TH3xFHwps5/oW4Wn6aHEPay+AQD ZdxA== X-Gm-Message-State: AOAM533U5kvEpYGEpRhlU0slCCNLpFxO2vYBGzbJka7nft3S/NGtekO2 oIU8P2lxdDG+897JCMd6mXOIV9qXboE6lg== X-Google-Smtp-Source: ABdhPJwjYQdPoE0sO7prUgCXwlLkgh7KI51awPJrra4LM3Mcr6GpwB6ozrxxT+lrs44vwhAFBtb8mw== X-Received: by 2002:a17:90b:388c:b0:1dc:542b:a596 with SMTP id mu12-20020a17090b388c00b001dc542ba596mr20121046pjb.76.1652515692525; Sat, 14 May 2022 01:08:12 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 23/30] storage_file: Remove unused includes Date: Sat, 14 May 2022 16:05:32 +0800 Message-Id: <20220514080539.2371140-24-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515709812100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang Reviewed-by: J=C3=A1n Tomko --- src/storage_file/storage_file_backend.c | 2 -- src/storage_file/storage_file_backend_fs.c | 4 ---- src/storage_file/storage_file_backend_gluster.c | 2 -- src/storage_file/storage_source.c | 2 -- 4 files changed, 10 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..c657cb0277 100644 --- a/src/storage_file/storage_file_backend_fs.c +++ b/src/storage_file/storage_file_backend_fs.c @@ -27,12 +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 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..853f488bd6 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -32,11 +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 2.36.1 From nobody Tue May 7 06:22:05 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 1652515744364668.7355172974216; Sat, 14 May 2022 01:09:04 -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-647-OneK9tEXNaW6mfXw06rzJw-1; Sat, 14 May 2022 04:08: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 0FE458015BA; Sat, 14 May 2022 08:08: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 E5C8A111F3D9; Sat, 14 May 2022 08:08: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 8FF28194705A; Sat, 14 May 2022 08:08:26 +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 223C41947058 for ; Sat, 14 May 2022 08:08:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F272C111F3DD; Sat, 14 May 2022 08:08:24 +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 EDD29111F3D9 for ; Sat, 14 May 2022 08:08: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 CD93B3802B84 for ; Sat, 14 May 2022 08:08:24 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-639-fjDTgyl2NSWo2cN-bBU6fQ-1; Sat, 14 May 2022 04:08:19 -0400 Received: by mail-pg1-f174.google.com with SMTP id x8so6111286pgr.4 for ; Sat, 14 May 2022 01:08:19 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id i1-20020a17090332c100b0015e8d4eb21bsm3123295plr.101.2022.05.14.01.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:15 -0700 (PDT) X-MC-Unique: OneK9tEXNaW6mfXw06rzJw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: fjDTgyl2NSWo2cN-bBU6fQ-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=ZoZJusxbiInNtDzLkXPXrKX2kKO8x60G3TpPEufCGp4=; b=fJJxvGVw8K2zzsgpfpuRV38ctz1B1X7BRQtBkkEdSPOvohB4caK7gm7WW9ymEcxRvC SPMPc67KU5NgwpIGjsWBUe4vEZ4U3n0/poOXSZ5i0ceYJejGLD90LXHsNBGyjUzURdZb sNVrI7SR1tNp0ewVhIZZFBJ1/iGEVaqnhw9pi0B6WcBbZtlR8wmSSn4rwCkGHBuQ0la4 PBPKelXUMM+jYZlzwPbs75IuOYEpV+t5OlCfqwQoBmnnyVWkqLnkB3jmVI1kdLOq6C3u SRAKOUK6fUCP8jXYhREG8t0Ze6n1VxwwkstaWzUJ9AuK4DgBhCXfLVG/UnmU5iUbmSFF XhGQ== X-Gm-Message-State: AOAM5303eGkwrQaQ1evtmSwSAOZJi5FizLbcH7y1+UOXtfZnILHHjuwf Cv413fOdtq3eHgBZ1EhlPqSW6Ij4IGyVBg== X-Google-Smtp-Source: ABdhPJyOr8ip52ceETZZAScjSeo2aRzWwDE/MvoFpB0KSG3WGqT2wTVRMyWV99J3dhfgGUXXKYagxg== X-Received: by 2002:aa7:88c2:0:b0:510:543c:3f51 with SMTP id k2-20020aa788c2000000b00510543c3f51mr8158254pff.2.1652515696382; Sat, 14 May 2022 01:08:16 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 24/30] util: Remove unused includes Date: Sat, 14 May 2022 16:05:33 +0800 Message-Id: <20220514080539.2371140-25-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515746128100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 1 - src/util/virnetdevbridge.c | 2 -- src/util/virnetdevmacvlan.c | 2 -- src/util/virnetdevmacvlan.h | 2 -- src/util/virnetdevmidonet.c | 1 - src/util/virnetdevtap.c | 1 - src/util/virnetdevveth.c | 2 -- src/util/virnetdevvlan.c | 2 -- src/util/virnetlink.c | 1 - src/util/virnetlink.h | 1 - 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 --- 86 files changed, 144 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..d816bcbf06 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -24,7 +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 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/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/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..ad1f517039 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -24,8 +24,6 @@ #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/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 Tue May 7 06:22:05 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 1652515714539283.599102882425; Sat, 14 May 2022 01:08:34 -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-6vTaTxseN7uureelg_8jJw-1; Sat, 14 May 2022 04:08:26 -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 DFD3C803B22; Sat, 14 May 2022 08:08:24 +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 CA63F5521ED; Sat, 14 May 2022 08:08:24 +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 75B23194705A; Sat, 14 May 2022 08:08:24 +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 87C0B194705A for ; Sat, 14 May 2022 08:08:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7BDB8200B664; Sat, 14 May 2022 08:08:23 +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 775292026987 for ; Sat, 14 May 2022 08:08:23 +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 5FA3280088A for ; Sat, 14 May 2022 08:08:23 +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-114-JDDmzhXrPxeoW-_TNf-ilw-1; Sat, 14 May 2022 04:08:21 -0400 Received: by mail-pf1-f180.google.com with SMTP id i24so9624180pfa.7 for ; Sat, 14 May 2022 01:08:21 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id i9-20020a632209000000b003db7de758besm2996466pgi.5.2022.05.14.01.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:19 -0700 (PDT) X-MC-Unique: 6vTaTxseN7uureelg_8jJw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: JDDmzhXrPxeoW-_TNf-ilw-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=LsNgLZc4A7gL/2SIVLyx0AMhygk77dmgHJZlTJQe39k=; b=JpI0Rud5lV1ehoKguuCei1V3kgJHPmjG2I1uu2b6PQ93/7GT3gr9ZeS+cHiqRsOQzz fAOGZoUYxlLmSU2CwpZ4WcDaTv1Z4cGJrAqZHUWS33rDwt566tOHYP1bVzlx05Kb+ZHm fJ2dWDWHxtyOYPEcZ54GOhCDx3Bdr/oeyJN9qbYylR60pKm2QMHfiGDsCqYbCWyEQO9L FQXKfj4k+mKLAhBQxGAQoU31Wa6UhGHnmkeQUZ3wMrdoGcqkPqKbSwhMTbOu3lCMXWt7 QrkCzR3qc+jEg7fR/pyMa20E8nJeCP6COnCPkNhMBQuCOOl/Tz4LE0mdzDLNFKA0zFY+ GM5Q== X-Gm-Message-State: AOAM532NpD4S7jSjB8tSZ9Qr7iSCWl7NQ76RgrO/rF6HWbF3fTS7T6bz /iAoN+d5FmPjlG/4A1FXTQ5V5B3zilhgjg== X-Google-Smtp-Source: ABdhPJz4H/ZHN7Rg5JoiBhqcXOw7MuhQRSRLt34WqmLQy7gARt+p0lZiACZLcA5fuem43hlQ8AEp6g== X-Received: by 2002:a63:80c8:0:b0:3c2:88f0:7616 with SMTP id j191-20020a6380c8000000b003c288f07616mr7165590pgd.260.1652515699968; Sat, 14 May 2022 01:08:19 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 25/30] vbox: Remove unused includes Date: Sat, 14 May 2022 16:05:34 +0800 Message-Id: <20220514080539.2371140-26-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515715988100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515753716627.8930596346797; Sat, 14 May 2022 01:09:13 -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-630-i2nIfLWBNHS29vEV86dbRg-1; Sat, 14 May 2022 04:08:30 -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 5FB0480013E; Sat, 14 May 2022 08:08:28 +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 4C8501543C20; Sat, 14 May 2022 08:08:28 +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 E8931194705A; Sat, 14 May 2022 08:08:27 +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 DECC21932115 for ; Sat, 14 May 2022 08:08:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CFCDB40CF8FB; Sat, 14 May 2022 08:08:26 +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 CBD8E40CF8F1 for ; Sat, 14 May 2022 08:08:26 +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 B35121C05153 for ; Sat, 14 May 2022 08:08:26 +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-632-ESSdV4SPPIikJk5J3GmupQ-1; Sat, 14 May 2022 04:08:24 -0400 Received: by mail-pf1-f181.google.com with SMTP id p12so9683971pfn.0 for ; Sat, 14 May 2022 01:08:24 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id p11-20020a170902e74b00b0015e8d4eb1d8sm3151935plf.34.2022.05.14.01.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:22 -0700 (PDT) X-MC-Unique: i2nIfLWBNHS29vEV86dbRg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ESSdV4SPPIikJk5J3GmupQ-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=+/pjMPY+ovz2VIPXuJdWUOGTUhaFlHFjWSg0jCJMbGs=; b=VUp/VLuxkJJezG5bCYK1dzPhh4jrjid0IhZcGABld/vCaYx7dB228IZLicTWyr4Ib6 t/pigH+MvXYMQvdFFET5C8Olal+50JI0r0j0FL3YSjYPBMgAb1oXsvSpmHEWYn2gUehF m2b3UTuW4oqwODnPnmCURs6I/Vc+e/SYZN/XqDIXKNIrRb5qm530dfNnaq2IA53wtoEk 1B+UNxWBd2ZV8wiuQYVXgza3niw/fz/SlHUvcJAEri36T1P98AJbuxwCoNPC+ylu9sw9 9dC7ySO4qVtSmewBFvtGkbVOHkCq/qWFjoeIwv1b6DJxeoMW07UQ1ExzUODJt5jrvoug w+xA== X-Gm-Message-State: AOAM533AoSMasJ/SNb7S22WLq35DXVMktQ5X2Pk+uW9G5W0lovL+en+s yQBCqcnWWm3VfjDMJYi87jnsfBMWTryAXQ== X-Google-Smtp-Source: ABdhPJxowe9v6iRR4qaPrj3wgrvCaJtMFGPEJ2lhZxT/TDUDjkfAdTk7CtYBcWBpOqY+Dyv3W/E79Q== X-Received: by 2002:a63:88c8:0:b0:3ab:1871:13b4 with SMTP id l191-20020a6388c8000000b003ab187113b4mr7156555pgd.85.1652515703314; Sat, 14 May 2022 01:08:23 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 26/30] vmware: Remove unused includes Date: Sat, 14 May 2022 16:05:35 +0800 Message-Id: <20220514080539.2371140-27-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515754141100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515718856481.5012295169274; Sat, 14 May 2022 01:08: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-490-QULEZF-lPj62rJfwsO2azw-1; Sat, 14 May 2022 04:08:33 -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 53E9F85A5A8; Sat, 14 May 2022 08:08: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 4187D5521ED; Sat, 14 May 2022 08:08: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 C73BA194705A; Sat, 14 May 2022 08:08:30 +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 10DC81947058 for ; Sat, 14 May 2022 08:08:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 047ED7AF2; Sat, 14 May 2022 08:08:30 +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 00A597C2A for ; Sat, 14 May 2022 08:08: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 DC4FB101A52C for ; Sat, 14 May 2022 08:08:29 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-267-NnkuRMRrNuiRWsmI4Zbncg-1; Sat, 14 May 2022 04:08:28 -0400 Received: by mail-pg1-f174.google.com with SMTP id g184so9546173pgc.1 for ; Sat, 14 May 2022 01:08:27 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id d11-20020a62f80b000000b0050dc7628149sm3011073pfh.35.2022.05.14.01.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:26 -0700 (PDT) X-MC-Unique: QULEZF-lPj62rJfwsO2azw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: NnkuRMRrNuiRWsmI4Zbncg-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=0907dv5dS1EbcaHXULXVOGxN+JfY7n380efvHZqyu6Y=; b=38ROp7eiNYJM06Pw17Clrv0W+6uvMI0Qj1BJ4/IiB0z7PwZL49XjWZ7+AvYKlKCOcN ZokLLRpc+87DcYdCcHm+TXDHIpBonFJ5V+2IOienZc5jfPcJiFM6GBkEVyoiKd+H3Wwe t+L6Po3MeRMBuSsr8ZjQVmBsNcE9pYu7lCg+cuZ0ojZ9Ln2rmSG4GkaRhi9HGitINJUd ecc23DTs006OEOlfp9F0Rvx7+lPM2PuJdlsktzJ75zls1CG05u/SOTXsHPMygXyXqv5T 7vHW6n+ZsTx/9PgKDeVFMLKQmpBEhn8ckb6Ybh+l7O0mU+Gznait+tTrQjb3A3ijcESe OIfg== X-Gm-Message-State: AOAM53108QuRlD7/pk2uGOsaaQP+RyXbfP9DNImhOseX4oB0HZ00W1ju VIbEnio6feVs82QM7zIafj6A77dxulU3nQ== X-Google-Smtp-Source: ABdhPJyxBPxuCo3DOMarzQoYQUC1kr4Ip2ckwcfChaFWra1c1t8I7oYPqdJmpV1QZ8ig12aoEZwLGA== X-Received: by 2002:a63:9d06:0:b0:3c1:5f7e:8e66 with SMTP id i6-20020a639d06000000b003c15f7e8e66mr7129328pgd.538.1652515706669; Sat, 14 May 2022 01:08:26 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 27/30] vmx: Remove unused includes Date: Sat, 14 May 2022 16:05:36 +0800 Message-Id: <20220514080539.2371140-28-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515719997100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515724262370.4957232796962; Sat, 14 May 2022 01:08:44 -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-546-v6TZeXbiPHqiKgzgLQFMog-1; Sat, 14 May 2022 04:08:36 -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 8716F1010361; Sat, 14 May 2022 08:08:34 +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 73E3AC27E98; Sat, 14 May 2022 08:08:34 +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 1891D194705C; Sat, 14 May 2022 08:08:34 +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 964B41947058 for ; Sat, 14 May 2022 08:08:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 885E140D2822; Sat, 14 May 2022 08:08:32 +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 840A140D2820 for ; Sat, 14 May 2022 08:08: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 6C600811E75 for ; Sat, 14 May 2022 08:08:32 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-16-hSrpbzQMOESl4hG7EEz_dg-2; Sat, 14 May 2022 04:08:30 -0400 Received: by mail-pg1-f182.google.com with SMTP id h186so6887749pgc.3 for ; Sat, 14 May 2022 01:08:30 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id z10-20020a63e10a000000b003c14af505f7sm2831884pgh.15.2022.05.14.01.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:29 -0700 (PDT) X-MC-Unique: v6TZeXbiPHqiKgzgLQFMog-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: hSrpbzQMOESl4hG7EEz_dg-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=fQAVvZVgOmMCyytGBquJqtRvdfiY+dGRofMYqapMUhw=; b=GK4y7pBuHXAdG4CzSWclnYtQqPoMhSSST91G1BnIz5y/Cgj37vgUiJnyNuLv6lZwiW OZDVqfgrnJ3WXstbqHYTt+Y2ughX9dZPP04YKPK6UWTuxOlHMlrB8yPGtc99OtyuYQe4 aMhWtQaDY8IDVCS70tYVHSkr/LnKjfFslAtn7ZK+NGTrPb8HinkUsmaHaYMcDdPaPF2A 7AHyh1b3N89VBQVwAXcbHZ+CAWKdb2OkurthKXpV7f9cRHT6btG2lZ3cg/9gIp6P2jKE agOatYL+FC3vAclOJ1vknk7VqEM4WtsGSBKid1421NAkOZrBRVeGM4B8+tq5nOXDuW+w zKxQ== X-Gm-Message-State: AOAM5316X/k/afSdv7StZyVo4xKqUY1DQA60NMyhgI+R/VOvTqurZRoS WaKKCRupc0Vkfo0aqSUiFyyNQiXpqf3/zQ== X-Google-Smtp-Source: ABdhPJyqASiqKw0VnXeI4crdzq0g6nce8fW5GQKnhizeRojuMVGyC4KO5F3U937O6C212YtWG3PMZg== X-Received: by 2002:a05:6a00:10d3:b0:4fe:5d:75c8 with SMTP id d19-20020a056a0010d300b004fe005d75c8mr8067006pfu.6.1652515710068; Sat, 14 May 2022 01:08:30 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 28/30] test_driver: Remove unused includes Date: Sat, 14 May 2022 16:05:37 +0800 Message-Id: <20220514080539.2371140-29-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515726017100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Tue May 7 06:22:05 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 1652515726652188.26154834050317; Sat, 14 May 2022 01:08: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-558-SqDJ7XtXPNS4cAcj890Y2A-1; Sat, 14 May 2022 04:08:40 -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 7EF5F803CB8; Sat, 14 May 2022 08:08:38 +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 67E74111F3DB; Sat, 14 May 2022 08:08:38 +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 47066194705A; Sat, 14 May 2022 08:08:38 +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 7C2A2194F4BB for ; Sat, 14 May 2022 08:08:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5F93F40CF8F1; Sat, 14 May 2022 08:08:37 +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 5B83F400E894 for ; Sat, 14 May 2022 08:08:37 +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 418B6100DDF5 for ; Sat, 14 May 2022 08:08:37 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-KJIlxBqSNiWKYT5JkzKa6Q-1; Sat, 14 May 2022 04:08:35 -0400 Received: by mail-pj1-f41.google.com with SMTP id b12so665122pju.3 for ; Sat, 14 May 2022 01:08:34 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id cp15-20020a170902e78f00b0015eab1b097dsm3133762plb.22.2022.05.14.01.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:33 -0700 (PDT) X-MC-Unique: SqDJ7XtXPNS4cAcj890Y2A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: KJIlxBqSNiWKYT5JkzKa6Q-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=XhItLAtXTgccpqrFu5qBEfjdapP8CmTV2aJk5gsK55s=; b=x/4o1n8LCmcAhjcULDtaSbRj9Xx5bsHM8DGYzL9n/2Uh6djVrDD/CN7Ju6JAECgPsf +i0f36gIJzNTtvY22NgJO8yCJpPNe6hnvCIEaOD3FUL33bHql2poaFTGumLRf5Vf7366 ZojfG2L2sqlUphrSujnFEfzQ6QGW/GG4Z78zxroJ3CP1mCOKTdmG/416NL10HgA0lPFx jBFcOWBtAzDXkub3ZLx/B2ZP/JU3/kcnEM2q3CbvZT2ka2OTjIU0bZcrb4Q9PNYx9ywA r3k+zBQX+3WY/l8V1k968Fos3zS5mzs/eT5bB23yrGoQM559QcNDicYzVt31l7LiKuGV Qecw== X-Gm-Message-State: AOAM531TnghgDnuDHTRt/coey1zCAJ2PMg8iEYwXJqS1IIwdvkZiIecu h267q7FZBOTMzQyd836YPCY4A9UPmqPRCA== X-Google-Smtp-Source: ABdhPJwRANNSP9VEBy9LJs3pnEHdhUryIbwzpmpmspyIo2MfEn2peUTzOCybwMQeL2ZgkoGSkA8iTw== X-Received: by 2002:a17:90b:14ce:b0:1dc:eff5:52b6 with SMTP id jz14-20020a17090b14ce00b001dceff552b6mr19820174pjb.148.1652515713686; Sat, 14 May 2022 01:08:33 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 29/30] tools: Remove unused includes Date: Sat, 14 May 2022 16:05:38 +0800 Message-Id: <20220514080539.2371140-30-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515728069100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 7 ------- tools/virsh.h | 2 -- tools/virt-admin.c | 1 - tools/virt-admin.h | 1 - tools/virt-host-validate-common.h | 1 - tools/virt-login-shell-helper.c | 1 - tools/vsh-table.c | 1 - tools/vsh.c | 1 - tools/vsh.h | 1 - 29 files changed, 47 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..4a4ceef4ec 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -21,29 +21,22 @@ #include #include "virsh.h" =20 -#include #include #include #include #include -#include #include -#include =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/virt-login-shell-helper.c b/tools/virt-login-shell-helpe= r.c index 0fb03da697..3f8757e496 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -21,7 +21,6 @@ =20 #include #include -#include #include =20 #include "internal.h" diff --git a/tools/vsh-table.c b/tools/vsh-table.c index aa2deb8c72..005cc564dd 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -22,7 +22,6 @@ #include "vsh-table.h" =20 #include -#include #include #include =20 diff --git a/tools/vsh.c b/tools/vsh.c index 499794c8fc..0066504ebe 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -26,7 +26,6 @@ #include #include #include -#include #include =20 #if WITH_READLINE 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 Tue May 7 06:22:05 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 1652515729711313.9351553465249; Sat, 14 May 2022 01:08:49 -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-604-ExJT_lqGNlu--fyZoQpMEg-1; Sat, 14 May 2022 04:08:46 -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 1ADC8101A52C; Sat, 14 May 2022 08:08: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 F3EC67C2B; Sat, 14 May 2022 08:08:43 +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 A15CC194705A; Sat, 14 May 2022 08:08:43 +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 7CE981947058 for ; Sat, 14 May 2022 08:08:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6DBEA1543C20; Sat, 14 May 2022 08:08:42 +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 691131543C1A for ; Sat, 14 May 2022 08:08:42 +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 49356185A7BA for ; Sat, 14 May 2022 08:08:42 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-119-Zb9VtE4ENY2mKDC6FuiVmA-1; Sat, 14 May 2022 04:08:39 -0400 Received: by mail-pj1-f50.google.com with SMTP id iq10so10022410pjb.0 for ; Sat, 14 May 2022 01:08:39 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id x12-20020a62860c000000b0050dc7628198sm2991745pfd.114.2022.05.14.01.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 01:08:37 -0700 (PDT) X-MC-Unique: ExJT_lqGNlu--fyZoQpMEg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: Zb9VtE4ENY2mKDC6FuiVmA-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=+916oi6s5aje9X7zbHeqd4XCb7xGMNUkPgzYR+BU3ag=; b=ckvgtQcEIStopeqKAOJX7HMFL0yS8haRJL6EsCSdGXg/gJqBV1yNiU2gcwkSIgDkFF IdEh6CiWSI1FAy360CR5ndrx2or3JyqSGxex6r5wByWJnlWq7U5LkEjOBxYJg/HpwF6U RYJq9nVYZ55ZIQGKrwf/XDvECnh4WxSbcpy3TtR49rvu+wHUq+q0zBVlrKlt1QuN1Se2 AK2g4rLcUOMq9QCZrAh+cc5aZ8he9EzrqrRZdhfH/lP3N4TMg00KWi5qGCGfYlBK+4B+ hzpq0+XpJi6vAyk2ljhj5DNAB7wKYBz0ShzwIxrNvoMA4QdANQEUGPLEbbvdQhFLUBGP ZJLA== X-Gm-Message-State: AOAM531zCdnFxqzOZ1QoOJojYnIaemgxikG2CAdrOMTCSZyPgMFzXhdW tmBCN88Pn5xDXJmgXJ0xDYzlRChKT6RW2w== X-Google-Smtp-Source: ABdhPJwOc5/kbpX3/Gcb3GGUKsQQadXatJx6upsd0XADOCRORwjreNITkjj+KftMzjNgcMxdUPLKbw== X-Received: by 2002:a17:90b:4b0d:b0:1dc:3d21:72c1 with SMTP id lx13-20020a17090b4b0d00b001dc3d2172c1mr19968517pjb.21.1652515717734; Sat, 14 May 2022 01:08:37 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v2 30/30] tests: Remove unused includes Date: Sat, 14 May 2022 16:05:39 +0800 Message-Id: <20220514080539.2371140-31-tcx4c70@gmail.com> In-Reply-To: <20220514080539.2371140-1-tcx4c70@gmail.com> References: <20220514080539.2371140-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: Peng Liang 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: 1652515730049100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 | 6 ------ 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 | 2 -- 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/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 - 112 files changed, 237 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..d10f1b0723 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -23,25 +23,19 @@ #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" #include "qemu/qemu_command.h" -#include #include #include =20 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 829550fbfe..d5bef0eef8 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 8b655874d1..1049e5cc0c 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..711164265d 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -23,8 +23,6 @@ #include =20 #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" #include "virutil.h" 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/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