From nobody Sat Feb 7 11:40:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; 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 205.139.110.120 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=1596407084; cv=none; d=zohomail.com; s=zohoarc; b=d13k1rrnArexAVoJUGHLwXLQWLqTcWe/nx7Rb2PiWEA86ntfoWuakmoHpUoFRPz2FwVnGBw6fh9hka0oTesiia5hvZmY/CD0AYzpg6NHgohYhpCcuZWEqwsaQqJi7O1MBaiHwRwvcTgGXj6Pw7f9UrwXMROjQkriGGN2ZZMEOSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596407084; 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=PqJSe882Fg+/ZXNIMX05CziSGhLuczN8f+g7c1u7kw0=; b=Ft51DcQLh5x+g8tmVx9Xg2iiKL1sNo7lfDMzBRjNOZnh78AlnqyO74UsEUR1E7E+ec16EpFbUeB6oPXgWnbqF6ZtJO7fkHygUdQdxHjUsouy5Z7F5lgpT3gXD1gwKOthFciEu6tyxg67NaccyoJ4PL/aVKBDUUG1mUnsMvQixos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1596407084495823.6519649705001; Sun, 2 Aug 2020 15:24:44 -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-136-jswghRsfPCy7qie6siCSxg-1; Sun, 02 Aug 2020 18:24:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 586208005B0; Sun, 2 Aug 2020 22:24:35 +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 34AA5712EB; Sun, 2 Aug 2020 22:24:35 +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 E82081809554; Sun, 2 Aug 2020 22:24:34 +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 072MOVJE011734 for ; Sun, 2 Aug 2020 18:24:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id A5E085D9D5; Sun, 2 Aug 2020 22:24:31 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0200E5D9CD for ; Sun, 2 Aug 2020 22:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407083; 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=PqJSe882Fg+/ZXNIMX05CziSGhLuczN8f+g7c1u7kw0=; b=QWMwXHUfv2QJfk9ZrnrxulAESKTSf81tUl0HUVD4asQuAP5l7VT+nDo3dfPKgtdK9wPgas Px5tK6Ae4Fft2XW61LyyJgdjjvEqN1xHb0OTPVbFri+JdLHc+S2flnKzTnSNQN5LaFlwzg h9ghkmQe6/4oDDLVTGWCrf6k9H5MHOw= X-MC-Unique: jswghRsfPCy7qie6siCSxg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] util: virstring.h: remove stdarg.h include Date: Mon, 3 Aug 2020 00:24:19 +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.11 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) It was needed for virAsprintf, which is now dropped. Signed-off-by: J=C3=A1n Tomko Fixes: 33ed622106c61d257fd4a5750d4df511bcdd1b2b Reviewed-by: Martin Kletzander --- src/util/virstring.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virstring.h b/src/util/virstring.h index 360c68395c..c812157287 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -18,8 +18,6 @@ =20 #pragma once =20 -#include - #include "internal.h" =20 #define VIR_INT64_STR_BUFLEN 21 --=20 2.26.2 From nobody Sat Feb 7 11:40:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; 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.120 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=1596407089; cv=none; d=zohomail.com; s=zohoarc; b=ZAw8yKzf0N/pHbXElXqYW6aOHZC0jIO+0wpP4wGDS5O0mvLatYRunp8rwKStxO1O4Z0fGLsHTHNuftMY73SyUJIunQvXse9VXE2FinWryQ+1sfhyqhqj5PNiVAnAg59eAzDHmWUFtv9JiEWi1tUz69zmGljn/P6qqhl+tBhLfjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596407089; 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=hK5FHe9t/buqUkK8p3DPhO0QKgGU+cOZeEf/hXQMdYs=; b=H631YkDiH7hWH6L4dsWEWQF82seUuNaIrHqpykz2mOn6sudkpr7TIuCgmW2aMIBmRKE3Y3pPPhHy2Z2rdjjdMQjf5I1kHqglJ45iLjOMa99wqt7jerxLrKAcyL/gWvenqedhx76+GE1rfufXnRNefDcSmLix7Pw2a2RgW4VDUVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596407089857968.542923744637; Sun, 2 Aug 2020 15:24:49 -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-231-3a-Af4iRPFaAauH83O6_qw-1; Sun, 02 Aug 2020 18:24:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 512B51800D42; Sun, 2 Aug 2020 22:24:41 +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 3464557; Sun, 2 Aug 2020 22:24:41 +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 02E2C1800B71; Sun, 2 Aug 2020 22:24:41 +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 072MOWff011745 for ; Sun, 2 Aug 2020 18:24:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDAD65D9D5; Sun, 2 Aug 2020 22:24:32 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FFAC5D9CD for ; Sun, 2 Aug 2020 22:24:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407088; 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=hK5FHe9t/buqUkK8p3DPhO0QKgGU+cOZeEf/hXQMdYs=; b=iX5xbEEOETh90PDlq7kj0jKyDxpLRP1BZCMi94+fMb7BoJMcjE+jy+h1b0xvzzA59p0Tr7 WvavHTZMRSSMDZs88NLeftvQup2A04/9pREWj23x/Z2x9NQvuTb89GWtYx7MFU/7x++6h0 0KKxh0L1cgtDF904HA5jB5x3wNLtICA= X-MC-Unique: 3a-Af4iRPFaAauH83O6_qw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] hyperv: include virxml.h Date: Mon, 3 Aug 2020 00:24:20 +0200 Message-Id: <9d688be89ca515ce0e3595718731d1be6182fc34.1596407039.git.jtomko@redhat.com> 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.16 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) This file is using XML functions without including the header. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/hyperv/hyperv_wmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index f8d0aaf373..917298d027 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -37,6 +37,7 @@ #include "virstring.h" #include "openwsman.h" #include "virlog.h" +#include "virxml.h" =20 #define WS_SERIALIZER_FREE_MEM_WORKS 0 =20 --=20 2.26.2 From nobody Sat Feb 7 11:40:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; 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 205.139.110.120 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=Tr7KCl8BMd5HnCHQ0KROWUzG+zDLnf9FPEK/Ib8KdOuNe/Lt21AlAeico+WJgQzuxlhusqCd6pA39C9HYk0GGP86zbAcfRYHeQpoPLBJEZxMBw85ofnQ4hnsXFB+eEvxcNd+52iWWG68LIA7qq8Y0RTveheTD0+LPLelaMFAQq8= 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=fSvrmTZByN3riVHMfXodeSGrKWvm5mQK1YMiPET+nWc=; b=em2MTMf2XskBYodcbIE5sAIMmmLj/bC6F4DwgVXOiskCzbwioSO/kRZilDRUEXSpEVqd+0UZTrGqsN3so/HtC/YfDxuWKj22vqcNugqN+5DnVhkZ0royWRpHlqKcyPSYFSbOjtGnMTh8ojjWTrNwqZuyEdXAzkRG00+v+npM0jA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1596407091999746.848422052082; Sun, 2 Aug 2020 15:24:51 -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-446-P1_lsaiwMkuVA-PtF2EchA-1; Sun, 02 Aug 2020 18:24:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5580C106B247; Sun, 2 Aug 2020 22:24:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 334A210013C1; Sun, 2 Aug 2020 22:24:41 +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 0448E9A109; Sun, 2 Aug 2020 22:24:41 +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 072MOYx9011752 for ; Sun, 2 Aug 2020 18:24:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AA515D9CD; Sun, 2 Aug 2020 22:24:34 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57E055D9D5 for ; Sun, 2 Aug 2020 22:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407090; 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=fSvrmTZByN3riVHMfXodeSGrKWvm5mQK1YMiPET+nWc=; b=ZOZFLAzckxngImE0Jr+gB0iJyheU8Xr1S3bLhj2y9GQQHvPEpT3M2ozfY3cvE8scfuo8Jj qps8XSUqDzV3WNVLlPVEEJb9bwan/RdGL3Tx5Qf1inmUq6fpU4tC6UaBxI/qiopOS4McPU ruDsXVoV8VL3SoqIt1ujw3CZVSD604k= X-MC-Unique: P1_lsaiwMkuVA-PtF2EchA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] util: viruri: move libxml include Date: Mon, 3 Aug 2020 00:24:21 +0200 Message-Id: <192990bab2798eb9ea154199720774fcf41ae7c3.1596407039.git.jtomko@redhat.com> 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.84 on 10.5.11.22 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) The XML function is needed in the C file, not in the header. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/util/viruri.c | 2 ++ src/util/viruri.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/viruri.c b/src/util/viruri.c index 492454a3df..598adffede 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -20,6 +20,8 @@ =20 #include =20 +#include + #include "viruri.h" =20 #include "viralloc.h" diff --git a/src/util/viruri.h b/src/util/viruri.h index 1735620a2f..e607ecc109 100644 --- a/src/util/viruri.h +++ b/src/util/viruri.h @@ -20,8 +20,6 @@ =20 #pragma once =20 -#include - #include "internal.h" #include "virconf.h" =20 --=20 2.26.2 From nobody Sat Feb 7 11:40:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; 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.120 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=1596407093; cv=none; d=zohomail.com; s=zohoarc; b=GjIibK/4O0a2QX1IEaMk4XMaI4Oj9o7k0zlhX+jTWqEujCTIcejvBI2gX9gqjiCjsk7zW3e2gcdQG+AeBjwY1eycPsVBlJF6M/7H6VYAg2QV5U6XuNeuxOu+9VaXhQBSQLL5mTQgmuS47XiQSEocKgHQCUEhfHPBeB7hC0ZBVnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596407093; 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=fF7q2+hubgFJb1/V/wJ7vPJe6BK1GhKprhO6LWZej1s=; b=cmWarZLhX8hR8LTUsdpMH6GBg3g7jeeULVsdcMkzikOzpquSnj7afj8aeCwINF99YRdGLcvwZVLhhvhD21sjgmOsYgk6xC6KDTfRqVajtx3ip/93GIHhcpQpwIE1uxKTfD+PeZlZZlnpROJpHvgutVg/N/HF/k6sVlTxyZ0mXu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596407093349545.9311847014178; Sun, 2 Aug 2020 15:24:53 -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-11-jarX9OzFNueKYQaX6i_bcg-1; Sun, 02 Aug 2020 18:24:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F96C1DE8; Sun, 2 Aug 2020 22:24:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7079A87B26; 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 3C18A9A10B; 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 072MOZu2011768 for ; Sun, 2 Aug 2020 18:24:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 404935D9D5; Sun, 2 Aug 2020 22:24:35 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85EA45D9CD for ; Sun, 2 Aug 2020 22:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407092; 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=fF7q2+hubgFJb1/V/wJ7vPJe6BK1GhKprhO6LWZej1s=; b=HDmgrEQEwu76cJaBeUmXbbXu1gtLwEbxu/4Uf/KUF6ibiVAo61FCdF5LcGzPR8Ty8DX+wK TOsflzccMeoHHxxow/RMR+vMS2cDisC7fedHuKGsF2GzrG1mctFBluPuFcfO/4tFDDNj5o Y87F5evG7rY2JvL0J+pylrGE+nE5bSs= X-MC-Unique: jarX9OzFNueKYQaX6i_bcg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] util: log: move virLogMessage Date: Mon, 3 Aug 2020 00:24:22 +0200 Message-Id: <3f8fd35119ad70817b7c56fd36598e47d9219a38.1596407039.git.jtomko@redhat.com> 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.11 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) This function calls virLogVMessage. Move it below the definition of virLogVMessage so it can call it even without a prototype. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/util/virlog.c | 63 ++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index dabfe7e501..983c2565ad 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -478,37 +478,6 @@ virLogSourceUpdate(virLogSourcePtr source) virLogUnlock(); } =20 -/** - * virLogMessage: - * @source: where is that message coming from - * @priority: the priority level - * @filename: file where the message was emitted - * @linenr: line where the message was emitted - * @funcname: the function emitting the (debug) message - * @metadata: NULL or metadata array, terminated by an item with NULL key - * @fmt: the string format - * @...: the arguments - * - * Call the libvirt logger with some information. Based on the configurati= on - * the message may be stored, sent to output or just discarded - */ -void -virLogMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - virLogVMessage(source, priority, - filename, linenr, funcname, - metadata, fmt, ap); - va_end(ap); -} - =20 /** * virLogVMessage: @@ -639,6 +608,38 @@ virLogVMessage(virLogSourcePtr source, } =20 =20 +/** + * virLogMessage: + * @source: where is that message coming from + * @priority: the priority level + * @filename: file where the message was emitted + * @linenr: line where the message was emitted + * @funcname: the function emitting the (debug) message + * @metadata: NULL or metadata array, terminated by an item with NULL key + * @fmt: the string format + * @...: the arguments + * + * Call the libvirt logger with some information. Based on the configurati= on + * the message may be stored, sent to output or just discarded + */ +void +virLogMessage(virLogSourcePtr source, + virLogPriority priority, + const char *filename, + int linenr, + const char *funcname, + virLogMetadataPtr metadata, + const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + virLogVMessage(source, priority, + filename, linenr, funcname, + metadata, fmt, ap); + va_end(ap); +} + + static void virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, virLogPriority priority G_GNUC_UNUSED, --=20 2.26.2 From nobody Sat Feb 7 11:40:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; 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.120 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=1596407094; cv=none; d=zohomail.com; s=zohoarc; b=nN+rvk9yWwepmAlrdrw3mE/VZLlrsIXkg1CS+yvNbyeQA474SSYuWI3PAoX/HayMQNuJQKiy/kFL4vrGUlowZxwRXCMoxzVr44c+7xwTSGHpot23qfn6kMqsNqeJSYTZ5i4JUA/XEmB/nNul9Z42VL6q4+bQTl8OFnpIvteWz2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596407094; 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=//PuMqqBhogIY2Fcpx1qZ1u7uYPtijhAqgbm2o9Bv+A=; b=bBubrFfeTr8JjFKcHto2mbUwGiKKiE/Jw7CJO5PeiNrFRTXc2P5pIJBItjFnEWIPnE+2OI6qxLtRN1OoqzSO2v5qzs/67aKdZPm74/4a0YPrX9e8XaUGcw2jbtsnQM3QA/fdfUSeBpB9nbl2j7LLQzcwZaXMQC+/Sak5LP5su78= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596407094491298.0429994116389; Sun, 2 Aug 2020 15:24:54 -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-505-eVWAjAkJP66EU5T4zMsfYA-1; Sun, 02 Aug 2020 18:24:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9C3880BCAB; Sun, 2 Aug 2020 22:24:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA12A87E2E; Sun, 2 Aug 2020 22:24:45 +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 8AB6A9A10E; Sun, 2 Aug 2020 22:24:45 +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 072MOaZo011775 for ; Sun, 2 Aug 2020 18:24:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5EEDD5D9DC; Sun, 2 Aug 2020 22:24:36 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE9905D9D5 for ; Sun, 2 Aug 2020 22:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596407093; 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=//PuMqqBhogIY2Fcpx1qZ1u7uYPtijhAqgbm2o9Bv+A=; b=HYXLjcBcTcrVxwHW5gCbfTYpOyYJjn6DXpH6P0NYUbD8HV/6UOXWWbmDLjm2FPD6yCEWQW afQFAVVlcUXNBbfJemi1G3qrXhuOuLvaRRKOeDyYjNiMVrP1gyq2ll3I+0wwkRnCVcgaMW nIpf0jfRS9TrCo32GtIFcg0BXbdfMEw= X-MC-Unique: eVWAjAkJP66EU5T4zMsfYA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] util: virlog: unexport virLogVMessage Date: Mon, 3 Aug 2020 00:24:23 +0200 Message-Id: <81d9955f07dc79d0026f09b12ffc77fb0ea763f0.1596407039.git.jtomko@redhat.com> 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.11 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) Last usage out of virlog.c was removed by commit 91268c715cf0293f0751de0450e4d0c06bea18d8 node_device_udev: remove deprecated logging function Also drop the virbuffer.h include - it seems it was never used for anything else than the transitive stdarg.h include. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/libvirt_private.syms | 1 - src/util/virlog.c | 3 ++- src/util/virlog.h | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eea31a736d..1fae05057e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2474,7 +2474,6 @@ virLogSetFilters; virLogSetFromEnv; virLogSetOutputs; virLogUnlock; -virLogVMessage; =20 =20 # util/virmacaddr.h diff --git a/src/util/virlog.c b/src/util/virlog.c index 983c2565ad..322f9599f6 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -493,7 +493,8 @@ virLogSourceUpdate(virLogSourcePtr source) * Call the libvirt logger with some information. Based on the configurati= on * the message may be stored, sent to output or just discarded */ -void +static void +G_GNUC_PRINTF(7, 0) virLogVMessage(virLogSourcePtr source, virLogPriority priority, const char *filename, diff --git a/src/util/virlog.h b/src/util/virlog.h index feb2f85904..9913a194fd 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -22,7 +22,6 @@ #pragma once =20 #include "internal.h" -#include "virbuffer.h" =20 #ifdef PACKAGER_VERSION # ifdef PACKAGER @@ -199,14 +198,6 @@ void virLogMessage(virLogSourcePtr source, const char *funcname, virLogMetadataPtr metadata, const char *fmt, ...) G_GNUC_PRINTF(7, 8); -void virLogVMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, - va_list vargs) G_GNUC_PRINTF(7, 0); =20 bool virLogProbablyLogMessage(const char *str); virLogOutputPtr virLogOutputNew(virLogOutputFunc f, --=20 2.26.2 From nobody Sat Feb 7 11:40:53 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 Reviewed-by: Martin Kletzander --- 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