From nobody Sat Feb 7 07:10:03 2026 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 1654692505028687.9978547677151; Wed, 8 Jun 2022 05:48:25 -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-363-Yhb4PKkGP8Su5d-vV-eNmg-1; Wed, 08 Jun 2022 08:48:18 -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 7B90E800882; Wed, 8 Jun 2022 12:48: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 640BF40CFD0B; Wed, 8 Jun 2022 12:48: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 2F0E81947051; Wed, 8 Jun 2022 12:48:15 +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 341D81947B92 for ; Wed, 8 Jun 2022 12:14:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 246F920296A2; Wed, 8 Jun 2022 12:14:53 +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 1FC9B2026D64 for ; Wed, 8 Jun 2022 12:14:53 +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 00F1C1C01B29 for ; Wed, 8 Jun 2022 12:14:53 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-458--XQkdAXtPTCoDzRv4O3uOQ-1; Wed, 08 Jun 2022 08:14:51 -0400 Received: by mail-pg1-f180.google.com with SMTP id f65so8515223pgc.7 for ; Wed, 08 Jun 2022 05:14:51 -0700 (PDT) Received: from localhost (23.105.194.122.16clouds.com. [23.105.194.122]) by smtp.gmail.com with ESMTPSA id u12-20020a63ef0c000000b003fbdf7cc750sm5345384pgh.89.2022.06.08.05.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 05:14:49 -0700 (PDT) X-MC-Unique: Yhb4PKkGP8Su5d-vV-eNmg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: -XQkdAXtPTCoDzRv4O3uOQ-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=s5uX3JWveQHLIXUkpnU2EDzbnVMW1tWPsV+HCLqJPsI=; b=CopooqWrREkdUzKwb4YXayqWV/CxX4Jrn4be0q3adnHjBO99Htc5h+SniLhAdH+RoX w7p0574OgI+5wq72B2gCTm45gVjm/ygB7QqQjubnDSwKKuP8hWp9m87r3P6PUTlAkE/O LVkb0pa9ZXZZx2D8u1YScE5iuqLi13PDiq9lyIjX57SpL3Z2fmnCbithMlrq6GQFlncq zt7oYOV3yUApZhHBuCtCttxfjHnWnjbHyuqLMU4rOtO7y1Uy0Lt/+2kEGrhFPgNMMUak LlTs3Ejx3ncVkHHlrtf1UcXSt2hWyCbNAU79NNrjIPmks/yLyQVtZbByR1jm2TNWvjp6 xAPA== X-Gm-Message-State: AOAM530QTNQ+Q40Nhk3qWkGg5bta/W+I7X6Sg04VxEyoagDXmj1T4yoB fAj0pLXOKszh3mu5hGOaURXcP7LljBHXTw== X-Google-Smtp-Source: ABdhPJxqwTHIqsvit/3S2DvyDBkuBFGAc6rHIE6kePTAaNRRjb3kf/a8rDzD57pghIzmv2fHqoli2w== X-Received: by 2002:a63:fa15:0:b0:3fd:696e:b432 with SMTP id y21-20020a63fa15000000b003fd696eb432mr18845691pgh.320.1654690489313; Wed, 08 Jun 2022 05:14:49 -0700 (PDT) From: Peng Liang To: libvir-list@redhat.com Subject: [PATCH v3 15/26] qemu: Remove unused includes Date: Wed, 8 Jun 2022 20:13:03 +0800 Message-Id: <20220608121314.2993022-16-tcx4c70@gmail.com> In-Reply-To: <20220608121314.2993022-1-tcx4c70@gmail.com> References: <20220608121314.2993022-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.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: 1654692506570100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Peng Liang --- src/qemu/qemu_agent.c | 2 -- 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 | 7 ------- 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 | 2 -- 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_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 - 59 files changed, 161 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index f57a8d5f25..05fbfe9145 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_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 877c66d62b..9fe22f18f2 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 d0c8217825..e78390fb96 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 26cd655db3..9c368af2ad 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 4f4d8cf25c..c807ed6391 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 2bb4984656..f8e9d71e81 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 5e752d075e..c40c452f58 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -25,21 +25,14 @@ =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 941cf7e0e4..f271d18de9 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 153dfe3a23..f27b1fad3f 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 ee1adb0300..65e41460fb 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 87463e74bf..b8e3c1000a 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 f795568299..ee44649d48 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 ba03277025..cf8117d996 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 e359d4f520..d7ac6e6fc9 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 849c25b168..6e5b3839fb 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..f2f0090343 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -24,8 +24,6 @@ #include "internal.h" =20 #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 37bcbde31e..e310c3e013 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 91f2d0941c..584176e187 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 8b81a07429..cc4dd1308f 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 3b55e380b3..ad3853ae69 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_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 e53f7c9c79..0ce91ebb64 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 8641534be4..0fddae0bbb 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 772ea582c5..c802ef7fa8 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 c6beeda1d0..833f880252 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 086780edcd..03829775b8 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