From nobody Sun Feb 8 17:22:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596407092; cv=none; d=zohomail.com; s=zohoarc; b=ZQFrBVbvraxn76p0T4kXTfoMr5z79LwTXmLDBO+wWffutvdVyK2CIv1FllcvHZxn81rxZqtK6Wnt8JdD0mEN3te19zfTNoaz77w4lsRdJqjvYTXe4WeRY+bQ2B9NG6jpBcTORTS+K5a5Old66ePYQWnIrYAJY6Xj8AD9LBKLtDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596407092; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=53MqzAGWSn7MjPF2JohKG6aEGdmPdCOhQhWSpem3LaA=; b=Ov0yW0uiCLx2pX6hcN5nF6aYHqYikTgRFSUjCXqL5HMrMnsIi8q3AB21Ih4JvwWa8kUTjp3G4CXbnxSyyBWBaWtC5oHS1vJbKaReWC2HjjpPcVSRyvHHfccMrUNAKLPgm6Y1K7PrSLdAqJJ5YFR72rMe7qHOXX0+53BLoXMDt2E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596407092863596.2421220361431; Sun, 2 Aug 2020 15:24:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-W-UmZ98UNYGAe6EvaPVNuw-1; Sun, 02 Aug 2020 18:24:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B618010059B6; Sun, 2 Aug 2020 22:24:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A4648BEE3; Sun, 2 Aug 2020 22:24:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 681181800B71; Sun, 2 Aug 2020 22:24:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 072MObIm011787 for ; Sun, 2 Aug 2020 18:24:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E1355D9D5; Sun, 2 Aug 2020 22:24:37 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C397C5DA69 for ; Sun, 2 Aug 2020 22:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407091; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=53MqzAGWSn7MjPF2JohKG6aEGdmPdCOhQhWSpem3LaA=; b=PCjzZsBPILhNbwwn8ACdrpSC665Z3UgWCBUfIxyDl69WAKhnXMowCxjrazfLUEWRfVF4IU nTmBMg7S4XM0vn0x/OInxBhtuPfOoNkXCJHPFO+mlfFPLHaAzLLtGjTcdOr+BC/x77u0ue 5OpW5xutwZiPJIvfs9H0JAxOsRalE9Y= X-MC-Unique: W-UmZ98UNYGAe6EvaPVNuw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] tools: remove unnecessary includes Date: Mon, 3 Aug 2020 00:24:24 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) After the split of virsh to multiple files, and the subsequent split to vsh/virt-admin, there are quite a few leftovers. Signed-off-by: J=C3=A1n Tomko --- tools/virsh-domain-monitor.c | 2 -- tools/virsh-domain.c | 4 ---- tools/virsh-host.c | 5 +---- tools/virsh-host.h | 2 +- tools/virsh-interface.c | 4 ---- tools/virsh-network.c | 2 -- tools/virsh-nodedev.c | 1 - tools/virsh-nwfilter.c | 1 - tools/virsh-secret.c | 1 - tools/virsh-secret.h | 2 +- tools/virsh-snapshot.c | 2 -- tools/virsh-snapshot.h | 2 +- tools/virsh-volume.c | 2 -- tools/virsh.h | 2 -- tools/virt-admin-completer.c | 1 - tools/virt-admin.c | 4 +++- tools/virt-host-validate-qemu.c | 1 - tools/vsh-table.c | 2 -- tools/vsh.c | 3 --- tools/vsh.h | 2 -- 20 files changed, 7 insertions(+), 38 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index d8333a2f44..0111116885 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -23,9 +23,7 @@ #include "virsh-util.h" =20 #include -#include #include -#include =20 #include "internal.h" #include "conf/virdomainobjlist.h" diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index aaf3b9a6a5..86dfdd3fbc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -24,12 +24,9 @@ =20 #include #include -#include =20 #include -#include #include -#include =20 #include "internal.h" #include "virbitmap.h" @@ -50,7 +47,6 @@ #include "virtime.h" #include "virtypedparam.h" #include "virxml.h" -#include "virsh-nodedev.h" #include "viruri.h" #include "vsh-table.h" #include "virenum.h" diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 0fd77cbae5..dab0b92229 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -20,18 +20,15 @@ =20 #include #include "virsh-host.h" +#include "virsh.h" =20 #include -#include #include -#include =20 #include "internal.h" #include "virbitmap.h" -#include "virbuffer.h" #include "viralloc.h" #include "virxml.h" -#include "virtypedparam.h" #include "virstring.h" #include "virfile.h" #include "virenum.h" diff --git a/tools/virsh-host.h b/tools/virsh-host.h index f4c2aa316d..92328c7deb 100644 --- a/tools/virsh-host.h +++ b/tools/virsh-host.h @@ -20,6 +20,6 @@ =20 #pragma once =20 -#include "virsh.h" +#include "vsh.h" =20 extern const vshCmdDef hostAndHypervisorCmds[]; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index d754998d52..b8e424091d 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -31,17 +31,13 @@ #include "virsh-interface.h" =20 #include -#include #include -#include =20 #include "internal.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "virmacaddr.h" #include "virxml.h" -#include "virstring.h" #include "vsh-table.h" =20 virInterfacePtr diff --git a/tools/virsh-network.c b/tools/virsh-network.c index ed90736345..6cf40a8ad2 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -22,10 +22,8 @@ #include "virsh-network.h" =20 #include "internal.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" -#include "virstring.h" #include "virtime.h" #include "conf/network_conf.h" #include "vsh-table.h" diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 7f091d7cf8..ff028d377e 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -22,7 +22,6 @@ #include "virsh-nodedev.h" =20 #include "internal.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "virstring.h" diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 6e5213dea3..38790b0081 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -22,7 +22,6 @@ #include "virsh-nwfilter.h" =20 #include "internal.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "vsh-table.h" diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 7bd0acda58..7f1df30090 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -28,7 +28,6 @@ #include "virfile.h" #include "virutil.h" #include "virsecret.h" -#include "virstring.h" #include "virtime.h" #include "vsh-table.h" #include "virenum.h" diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h index 6ebe573f87..eea542c0ef 100644 --- a/tools/virsh-secret.h +++ b/tools/virsh-secret.h @@ -20,7 +20,7 @@ =20 #pragma once =20 -#include "virsh.h" +#include "vsh.h" =20 struct virshSecretEventCallback { const char *name; diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 4ac6cb1dcd..e3599a3535 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -24,9 +24,7 @@ #include =20 #include -#include #include -#include =20 #include "internal.h" #include "virbuffer.h" diff --git a/tools/virsh-snapshot.h b/tools/virsh-snapshot.h index 49517a4235..66ebc07175 100644 --- a/tools/virsh-snapshot.h +++ b/tools/virsh-snapshot.h @@ -20,6 +20,6 @@ =20 #pragma once =20 -#include "virsh.h" +#include "vsh.h" =20 extern const vshCmdDef snapshotCmds[]; diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index fec8278a5d..e04e2db096 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -25,9 +25,7 @@ #include =20 #include -#include #include -#include =20 #include "internal.h" #include "virbuffer.h" diff --git a/tools/virsh.h b/tools/virsh.h index ef18c7f421..1b896cd535 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -20,9 +20,7 @@ =20 #pragma once =20 -#include #include -#include =20 #include "internal.h" #include "virerror.h" diff --git a/tools/virt-admin-completer.c b/tools/virt-admin-completer.c index 25dacf51d8..7201bb71eb 100644 --- a/tools/virt-admin-completer.c +++ b/tools/virt-admin-completer.c @@ -24,7 +24,6 @@ #include "internal.h" #include "virt-admin.h" #include "viralloc.h" -#include "virstring.h" =20 =20 char ** diff --git a/tools/virt-admin.c b/tools/virt-admin.c index fef0332a0d..c3ec110bf9 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -19,8 +19,9 @@ */ =20 #include -#include "virt-admin.h" =20 +#include +#include #include =20 #if WITH_READLINE @@ -29,6 +30,7 @@ #endif =20 #include "internal.h" +#include "virt-admin.h" #include "viralloc.h" #include "virerror.h" #include "virfile.h" diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qem= u.c index ea7f172790..f9432f522d 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -20,7 +20,6 @@ */ =20 #include -#include =20 #include "virt-host-validate-qemu.h" #include "virt-host-validate-common.h" diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 60554b7b2f..a727ac17b5 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -28,8 +28,6 @@ =20 #include "viralloc.h" #include "virbuffer.h" -#include "virstring.h" -#include "virsh-util.h" =20 #define HEX_ENCODE_LENGTH 4 /* represents length of '\xNN' */ =20 diff --git a/tools/vsh.c b/tools/vsh.c index b65e99cbd2..6dfa9fe61d 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -24,9 +24,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -42,7 +40,6 @@ #include "virfile.h" #include "virthread.h" #include "vircommand.h" -#include "virtypedparam.h" #include "virstring.h" #include "virutil.h" =20 diff --git a/tools/vsh.h b/tools/vsh.h index 174116b369..290bb71f3e 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -21,8 +21,6 @@ #pragma once =20 #include -#include -#include #ifndef WIN32 # include #endif --=20 2.26.2