From nobody Mon Apr 29 03:21:23 2024 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=1593692965; cv=none; d=zohomail.com; s=zohoarc; b=RYuSaO9mJM2owg0Dho/o88wvJ0fh8fEI/UK+iNn6FpQHTFLDkG4Fevb/ZAWadkDrkxf+cB0hj/ME5oYgNaz4nTKmSLNgQ4HX2jsGKHOvJNua6vP7dJIUAbY6gTSR/Ah1DWlzggFAfMLNmRoTe2s1lK1t1LcFb/a8cFxKbkLnn5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692965; 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=B67GB1JdSvNcVurZDVG5J4Fev6Pw6BTeL+tQeigBJpU=; b=NbUyuiKG1xyl3jIPTrTLIRcie1u/e/b7BV2q3k32kOFlmS3dn7yCUpDY2puQ/WOrE6SHr6kuJVlDUnO2fXRJrAjMuurVBSa7/uG7Yo1V53bT2EtkLzPssL1GygQtMXPbOn0eokKXYDs81yOfOzEOX6RCksDi5LxJdPesP6R7F9I= 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 1593692965442716.7069995510417; Thu, 2 Jul 2020 05:29:25 -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-269-5Wp-rG43Mfe6BMGaeEt8RA-1; Thu, 02 Jul 2020 08:29:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF94C107ACCD; Thu, 2 Jul 2020 12:29:15 +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 CCB9973FC5; Thu, 2 Jul 2020 12:29:15 +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 498261809547; Thu, 2 Jul 2020 12:29:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPYcN020170 for ; Thu, 2 Jul 2020 08:25:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93F9173FC5; Thu, 2 Jul 2020 12:25:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F41973FC7 for ; Thu, 2 Jul 2020 12:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692964; 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=B67GB1JdSvNcVurZDVG5J4Fev6Pw6BTeL+tQeigBJpU=; b=P1l1KpWWMfn9UpTJgB5SqotCfKFPybtt4BQP+4v+5DcyurU7kN9Jenv4/2QnlYggE3yr84 /uUeWWcHBfCu5hZnDdYHDomsWzXYxeeX8I+MARl0GryVv6lPymApbwBBP5LDCPuxqM4EYL XrorDpTTURZAjUTY6OsLqRRVJEIoHkk= X-MC-Unique: 5Wp-rG43Mfe6BMGaeEt8RA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 01/31] build: use DLOPEN_LIBS directly Date: Thu, 2 Jul 2020 14:24:59 +0200 Message-Id: <801daff97da1f3f58495d45914d301f207b5cb69.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to have DRIVER_MODULES_LIBS as it's used only for libvirt.so. The other places are using DLOPEN_LIBS directly and dlopen is required if building with libvirtd. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-driver-modules.m4 | 3 --- src/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 index 8bf8ecf2b1e..54b75e09739 100644 --- a/m4/virt-driver-modules.m4 +++ b/m4/virt-driver-modules.m4 @@ -38,17 +38,14 @@ AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [ fi =20 DRIVER_MODULES_CFLAGS=3D - DRIVER_MODULES_LIBS=3D if test "$with_driver_modules" =3D "yes"; then if test "$with_dlfcn" !=3D "yes" || test "$with_dlopen" !=3D "yes"; th= en AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driv= er modules]) fi =20 DRIVER_MODULES_LDFLAGS=3D"-export-dynamic" - DRIVER_MODULES_LIBS=3D"$DLOPEN_LIBS" fi AC_SUBST([DRIVER_MODULES_LDFLAGS]) - AC_SUBST([DRIVER_MODULES_LIBS]) ]) =20 AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [ diff --git a/src/Makefile.am b/src/Makefile.am index 12dd6b80e1e..447cff81659 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -439,7 +439,7 @@ libvirt_la_LDFLAGS +=3D -Wl,-flat_namespace endif WITH_MACOS libvirt_la_LDFLAGS +=3D $(NULL) libvirt_la_LIBADD +=3D \ - $(DRIVER_MODULES_LIBS) + $(DLOPEN_LIBS) libvirt_la_CFLAGS =3D -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we # lose automake's automatic dependencies on an appropriate subset of --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692979; cv=none; d=zohomail.com; s=zohoarc; b=LGsx30ltVOGpqDFb3IzEBVYgeKwmqEzwF+4cKq8ks7vrxc01eluYy9SF0V007iGtWuyt9eBSOYSaFfeCx0SmXjIVbqbZlFMICHuqjiHTeWlKBzhifdMVaEgynZKizOZjjIG09ULe1qaH7ofXFjQyk1avWZeX/usNXYYleM+7kaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692979; 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=jZIIuZ5i6MSlN6LiojBOfee8Akmj4bwvQDr7I/rOrs4=; b=Py30fVFcz5YI7tcb1PpQ9YXRCXjyt098eCdAJSkjZKvPN/RSD+gV46iZpqCIobXvZ04/aA2ZqkOYZP+GQdfxfSjbPir02wwXuxBT/eNAaQiwAOOIZWJOxo8O13R9oFIV8UJX6VRbmI2wC2tUs3mwXDtGF4Swfs2vr6EnBiDOSSE= 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 1593692979025578.6235567141102; Thu, 2 Jul 2020 05:29:39 -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-382-ByfdxI9jPwmNl8Qtovj4jg-1; Thu, 02 Jul 2020 08:29:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C31CCEC1AF; Thu, 2 Jul 2020 12:29:29 +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 A59665DC1E; Thu, 2 Jul 2020 12:29:29 +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 751FC1806B0C; Thu, 2 Jul 2020 12:29:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPc1t020189 for ; Thu, 2 Jul 2020 08:25:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E59673FC5; Thu, 2 Jul 2020 12:25:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DFF173FD1 for ; Thu, 2 Jul 2020 12:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692977; 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=jZIIuZ5i6MSlN6LiojBOfee8Akmj4bwvQDr7I/rOrs4=; b=A5rzr+L/fw619OcsSepmx+z3LwYlgzdoK3K4ayVc9Lk6TCgo+Sg8x90y4sDJqcBsiDju8+ LSK++F6QPWGUvoul1th57milvDgDGJP2LpnVu2UUJ3EUA+sjUAkyy0HS/rj8bmeY2F9hWG mpO1gegYDrmC835CiIt9gIDZV4TPwVM= X-MC-Unique: ByfdxI9jPwmNl8Qtovj4jg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 02/31] configure: drop check for unsupported FreeBSD Date: Thu, 2 Jul 2020 14:25:00 +0200 Message-Id: <9e0a69d82789d7a680a1ed8de7a5a4ebe9497f92.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" FreeBSD 10 is no longer supported by libvirt and the struct member ifi_oqdrops is usable without any define on later FreeBSD versions. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- configure.ac | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure.ac b/configure.ac index 6c8ac2f04bc..e4c0bea94df 100644 --- a/configure.ac +++ b/configure.ac @@ -857,17 +857,6 @@ if test $with_freebsd =3D yes; then ) fi =20 -# FreeBSD 10-STABLE requires _IFI_OQDROPS to be defined for if_data.ifi_oq= drops -# field be available -old_CFLAGS=3D"$CFLAGS" -CFLAGS=3D"$CFLAGS -D_IFI_OQDROPS" - -AC_CHECK_MEMBERS([struct if_data.ifi_oqdrops], - [], - [CFLAGS=3D"$old_CFLAGS"], - [#include - ]) - AC_CHECK_DECLS([clock_serv_t, host_get_clock_service, clock_get_time], [AC_DEFINE([HAVE_MACH_CLOCK_ROUTINES], [1], --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692988; cv=none; d=zohomail.com; s=zohoarc; b=XfOQMNqHFuSrKPC3rjC3CVK/RLeIXi+CQnjgy2zPWPdhmYRsqG+Ovft/mndSj6S2Ccj0m6Ya7SmdUNmvTufEqNWHHZcIJ5nq3JdaP0p+yIsH+vr8jYLLvPyOwYu/5udJ5WhZHe85lwPNhJV6kwWudtQ3GkvyPziM40CwYHUhYU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692988; 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=nWIng7XCkZUVB2/QFSIxYLM0l0mPd2bEjryYxFGUCHM=; b=SKeR8FKQhdGtzwlbnkWZnvNPVopNMV3E19Gv3lEAXpZJLB6ozqprxF1AY4C5H9I7pQX2qa1UhbFUlayCf28YCDwnsIsXr2Cbp4mPG6ngZ8MGFahHKhnRX3JHg86cIMI3De/LcFIoDDLJjFLXyaK8weqZJnD9c/UD71v7n16imVo= 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 1593692988507265.5787531533465; Thu, 2 Jul 2020 05:29:48 -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-147-APTUlkcFNd27P9xxDApefw-1; Thu, 02 Jul 2020 08:29:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65009193F564; Thu, 2 Jul 2020 12:29:39 +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 463B72B5BA; Thu, 2 Jul 2020 12:29:39 +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 16BA51805310; Thu, 2 Jul 2020 12:29:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPdJA020194 for ; Thu, 2 Jul 2020 08:25:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0657C73FC7; Thu, 2 Jul 2020 12:25:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75CF673FC5 for ; Thu, 2 Jul 2020 12:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692987; 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=nWIng7XCkZUVB2/QFSIxYLM0l0mPd2bEjryYxFGUCHM=; b=A6OYGBoypFZ//cWmRNFuJcAMPx8eSPZ1sg634uq231AVR8qjEWaLxt0atBz6LqH9DUVZYD yx5nk8+ZZJfz9rXJBjjBFV5D6w+dQHt2I5WRglh7qjdZVvzJyMyjBioROCelrDHhgueywq pY8pIe6jcLhqrH3PDJUJCGRq2PHIF44= X-MC-Unique: APTUlkcFNd27P9xxDApefw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 03/31] configure: introduce FLAT_NAMESPACE_FLAGS Date: Thu, 2 Jul 2020 14:25:01 +0200 Message-Id: <845499574a746e1e89650b8b2d99061f54f160fd.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Set FLAT_NAMESPACE_FLAGS to -Wl,-flat_namespace in configure only for macOS and use it unconditionally in Makefiles. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- configure.ac | 13 +++++++++++++ src/Makefile.am | 10 +++------- tests/Makefile.am | 7 +++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e4c0bea94df..75695252898 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,19 @@ esac AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) AC_SUBST([VERSION_SCRIPT_FLAGS]) =20 +dnl macOS has two-level namespaces by default. +dnl Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES +case "$host" in + *-*-darwin*) + FLAT_NAMESPACE_FLAGS=3D-Wl,-flat_namespace + ;; + * ) + FLAT_NAMESPACE_FLAGS=3D"" + ;; +esac +AC_MSG_RESULT([$FLAT_NAMESPACE_FLAGS]) +AC_SUBST([FLAT_NAMESPACE_FLAGS]) + dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case dnl we're working on BSD) want_ifconfig=3Dno diff --git a/src/Makefile.am b/src/Makefile.am index 447cff81659..b893f4179e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -431,13 +431,9 @@ libvirt_la_LDFLAGS =3D \ -version-info $(LIBVIRT_VERSION_INFO) \ $(LIBVIRT_NODELETE) \ $(NO_UNDEFINED_LDFLAGS) \ - $(AM_LDFLAGS) -if WITH_MACOS -# macOS has two-level namespaces by default. -# Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES -libvirt_la_LDFLAGS +=3D -Wl,-flat_namespace -endif WITH_MACOS -libvirt_la_LDFLAGS +=3D $(NULL) + $(FLAT_NAMESPACE_FLAGS) \ + $(AM_LDFLAGS) \ + $(NULL) libvirt_la_LIBADD +=3D \ $(DLOPEN_LIBS) libvirt_la_CFLAGS =3D -DIN_LIBVIRT $(AM_CFLAGS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 65d1ceeefdf..06d70ab559c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -55,10 +55,9 @@ MOCKLIBS_LDFLAGS =3D -avoid-version \ DRIVERLIB_LDFLAGS =3D \ -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation \ - $(MINGW_EXTRA_LDFLAGS) -if WITH_MACOS -DRIVERLIB_LDFLAGS +=3D -Wl,-flat_namespace -endif WITH_MACOS + $(MINGW_EXTRA_LDFLAGS) \ + $(FLAT_NAMESPACE_FLAGS) \ + $(NULL) =20 PROBES_O =3D if WITH_DTRACE_PROBES --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693069; cv=none; d=zohomail.com; s=zohoarc; b=DI7p/tmAYcgYMqrQYKsF9j6J8mgK8Vo1yzgO7bYmc4QJsg9y7Slm/UFukX0LOVguNIuDrBrEYbG+OhWaOi1/FpJEc9TruV1IV4oA58gsgs8HXoXXy6pP9pNOBchn2nEZVnj5rq2GD6/8Mo4rn2/AG2thvIvm5fuMzxNPIrWS2Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693069; 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=WlZzHqsE9XQ9rhjUknoH5aIP90PdNM2ztj7VzTjY3U8=; b=fer0ABMCi+4rFcaVl3CqlTPt/UNRjGYAaGJ0wIfveJVtkzFiGLTOdJVur7+HdPJUfoYSBrBaPzxVzTx1h3gW0PCfYBzKx/2QlX7REv91JeZJUmRaNZPtlPAdeQGYAivomEQ/ik5Y4GhX86Vx8dtFaqnjIp8tkm7ghlL1n8iOI70= 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 1593693069074730.950857439542; Thu, 2 Jul 2020 05:31:09 -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-292-qVZpRswcMwG1daU7KyQTXQ-1; Thu, 02 Jul 2020 08:29:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF3A51054F91; Thu, 2 Jul 2020 12:29: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 915082B4DD; Thu, 2 Jul 2020 12:29: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 610AE1805317; Thu, 2 Jul 2020 12:29:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPddm020204 for ; Thu, 2 Jul 2020 08:25:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0B1973FC7; Thu, 2 Jul 2020 12:25:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C24573FC5 for ; Thu, 2 Jul 2020 12:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693066; 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=WlZzHqsE9XQ9rhjUknoH5aIP90PdNM2ztj7VzTjY3U8=; b=Rb8c6nL5tVwQBTKqtlpHc4K1IaN6PI2dwQI5PUK508l5quFcN5FDxNdNphxvYHRdsChXcd d2Vu9gxPJ0MO9dQZNYHlDGi2PmPGRqsjOEwdY1rRRb+vUxCCNwAd7Ag7FQCed91TlTDTYp Xc+jdDHcOzatzc+ADcTnmTfeFf2xbDk= X-MC-Unique: qVZpRswcMwG1daU7KyQTXQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 04/31] configure: remove usage of AC_HEADER_MAJOR Date: Thu, 2 Jul 2020 14:25:02 +0200 Message-Id: <592d02b59feb0443c9a8d6479a35b0f19d12cb8b.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <03c532cf9711dd6ad35380455a77141ef7d492ab> removed usage of MAJOR_IN_MKDEV and MAJOR_IN_SYSMACROS from libvirt which makes the AC_HEADER_MAJOR useless. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 75695252898..f8d9038e4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -155,8 +155,6 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL =20 -AC_HEADER_MAJOR - m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL ], [ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692971; cv=none; d=zohomail.com; s=zohoarc; b=G8NZAVLoOc7es4tWMKfnoXYBU7A4JbA0fTuVPPoyQMj6E3MXudVSdOIQhk6yywRtVlOx3BoZt1N12k9Cmpz8SCA3eH91k9dbgp9KUJ1ZrTibd4Bxo7x70Pxu51eICnOzzg07JV3rk4e/5uCFmgk/+1/q48KFEiLOTj55p9C3hLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692971; 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=SWDUR1ps0N4m4N1cQSQszPG/vvmuNUFkFYJFogqJiL4=; b=jqCIy6gIXLmgxegKeIndAzdMIILNwyNGuQqc/hNewOBqFC6oie9Zzgs1orkayh9XTUfyCeLZ6mW4Rcw/2fGcmmq2ope0zSjNSQOxXxpiBKKSGI0aBrZlnu/kJ/licDcObxZ3TxwjZ2Lu8ct7QQPGSk+oqbBi92ky6Ukx3QrbrWA= 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 159369297173142.257320239247406; Thu, 2 Jul 2020 05:29:31 -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-268--o_kkgO-MequXs-RcruB1Q-1; Thu, 02 Jul 2020 08:29:25 -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 EF7701054F90; Thu, 2 Jul 2020 12:29:19 +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 CEC491010404; Thu, 2 Jul 2020 12:29:19 +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 9415F1809557; Thu, 2 Jul 2020 12:29:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPeDk020210 for ; Thu, 2 Jul 2020 08:25:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6FD173FC5; Thu, 2 Jul 2020 12:25:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 424C373FD3 for ; Thu, 2 Jul 2020 12:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692967; 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=SWDUR1ps0N4m4N1cQSQszPG/vvmuNUFkFYJFogqJiL4=; b=GT+jxsPFlfN2H6hiLZiKpbLrt4XK49iWhv+QflsK5WUQ2IDcGLBerC6xIPF+ts7iqK4k4Q Q9weD5m1bpbvVBq2MeefedDAVJGeoZNFuIdU0/767a0RTd4Eo0fuTxqfgngPAfdHxMOPI8 nGnrFFQzLm+19j22q9sVvsonXxrukt0= X-MC-Unique: -o_kkgO-MequXs-RcruB1Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 05/31] Makefile: drop undefined LIB_CLOCK_GETTIME Date: Thu, 2 Jul 2020 14:25:03 +0200 Message-Id: <481492044221bb87c02a925f03ef3a6b9b52f471.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This was introduced together with clock-time gnulib module by commit and removed from libvirt by commit <86d223a762990c9d529065a2d3b30b6a00ea63dd>. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/Makefile.inc.am | 1 - tests/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 5bc60cb5ead..6d732518f40 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -289,7 +289,6 @@ libvirt_util_la_LIBADD =3D \ $(THREAD_LIBS) \ $(AUDIT_LIBS) \ $(DEVMAPPER_LIBS) \ - $(LIB_CLOCK_GETTIME) \ $(DBUS_LIBS) \ $(WIN32_EXTRA_LIBS) \ $(LIBXML_LIBS) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 06d70ab559c..c87b12d28c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1511,7 +1511,7 @@ endif WITH_LIBVIRTD if WITH_LIBVIRTD eventtest_SOURCES =3D \ eventtest.c testutils.h testutils.c -eventtest_LDADD =3D $(LIB_CLOCK_GETTIME) $(LDADDS) +eventtest_LDADD =3D $(LDADDS) endif WITH_LIBVIRTD =20 libshunload_la_SOURCES =3D shunloadhelper.c --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692981; cv=none; d=zohomail.com; s=zohoarc; b=HHsNWrQ9ntiIXhyO9svryLmqxpKxpLUf/og8Nf57Rk9D0TJnUPt2F/IJ6a/VTFN9SKLdSmMDNyuaZYu/OWc/oOwWzgipda9/9N7uJSjPmJUIyyyTy8N/iG1B182Fot3AI9Aa0PszVaz1uyBU0UaYD7q3FShR0oepnj2e8u4Vep4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692981; 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=P96YZv96EZIoluTAy7PtMKMqmhKtfYqeacxhdZ5SAnE=; b=iOJA1gLxnqyv/sQkbg/991dbZyjVlpcNJTwpuk3xMkbQKxqo9OrBQ+U+InhaLOn/Eku9V4TvMtImJGXsUSRIoADpvk/ZQf8burvm7209sMYx1IKmJdU1rikkrKsGFUV/AsMDPGBaJXdWYT9HdBDBoRGe7W0bVMFx92MBOkRIhFs= 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 1593692981706503.01749403399094; Thu, 2 Jul 2020 05:29:41 -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-101--9MuX7UjPWSvryUAAcrRkg-1; Thu, 02 Jul 2020 08:29:38 -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 59BCCEC1B3; Thu, 2 Jul 2020 12:29:32 +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 3825A79231; Thu, 2 Jul 2020 12:29:32 +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 0AC546C9CF; Thu, 2 Jul 2020 12:29:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPf2q020216 for ; Thu, 2 Jul 2020 08:25:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id ACB9C73FC5; Thu, 2 Jul 2020 12:25:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 289AE73FD3 for ; Thu, 2 Jul 2020 12:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692980; 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=P96YZv96EZIoluTAy7PtMKMqmhKtfYqeacxhdZ5SAnE=; b=I6zmzCRRc9F94pAPiHxYroGaDmqpinb8hWw+K5v3wOB8gHZOYOueo7FCh5lX2MYjEEjjGB gpNsZFFwejx7ieC2UfgrIydXpCOatPDiX5n31u/EWYKP4sv1ViJCU0Ipr1vqDxJ0t7UnUc c2bN0GKhaVWPMq69vLsE1+LSImrvoSc= X-MC-Unique: -9MuX7UjPWSvryUAAcrRkg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 06/31] docs: remove incorrect generated files by apibuild.py Date: Thu, 2 Jul 2020 14:25:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These files are generated by xsltproc as part of html/index.html and html/index-%.html rules. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- docs/Makefile.am | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d8109bb65ca..c33ae8afb13 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -476,13 +476,7 @@ check-html: =20 check-local: check-html =20 -python_generated_files =3D \ - html/libvirt-libvirt-lxc.html \ - html/libvirt-libvirt-qemu.html \ - html/libvirt-libvirt-admin.html \ - html/libvirt-virterror.html \ - $(api_DATA) \ - $(NULL) +python_generated_files =3D $(api_DATA) =20 APIBUILD=3D$(top_srcdir)/scripts/apibuild.py APIBUILD_STAMP=3Dapibuild.py.stamp --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1593692998; cv=none; d=zohomail.com; s=zohoarc; b=kVIQe0Jhs/2IsShXrN13qTc/nGXEwj8i6FJfeMExLrU7rYQiObGXinGv8SXOgOG8wYXyetRMw3L6MEPNibCZXTEJBBIasdTjjWcSXQ+74ZsiMqDF9kAeBPTnd2x9dBzIShs8C2mRY0iZYN+IyMGHe/mqkj0WjTVSgBZDlf9oQx8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692998; 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=okPE5PL9wm71nS683O0Fd5gX42J9vhHKPkyL6NKzS+M=; b=N04Otmx0VOTnf27Sf2V23R/KPaaN3H1VCehmUn+x0QIHjXHDuRyfAkjIb9VTKwcvdDxWrrGVCLWgXueN9FSmITfSm8GRK1q1vxTniSdsWRaQv1RZPf4xEQik9ODUlbGHm3+adJOTEzvHdlRtDMS4RXVZM5wXMItD3YFAiHX01Y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1593692998075149.0333724756116; Thu, 2 Jul 2020 05:29:58 -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-248-7IITiYcXOLmg1A8GgiPewA-1; Thu, 02 Jul 2020 08:29:51 -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 C89B7802ED5; Thu, 2 Jul 2020 12:29:45 +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 A4F867922A; Thu, 2 Jul 2020 12:29: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 769CA180531C; Thu, 2 Jul 2020 12:29:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPguU020224 for ; Thu, 2 Jul 2020 08:25:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 947E473FC7; Thu, 2 Jul 2020 12:25:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1029E73FC5 for ; Thu, 2 Jul 2020 12:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692993; 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=okPE5PL9wm71nS683O0Fd5gX42J9vhHKPkyL6NKzS+M=; b=PIdMmmRQFqt2tPveeIx8PUAmY1i9udhLcJ23nJ6nPJNtUFPjP6n8Fk7GnYsNW2UH1CqxSZ hFMXk8wBbvMKTeD0LYeKQZQONq9EpExqQfkJWFQOJyfOlic8BCjDfF87l+IODGycilGluj 8Zv1WfrkvNi2d5J2PpUazMrC9NGHnw0= X-MC-Unique: 7IITiYcXOLmg1A8GgiPewA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 07/31] docs: remove unused wrapstring.xsl file Date: Thu, 2 Jul 2020 14:25:05 +0200 Message-Id: <39130df5ad484aabaef2b1e7b558d6900424b41a.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit removed last usage of this file so drop it as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- docs/Makefile.am | 1 - docs/wrapstring.xsl | 56 --------------------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 docs/wrapstring.xsl diff --git a/docs/Makefile.am b/docs/Makefile.am index c33ae8afb13..07a7d7a369c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -358,7 +358,6 @@ schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 EXTRA_DIST=3D \ site.xsl subsite.xsl newapi.xsl page.xsl \ - wrapstring.xsl \ $(dot_html_in) $(dot_rst) $(apipng) \ $(fig) $(assets) \ $(javascript) $(logofiles) \ diff --git a/docs/wrapstring.xsl b/docs/wrapstring.xsl deleted file mode 100644 index b468a700f5e..00000000000 --- a/docs/wrapstring.xsl +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - 0 and $pos-now >=3D $wrap-col"> - - - - - - - - - - 0"> - - - - - - - - - - - - - - - =3D $wrap-col"> - - - - 0"> - - - - - - - - - - --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693007; cv=none; d=zohomail.com; s=zohoarc; b=KAh0pRWmXdRFsc4qORhCLMRDqDo7qwthKA1x+uXkSWjgSg4hpFstLswLRLb+sLwSTn0+HHIvrzU9tS7wac5ejnGUE9OmD52ZGtFh3/Sp+dUoylfjUQpxDETKpph4pC3oWyMMtd6rRdEEy0CvnjtE8yj9eBOAwyKa+9Zy4MtqoF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693007; 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=bjkMYqKoWMnOwnT6Waf0xbFXM9ymw9gnCKt2tQELo88=; b=Od8VSNMIjCqLaHMWc5AKwX7OvmaYHcx6gTjMdn/HbYkl4JlghrLcmdItyua9eFw8dP9k46uGoqB89ae8d4vjy2RlANisxnmSlnrtGErkuheMAjhMtu/RaVeQL4xh0f3XaRv7M61EMUOY5nrPtEZU/drxi8sPKzTE9ke51kywNvM= 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 1593693007543976.0914915520033; Thu, 2 Jul 2020 05:30:07 -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-151-CR1XUl5GPNio3hbVJxTQTA-1; Thu, 02 Jul 2020 08:29:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CB45193F566; Thu, 2 Jul 2020 12:29: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 7C4A11A91F; Thu, 2 Jul 2020 12:29: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 4B3E5180530D; Thu, 2 Jul 2020 12:29:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPhSm020242 for ; Thu, 2 Jul 2020 08:25:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7AA7373FC7; Thu, 2 Jul 2020 12:25:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA50873FC5 for ; Thu, 2 Jul 2020 12:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693005; 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=bjkMYqKoWMnOwnT6Waf0xbFXM9ymw9gnCKt2tQELo88=; b=HwegIi5h64UqoAg60M87I6khyR3T4raYKY+t4g1Mahm9e3/A4QZiSqQ/41FwSUj8pnWvez bjbFyTrcolLmTfzjeJYMqR6pbq50PMsKMts1sQk3KpncLlN48SsppowinfmNDQ4pjhwod2 VAciGJAPveRqsTMEQx7UTjFA28jgDzQ= X-MC-Unique: CR1XUl5GPNio3hbVJxTQTA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 08/31] docs: drop %.png: %.fig rule Date: Thu, 2 Jul 2020 14:25:06 +0200 Message-Id: <2f98b3e9cd360f644ece9748fcb0169483e0e332.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" convert bin is part of ImageMagick package and uses uniconvertor to create png file from fig files. Unfortunately uniconvertor is python2 only and not available in most recent distributions which makes the convert command fail with: sh: uniconvertor: command not found /usr/bin/mv: cannot stat '/tmp/magick-1397138DRT8Pzx4Qmoc.svg': No such fil= e or directory convert: delegate failed `'uniconvertor' '%i' '%o.svg'; /usr/bin/mv '%o.svg= ' '%o'' @ error/delegate.c/InvokeDelegate/1958. convert: unable to open file `/tmp/magick-1397138S8ARueJXLXkc': No such fil= e or directory @ error/constitute.c/ReadImage/605. convert: no images defined `docs/migration-managed-direct.png' @ error/conv= ert.c/ConvertImageCommand/3226. It looks like that there are plans to somehow port uniconvertor into python3 but as part of different project color-picker but the job is far from complete. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- docs/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 07a7d7a369c..3fd8256e668 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -406,9 +406,6 @@ hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $= (api_DATA) \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/hvsupport.py \ $(top_srcdir) $(top_builddir) > $@ || { rm $@ && exit 1; } =20 -%.png: %.fig - convert -rotate 90 $< $@ - manpages/%.html.in: manpages/%.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^:Manual ' < $< | \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693076; cv=none; d=zohomail.com; s=zohoarc; b=kRVWm0K6+m1BF0dTsKxO6Q9/IVwGbdfxKD2DvbFRsV28w5adpKYUcOo87SeBvQLeVhOxsbKcKp+HQybN5w+OZA0vq+UWQCQiUlBojUxXoVWXbeYffJVozRXPvDAJ/9w6YcFA26gpHqxiLMBKiiy1V/Mfwj5Ga/injm7lQ2VJMxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693076; 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=0v++8IECZkbR0tv7/xapctrCLVT6m1GHrnrarLbsKPQ=; b=Glny3GW10woptbR1jvEILmBFb/iGIKU7O5kCVjrJP9F2Z6Moq/QAlJFePmPMFOM7CIcjP9Btg+6oIS59vyu2k4CzppcAP8EVByHbYem8J85Y04313dPp1cKCELfe8yxiDaShA3Ay10hY2XPCL2VTMaqVVUVUGzBS9EEF2aCXQRA= 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 1593693076882938.0625913286012; Thu, 2 Jul 2020 05:31:16 -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-204-6qANgJbOOqW4bmw2Yi3l4g-1; Thu, 02 Jul 2020 08:29:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B3C087950C; Thu, 2 Jul 2020 12:29:38 +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 09F602B5BA; Thu, 2 Jul 2020 12:29:38 +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 D00276C9D2; Thu, 2 Jul 2020 12:29:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPigZ020248 for ; Thu, 2 Jul 2020 08:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 60F5E73FC7; Thu, 2 Jul 2020 12:25:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFE2C73FC5 for ; Thu, 2 Jul 2020 12:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693075; 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=0v++8IECZkbR0tv7/xapctrCLVT6m1GHrnrarLbsKPQ=; b=RgiSCq85uZs4uHlw78CCp7ZpUKJJ1CmnYMHLzmYBgq4zJYdS7VnmfvSBzz10qACszKF68h 5yXnhiG02jb508BRIf1upeacTE+5xV96MCHBswtOsCkEszehl8oqTEn00cmwE8i0woUHan QYVtMSANimSzRlZzN3PIzV6hwB6upWk= X-MC-Unique: 6qANgJbOOqW4bmw2Yi3l4g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 09/31] m4: virt-sanlock: drop check for sanlock_inq_lockspace Date: Thu, 2 Jul 2020 14:25:07 +0200 Message-Id: <9a59c85f8ce405a363f99407e5da56eda1494b65.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This check was introduced by commit <96a02703daad4dc6663165adbc0feade9900cebd> to guard calling sanlock_inq_lockspace() function but it used SANLK_INQ_WAIT as a parameter which was introduced later. This was eventually fixed by commit <238dba0f9c925359cb3b8beddd8c8ae739cb4e06>. We can safely replace check for sanlock_inq_lockspace as that function was introduced in sanlock-1.9. The oldest used version, sanlock-2.2, is by Ubuntu 16.04. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-sanlock.m4 | 12 ++++-------- src/locking/lock_driver_sanlock.c | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index 00de7980e82..cc35b10b09f 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -29,6 +29,10 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ #include #include ]]) + if test sanlock_inq_wait =3D 1; then + AC_DEFINE_UNQUOTED([HAVE_SANLK_INQ_WAIT], 1, + [whether sanlock supports SANLK_INQ_WAIT]) + fi =20 old_cppflags=3D"$CPPFLAGS" old_libs=3D"$LIBS" @@ -42,14 +46,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ [whether Sanlock supports sanlock_killpath]) fi =20 - AC_CHECK_LIB([sanlock_client], [sanlock_inq_lockspace], - [sanlock_inq_lockspace=3Dyes], [sanlock_inq_lockspace=3Dno]) - if test "x$sanlock_inq_lockspace" =3D "xyes" && \ - test $sanlock_inq_wait =3D 1; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_INQ_LOCKSPACE], 1, - [whether sanlock supports sanlock_inq_lockspace]) - fi - dnl Ideally, we would check for sanlock_add_lockspace_timeout here too= , but dnl sanlock_write_lockspace has been introduced 2 releases after dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace= is found diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 4ebe98e86db..ea1c23eab69 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -361,7 +361,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlo= ckDriverPtr driver) #endif if (rv < 0) { if (-rv =3D=3D EINPROGRESS && --retries) { -#ifdef HAVE_SANLOCK_INQ_LOCKSPACE +#ifdef HAVE_SANLK_INQ_WAIT /* we have this function which blocks until lockspace change t= he * state. It returns 0 if lockspace has been added, -ENOENT if= it * hasn't. */ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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-delivery-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=1593692972; cv=none; d=zohomail.com; s=zohoarc; b=COwp0Dx9vJoTJisbkCuB5oz5IsBRBr3Y07O/8yNytYLGGGr8JtkqL/bZtwL0CpveNZFJBlnxwYE9e6/LYO7Vu25oX5Zsp8oljWfg+qkMOZBC/2IMk8XZj6q7eQkIHnx7q0gYwvFIQy8OND8Q0D8oFhpkEvw1yt/Q/yl/E1XMXiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692972; 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=SJVHneOWOBpSwyD/DAWcCneqkwhwRjnezx26VucSPk0=; b=FVCh16omkS15YmLuz1IZqOSqM65oyHPsQyKBNSy1WmzzfsJlpeLAbeRkXcPy0awCU1SGIa82F0jz+cZdOHGZudFnpX5dgyLzwtMobkzgkwTZwbhLjbTr5LcnnfUg+jHS1SoI9/Z/x+t1mHPkWmj0KWDXEFAiP6KKv4Ki2q3Z89w= 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593692972406506.01592081323145; Thu, 2 Jul 2020 05:29:32 -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-401-v6Ko_GsVM-mBoLQT7PUTNw-1; Thu, 02 Jul 2020 08:29:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 775DBEC1A8; Thu, 2 Jul 2020 12:29:23 +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 57E367610C; Thu, 2 Jul 2020 12:29:23 +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 25D2C1809563; Thu, 2 Jul 2020 12:29:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPj6a020257 for ; Thu, 2 Jul 2020 08:25:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4914D73FC7; Thu, 2 Jul 2020 12:25:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8DC373FC5 for ; Thu, 2 Jul 2020 12:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692971; 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=SJVHneOWOBpSwyD/DAWcCneqkwhwRjnezx26VucSPk0=; b=CakM/HkAqSVerGApnv4zeKIfErAz350Tofz4oc8JzYFwf/b8dKDAg0s9ey6sIw8iv2vE1W 5Ot9nwGh6V/pxYfCFOhSvT2lxiBzQ3mqt1HQpzhnrfyJdJzcA91yvUbFvj4HcLFYQJmiLu kjTtv4/WbFeCZAhGcB+MWA6gAUXnbiE= X-MC-Unique: v6Ko_GsVM-mBoLQT7PUTNw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 10/31] m4: virt-sanlock: use pkg-config to find libsanlock_client Date: Thu, 2 Jul 2020 14:25:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The last distribution supported by libvirt and lacking pkg-config file for libsanlock_client was Ubuntu 16.04. It is no longer supported so switch to pkg-config. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-sanlock.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index cc35b10b09f..a7fba520dfc 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_ARG_SANLOCK],[ ]) =20 AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ - LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], [sanlock_init], [sanlock.= h]) + LIBVIRT_CHECK_PKG([SANLOCK], [libsanlock_client], [3.2.4]) =20 if test "x$with_sanlock" =3D "xyes" ; then AC_CHECK_DECLS([SANLK_INQ_WAIT], [sanlock_inq_wait=3D1], [sanlock_inq_= wait=3D0], [[ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693064; cv=none; d=zohomail.com; s=zohoarc; b=dlhSeV9xktZ6vsCV7L050pePi+wIeCWpSm9eAE7dEfcKZNsbPuZkLDzHrjbOYByEboi6g/rVE6nwZ7GegaAilNMWN6EDnr7mQYwCshBFC2pmG47ZEI2SMzuQoOvd0E+ech6rx65W5YHbCTGt4ls8l31nCcgWiliNk425VYE6RVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693064; 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=fLv1IWsWJWYUnQZznEgIJ5Ak5avq7OBY71E+2hUykh4=; b=PreWJhfZ84guOkVS0dPRvQOHIJg4de0+vptpzsN3IxmAd9Y8Uk7O027pf640JS9DAjh7XRXyWcUQdZIWS8iBS6O13XzTAeUOnZQMl7iHZXG83lVEHMLRwooDtfXBF+tOL4ZIwaGUcbrIQOh0UqIQ5O6wPTXAK9+HtivXLOcxKk8= 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 1593693064231639.7048516505627; Thu, 2 Jul 2020 05:31:04 -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-278-aBWIuAmyOIq2Z1TEFxyPTQ-1; Thu, 02 Jul 2020 08:29:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69B8A80572D; Thu, 2 Jul 2020 12:29:40 +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 4A2712B4DD; Thu, 2 Jul 2020 12:29:40 +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 1B8FC1805313; Thu, 2 Jul 2020 12:29:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPkiG020281 for ; Thu, 2 Jul 2020 08:25:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2FBF373FC7; Thu, 2 Jul 2020 12:25:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F66A73FC5 for ; Thu, 2 Jul 2020 12:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693063; 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=fLv1IWsWJWYUnQZznEgIJ5Ak5avq7OBY71E+2hUykh4=; b=irXXXKsyUdfRf0YZyNdFHEAgnrzOk88SjAcp6c9iEdy2/GMPy8hdlMR92e/r4zaRINxbZy MJ9ur0vPfli8uF+sn1p/LkMWjd7sao1Lzi3XeBo3v8g5l/aj4Oi4AUMUyXNGxoZOd2uhGf NRyQF8YrXIGYRhpydgtGIAT8AU59WTo= X-MC-Unique: aBWIuAmyOIq2Z1TEFxyPTQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 11/31] m4: virt-sanlock: drop check for SANLK_INQ_WAIT Date: Thu, 2 Jul 2020 14:25:09 +0200 Message-Id: <29aa8c3721e536aeac6208c61118607edbd9b3a5.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" SANLK_INQ_WAIT was introduced in sanlock 2.4 which is available in all supported OSes. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-sanlock.m4 | 9 --------- src/locking/lock_driver_sanlock.c | 6 ------ 2 files changed, 15 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index a7fba520dfc..15a9bc6035f 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -25,15 +25,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ LIBVIRT_CHECK_PKG([SANLOCK], [libsanlock_client], [3.2.4]) =20 if test "x$with_sanlock" =3D "xyes" ; then - AC_CHECK_DECLS([SANLK_INQ_WAIT], [sanlock_inq_wait=3D1], [sanlock_inq_= wait=3D0], [[ - #include - #include - ]]) - if test sanlock_inq_wait =3D 1; then - AC_DEFINE_UNQUOTED([HAVE_SANLK_INQ_WAIT], 1, - [whether sanlock supports SANLK_INQ_WAIT]) - fi - old_cppflags=3D"$CPPFLAGS" old_libs=3D"$LIBS" CPPFLAGS=3D"$CPPFLAGS $SANLOCK_CFLAGS" diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index ea1c23eab69..cc8266a2b35 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -361,18 +361,12 @@ virLockManagerSanlockSetupLockspace(virLockManagerSan= lockDriverPtr driver) #endif if (rv < 0) { if (-rv =3D=3D EINPROGRESS && --retries) { -#ifdef HAVE_SANLK_INQ_WAIT /* we have this function which blocks until lockspace change t= he * state. It returns 0 if lockspace has been added, -ENOENT if= it * hasn't. */ VIR_DEBUG("Inquiring lockspace"); if (sanlock_inq_lockspace(&ls, SANLK_INQ_WAIT) < 0) VIR_DEBUG("Unable to inquire lockspace"); -#else - /* fall back to polling */ - VIR_DEBUG("Sleeping for %dms", LOCKSPACE_SLEEP); - g_usleep(LOCKSPACE_SLEEP * 1000); -#endif VIR_DEBUG("Retrying to add lockspace (left %d)", retries); goto retry; } --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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-delivery-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=1593693003; cv=none; d=zohomail.com; s=zohoarc; b=kl6rts/k9U6lk5lrTwGCiNu6mRTDYtwxTN2Q3CuKeqvkCwyxzlMSGrOrbnGEPFdF4uSZW5+VmCvPp0SbOTKPWR62p4HsPJCtGUyzBWlZHZu8aWfGtoC7KeTLZSDlzjyIsV0EbPVCz4FUQJIWA6WbgoDmr5j0XXOyTAIqXlRL0zo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693003; 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=8dVhldblyGiZfU020WwEExTPFUF37Gx6zrp2xmUrMps=; b=ct6Lo6VPenc5lO+RZYmFciRRAOcF3UsmIMQagoYMqkcXi0fzmeQ4buGHyS23jDV+YMmJobalXUDCNL/HbePZPHr23pGYjwrd4cd9JYO4unmYhotJbvdM6fUVLjrsRQxWRLSxgWC0pj5oASmbswupxn2QnCjvdfx59K1ZywtkqEs= 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593693003951218.19861191735117; Thu, 2 Jul 2020 05:30:03 -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-394-2uJnnclfN3mUa-KgNJrmzA-1; Thu, 02 Jul 2020 08:29:55 -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 B029C107ACF9; Thu, 2 Jul 2020 12:29:48 +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 8F63B10023A5; Thu, 2 Jul 2020 12:29:48 +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 616CC1804766; Thu, 2 Jul 2020 12:29:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPl86020286 for ; Thu, 2 Jul 2020 08:25:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1863073FC5; Thu, 2 Jul 2020 12:25:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86BF773FD3 for ; Thu, 2 Jul 2020 12:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693002; 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=8dVhldblyGiZfU020WwEExTPFUF37Gx6zrp2xmUrMps=; b=fJVLW2FTwyU4Jd0x41Euk9V1+4EhdIX8PHeAPT3joYORY8+KElZVniCS0Nx4AqLs+v+zWh uq/0NrcCnEwCezH/F68YBkuNZDw+CdllckEBRkEtuw4EIT6jhvG4vEtjNnpFIoUwIItale NEaRVuklAWDp+n75/A7SoEwDe71Xzuk= X-MC-Unique: 2uJnnclfN3mUa-KgNJrmzA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 12/31] m4: virt-sanlock: drop check for sanlock_killpath() Date: Thu, 2 Jul 2020 14:25:10 +0200 Message-Id: <34479b0ec55deeb09a5939895aa2fa92147cd973.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Function sanlock_killpath() was introduced in 2.4 version and had modified one of the arguments from `char *` into `const char *` in version 2.7. All of this is available in all supported OSes. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-sanlock.m4 | 7 ------- src/locking/lock_driver_sanlock.c | 13 ------------- 2 files changed, 20 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index 15a9bc6035f..bf8c87866e5 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -30,13 +30,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ CPPFLAGS=3D"$CPPFLAGS $SANLOCK_CFLAGS" LIBS=3D"$LIBS $SANLOCK_LIBS" =20 - AC_CHECK_LIB([sanlock_client], [sanlock_killpath], - [sanlock_killpath=3Dyes], [sanlock_killpath=3Dno]) - if test "x$sanlock_killpath" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_KILLPATH], 1, - [whether Sanlock supports sanlock_killpath]) - fi - dnl Ideally, we would check for sanlock_add_lockspace_timeout here too= , but dnl sanlock_write_lockspace has been introduced 2 releases after dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace= is found diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index cc8266a2b35..2f1eded1247 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -812,7 +812,6 @@ static int virLockManagerSanlockAddResource(virLockMana= gerPtr lock, return 0; } =20 -#if HAVE_SANLOCK_KILLPATH static int virLockManagerSanlockRegisterKillscript(int sock, const char *vmuri, @@ -894,18 +893,6 @@ virLockManagerSanlockRegisterKillscript(int sock, VIR_FREE(args); return ret; } -#else -static int -virLockManagerSanlockRegisterKillscript(int sock G_GNUC_UNUSED, - const char *vmuri G_GNUC_UNUSED, - const char *uuidstr G_GNUC_UNUSED, - virDomainLockFailureAction action = G_GNUC_UNUSED) -{ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("sanlock is too old to support lock failure action")); - return -1; -} -#endif =20 static int virLockManagerSanlockAcquire(virLockManagerPtr lock, const char *state, --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1593692975; cv=none; d=zohomail.com; s=zohoarc; b=dh2KXw5Rv4fJCL59iR45JrJE+hkBFCSDDup5dAgUiDzeN6WSfB4GcL38uyxAqUwj5wTAEBjEHu/fBxmwVfZMSMJP6eQjyS4kLYO9qJi0SRDvzxkO5h4l4YBsE2Z4O5b393Ozqj3rxarNjqPcVTxqpgY65MNN+8VoPypxZ5UhBx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692975; 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=uu56APdAUjdwhmeOyAK1CYMUAQsQO/+nLUiWw3ZQzYg=; b=arLWJY3PQqXD9Q6G1izEC4iKebt8XgnhVgmeGNNOiLqezRicv6qZHEgrbenJCpo6loOJkX3AUW1JTQke5KE4reWPLhye6r1qCwS6vxBECzqdlJsH5LpEKu5XJpNCFgvYpldNmCS6ztFpmahtVezWSZusWl/Qo2ZhsxbeBQ9SdAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1593692975393374.6751252389615; Thu, 2 Jul 2020 05:29:35 -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-390-jYKM5k9SN-2t1oJXOh6NPg-1; Thu, 02 Jul 2020 08:29:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC67D87950E; Thu, 2 Jul 2020 12:29:26 +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 895F960CD3; Thu, 2 Jul 2020 12:29:26 +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 59BF46C9C6; Thu, 2 Jul 2020 12:29:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPlLG020303 for ; Thu, 2 Jul 2020 08:25:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id F28D373FC7; Thu, 2 Jul 2020 12:25:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E59673FC5 for ; Thu, 2 Jul 2020 12:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692974; 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=uu56APdAUjdwhmeOyAK1CYMUAQsQO/+nLUiWw3ZQzYg=; b=D8ue6CLNZPVo5rvmW1OLKx5v7k/UxIXWVruw7wrTIxfLv6kKtszAhBpR3oiXNMQd2bvM2V 3f1HVJGX9mnhfC/ctcgyDB+X5dG1FwNwEjhPHPeP60HrOpN3Tq4mbzLQ5jar7bgNJJth0A SVuUzIT7DiEcqD32gao1TQb2+fg9uuA= X-MC-Unique: jYKM5k9SN-2t1oJXOh6NPg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 13/31] m4: virt-sanlock: drop check for sanlock_write_lockspace() Date: Thu, 2 Jul 2020 14:25:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.12 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Function sanlock_write_lockspace() was introduced in 2.7 version which is available in all supported OSes. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-sanlock.m4 | 11 ----------- src/locking/lock_driver_sanlock.c | 19 ------------------- 2 files changed, 30 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index bf8c87866e5..eb05ab6934b 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -30,17 +30,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ CPPFLAGS=3D"$CPPFLAGS $SANLOCK_CFLAGS" LIBS=3D"$LIBS $SANLOCK_LIBS" =20 - dnl Ideally, we would check for sanlock_add_lockspace_timeout here too= , but - dnl sanlock_write_lockspace has been introduced 2 releases after - dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace= is found - dnl it is safe to assume sanlock_add_lockspace_timeout is present too. - AC_CHECK_LIB([sanlock_client], [sanlock_write_lockspace], - [sanlock_write_lockspace=3Dyes], [sanlock_write_lockspace= =3Dno]) - if test "x$sanlock_write_lockspace" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_IO_TIMEOUT], 1, - [whether sanlock supports sanlock_write_lockspace]) - fi - AC_CHECK_LIB([sanlock_client], [sanlock_strerror], [sanlock_strerror=3Dyes], [sanlock_strerror=3Dno]) if test "x$sanlock_strerror" =3D "xyes" ; then diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 2f1eded1247..a37a298cf5a 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -178,20 +178,10 @@ virLockManagerSanlockInitLockspace(virLockManagerSanl= ockDriverPtr driver, { int ret; =20 -#ifdef HAVE_SANLOCK_IO_TIMEOUT const int max_hosts =3D 0; /* defaults used in sanlock_init() implemen= tation */ const unsigned int lockspaceFlags =3D 0; =20 ret =3D sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, driver-= >io_timeout); -#else - if (driver->io_timeout) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unable to use io_timeout with this version of sa= nlock")); - return -ENOTSUP; - } - - ret =3D sanlock_init(ls, NULL, 0, 0); -#endif return ret; } =20 @@ -349,16 +339,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanl= ockDriverPtr driver) * or we can fallback to polling. */ retry: -#ifdef HAVE_SANLOCK_IO_TIMEOUT rv =3D sanlock_add_lockspace_timeout(&ls, 0, driver->io_timeout); -#else - if (driver->io_timeout) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unable to use io_timeout with this version of sa= nlock")); - goto error; - } - rv =3D sanlock_add_lockspace(&ls, 0); -#endif if (rv < 0) { if (-rv =3D=3D EINPROGRESS && --retries) { /* we have this function which blocks until lockspace change t= he --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1593693002; cv=none; d=zohomail.com; s=zohoarc; b=LexG4fBjMKjk0vDszHdWvEpWToO9Hx7iEHzOqt3g0n/Pd3uW/lFnAZWFeUIxzn6cP+5LwkV2qm9vht9nJtnlTREbiB43f7OMy0ejHyYyPxTNr43slqUcqcLIdk+KdpxJmqidXu9fScLdGYG+rLsefjlopcFtVnIGuz3cNzeAOTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693002; 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=hfzT4WZNB+ktwGBtznF3jVxiumgWVZuWoA/3Z2e4wHc=; b=MPh+nJV4N8sUsv0bUqSIfDs16a4QA+SA8X6mUsdoee9sSCV5znkAYGQewlhXVZI1/0t8wlEDFv4vwPd+EIFbilqXcDq8VRhBfG7IDhJxHN+w5jkikY0dMEJ6BqtFCfOQ2cptqW6AI/C2hnWWYZHrTgtir100raAxcZAZcX+2dNI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1593693002252953.9855677246705; Thu, 2 Jul 2020 05:30:02 -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-48-6K8a0O0yPj62bLzTZTMl8g-1; Thu, 02 Jul 2020 08:29:58 -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 EFB06108BD0C; Thu, 2 Jul 2020 12:29:50 +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 D12965C1D6; Thu, 2 Jul 2020 12:29:50 +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 A58236C9DB; Thu, 2 Jul 2020 12:29:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPmht020308 for ; Thu, 2 Jul 2020 08:25:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id D8F8273FC7; Thu, 2 Jul 2020 12:25:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5478373FC5 for ; Thu, 2 Jul 2020 12:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693000; 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=hfzT4WZNB+ktwGBtznF3jVxiumgWVZuWoA/3Z2e4wHc=; b=BjyV1CcYQU2byXJBF+p6XNSOmyRdL8tt79qNtRbX0iXElDhOCaPQMEzjM43RNNRsmF5chE oFRTRF6WlkUGM4riym8tdF6Rip2j5KqTQyppKOjYvtIpQVEIOAjCm+yk1v9esTdj972tg6 +bW90+JHXiJ/04iURv2DPo3HkkTMp0M= X-MC-Unique: 6K8a0O0yPj62bLzTZTMl8g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 14/31] m4: virt-secdriver-selinux: drop obsolete function checks Date: Thu, 2 Jul 2020 14:25:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All of the listed functions are available in libselinux version 2.2. Our supported OSes start with version 2.5 so there is no need to check it. Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- m4/virt-secdriver-selinux.m4 | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/m4/virt-secdriver-selinux.m4 b/m4/virt-secdriver-selinux.m4 index a48569fc33a..4174249a510 100644 --- a/m4/virt-secdriver-selinux.m4 +++ b/m4/virt-secdriver-selinux.m4 @@ -32,28 +32,8 @@ AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_SELINUX], [ AC_MSG_ERROR([You must install the libselinux development package an= d enable SELinux with the --with-selinux=3Dyes in order to compile libvirt = --with-secdriver-selinux=3Dyes]) fi elif test "$with_secdriver_selinux" !=3D "no"; then - old_CFLAGS=3D"$CFLAGS" - old_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $SELINUX_CFLAGS" - LIBS=3D"$CFLAGS $SELINUX_LIBS" - - fail=3D0 - AC_CHECK_FUNC([selinux_virtual_domain_context_path], [], [fail=3D1]) - AC_CHECK_FUNC([selinux_virtual_image_context_path], [], [fail=3D1]) - AC_CHECK_FUNCS([selinux_lxc_contexts_path]) - CFLAGS=3D"$old_CFLAGS" - LIBS=3D"$old_LIBS" - - if test "$fail" =3D "1" ; then - if test "$with_secdriver_selinux" =3D "check" ; then - with_secdriver_selinux=3Dno - else - AC_MSG_ERROR([You must install libselinux development package >=3D= 2.0.82 in order to compile libvirt --with-secdriver-selinux=3Dyes]) - fi - else - with_secdriver_selinux=3Dyes - AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux sec= urity driver is available]) - fi + with_secdriver_selinux=3Dyes + AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux secur= ity driver is available]) fi AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux"= !=3D "no"]) ]) --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693073; cv=none; d=zohomail.com; s=zohoarc; b=ck3k1czIjgv3SJpkoZHrlOug3XWnLLvHJvekwt8RKw1D/+voPYLfg8dwECKTBNLxEqKbPYkSYjQsfn0RtXFzaHg7ObBwqqJtlYrCbFZy2laqri1GLBwxAFUiCPknPFoLhFfM9gED07/pyIa2fvk8i8/+QAQMSWC3ML5Uq+0cHHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693073; 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=r93Nv9qKThZLMMli+TMvSEU5fhd6+vnY3H7GyxLQKNU=; b=Gik3qb1llhNInTDrib2uKSEwA8hLxQq6ILNQ97mx+JCXQpSYzSEHexqzHAyhbtzfwIC/OmgB6z64v75VoWD4atsS7mFdWZJTxhI9bWHk0PKCs8XugOkOHqLMgJIfnq87/rKwBdBTKdKjhRc8c6U7qk0+c91Jk/KnenEWUpqnDQs= 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 1593693073594434.62152853350506; Thu, 2 Jul 2020 05:31:13 -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-340-zm7HKmHTNyqyl8WC3A5A9g-1; Thu, 02 Jul 2020 08:29:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87ECB8064D9; Thu, 2 Jul 2020 12:29:53 +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 67D347611F; Thu, 2 Jul 2020 12:29:53 +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 38A6A6C9DF; Thu, 2 Jul 2020 12:29:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPqIo020345 for ; Thu, 2 Jul 2020 08:25:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73F8B73FC7; Thu, 2 Jul 2020 12:25:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id E380373FC5 for ; Thu, 2 Jul 2020 12:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693071; 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=r93Nv9qKThZLMMli+TMvSEU5fhd6+vnY3H7GyxLQKNU=; b=VEBnJES8GM0NfKAeft4chtMH+yvYN2fOMwQDjKK2PAJsAwAKiKWq97rVBMIzaj2R1EsCbW XXENscfoiTqm4xet84d67QHc9lFUquEmcgSyXnCVk1Zr4QoXrLxRfEafjpFiuI1d983aV5 USRvOF4JlJv8TasnWzFj1In/nXV6EwE= X-MC-Unique: zm7HKmHTNyqyl8WC3A5A9g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 15/31] m4: virt-selinux: drop check for selabel_open signature change Date: Thu, 2 Jul 2020 14:25:13 +0200 Message-Id: <486ab3710b3154ee85261809698bf23c04a87434.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All supported OSes have at least libselinux version 2.5 so it's safe to drop this check. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-selinux.m4 | 17 ----------------- tests/securityselinuxhelper.c | 5 ++--- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 64e69808440..fb541e207ed 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -27,23 +27,6 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ [fgetfilecon_raw], [selinux/selinux.h]) =20 if test "$with_selinux" =3D "yes"; then - # libselinux changed signatures for 2.5 - # TODO: Drop once we don't support Ubuntu 16.04 - AC_CACHE_CHECK([for selinux selabel_open parameter type], - [lv_cv_selabel_open_const], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include -struct selabel_handle *selabel_open(unsigned, struct selinux_opt *, unsign= ed); - ]])], - [lv_cv_selabel_open_const=3D''], - [lv_cv_selabel_open_const=3D'const'])]) - AC_DEFINE_UNQUOTED([VIR_SELINUX_OPEN_CONST], [$lv_cv_selabel_open_cons= t], - [Define to empty or 'const' depending on how SELinux qualifies its - selabel_open parameter]) - AC_MSG_CHECKING([SELinux mount point]) if test "$with_selinux_mount" =3D "check" || test -z "$with_selinux_mo= unt"; then if test -d /sys/fs/selinux ; then diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index f89224c07a4..0556241fd55 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -53,8 +53,7 @@ static const char *(*real_selinux_lxc_contexts_path)(void= ); #endif =20 static struct selabel_handle *(*real_selabel_open)(unsigned int backend, - VIR_SELINUX_OPEN_CONST - struct selinux_opt *opts, + const struct selinux_opt= *opts, unsigned nopts); static void (*real_selabel_close)(struct selabel_handle *handle); static int (*real_selabel_lookup_raw)(struct selabel_handle *handle, @@ -288,7 +287,7 @@ const char *selinux_lxc_contexts_path(void) =20 struct selabel_handle * selabel_open(unsigned int backend, - VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, + const struct selinux_opt *opts, unsigned nopts) { char *fake_handle; --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693006; cv=none; d=zohomail.com; s=zohoarc; b=XqRhRn/iD0UFKNa2/gB9KfT3w+5u9cf8iElKvlSdOUA4aYlE40rK+3WXhYc1m1nSnLObW6QOREUNe0LFywQbIfgYu4np9foNPsTspzPBziD5QXbk1Yzu4Ly++z09yiAFCeFfBgLYMbTJFXNtZ1BSWBvOxqFMf6br2Ah32fxeGUs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693006; 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=9aDFj+oUtrgNkk78GOYScDq+3iA3YXge0qK95rrJJtk=; b=i84j3ElK4txY40cRxrN3g7UHuvhuPKFaX7KhzgS/svhsmFJz6QupmqxNNGsfel4cDYF28tiHgtEehmRXoHbG4uqxoTSrYRMwGTFDA3UbW3Ag/DQ4JU94ILEY2PZF1vvTnBomxttz8RLD5gxjweuzBr02+9g3bOW69DRGkp4W5iU= 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 1593693006924973.8786390056359; Thu, 2 Jul 2020 05:30:06 -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-57-7jG6NdPMNAiLmP5Za76ZLQ-1; Thu, 02 Jul 2020 08:30:02 -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 B44CE800597; Thu, 2 Jul 2020 12:29:55 +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 960B3741B9; Thu, 2 Jul 2020 12:29:55 +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 678021809557; Thu, 2 Jul 2020 12:29:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPrLs020353 for ; Thu, 2 Jul 2020 08:25:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A75F73FE1; Thu, 2 Jul 2020 12:25:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA24C73FD3 for ; Thu, 2 Jul 2020 12:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693005; 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=9aDFj+oUtrgNkk78GOYScDq+3iA3YXge0qK95rrJJtk=; b=HkuthTpBVUgwaid8GiCMKJifzkAXwpAX7nrjcf41kgJT5C9sOJUJZUTTOuFAMFwCdot4d0 EE1hG9HrwtqTIAhoNMfWzhVipSySP4UQIn9tBcIYs+HuYSxp8VGJyaFVvHSbMVUeh7fdRN Uu1/6QqRsbecpYOe+6KxZDsg2O1yElA= X-MC-Unique: 7jG6NdPMNAiLmP5Za76ZLQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 16/31] m4: virt-xdr: rewrite XDR check Date: Thu, 2 Jul 2020 14:25:14 +0200 Message-Id: <4dc4e18b5fb0b593ada03a17d0fd3dc8e035a811.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The current code to check XDR support was obsolete and way to complicated. On linux we can use pkg-config to check for libtirpc and have the CFLAGS and LIBS configured by it as well. On MinGW there is portablexdr library which installs header files directly into system include directory. On FreeBSD and macOS XDR functions are part of libc so there is no library needed, we just need to call AM_CONDITIONAL to silence configure which otherwise complains about missing WITH_XDR. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-xdr.m4 | 39 +++++++++++-------------------------- src/Makefile.am | 4 +++- src/admin/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 2 ++ src/logging/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 index 83754157d9a..09d0c2ba2f4 100644 --- a/m4/virt-xdr.m4 +++ b/m4/virt-xdr.m4 @@ -18,37 +18,20 @@ dnl . dnl =20 AC_DEFUN([LIBVIRT_CHECK_XDR], [ - with_xdr=3D"no" if test x"$with_remote" =3D x"yes" || test x"$with_libvirtd" =3D x"yes";= then - dnl Where are the XDR functions? - dnl If portablexdr is installed, prefer that. - dnl Otherwise try -lxdr (some MinGW) - dnl -ltirpc (glibc 2.13.90 or newer) or none (most Unix) - AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[xdr tirpc],[], - [AC_MSG_ERROR([Cannot find a XDR library])]) - ]) + dnl On MinGW portablexdr provides XDR functions, on linux they are + dnl provided by libtirpc and on FreeBSD/macOS there is no need to + dnl use extra library as it's provided by libc directly. + with_xdr=3D"yes" =20 - dnl Recent glibc requires -I/usr/include/tirpc for - old_CFLAGS=3D$CFLAGS - AC_CACHE_CHECK([where to find ], [lv_cv_xdr_cflags], [ - for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do - if test x"$add_CFLAGS" =3D xmissing; then - lv_cv_xdr_cflags=3Dmissing; break - fi - CFLAGS=3D"$old_CFLAGS $add_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]])], [lv_cv_xdr_cflags=3D${add_CFLAGS:-none}; break]) - done - ]) - CFLAGS=3D$old_CFLAGS - case $lv_cv_xdr_cflags in - none) XDR_CFLAGS=3D ;; - missing) AC_MSG_ERROR([Unable to find ]) ;; - *) XDR_CFLAGS=3D$lv_cv_xdr_cflags ;; - esac - AC_SUBST([XDR_CFLAGS]) + if test "$with_win" =3D "yes"; then + LIBVIRT_CHECK_LIB([XDR], [portablexdr], [xdrmem_create], [rpc/rpc.h]) + elif test "$with_linux" =3D "yes"; then + LIBVIRT_CHECK_PKG([XDR], [libtirpc], [0.1.10]) + else + AM_CONDITIONAL([WITH_XDR], [test "x$with_xdr" =3D "xyes"]) + fi fi ]) =20 diff --git a/src/Makefile.am b/src/Makefile.am index b893f4179e8..8b0cbb6fc86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -435,7 +435,9 @@ libvirt_la_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(NULL) libvirt_la_LIBADD +=3D \ - $(DLOPEN_LIBS) + $(DLOPEN_LIBS) \ + $(XDR_LIBS) \ + $(NULL) libvirt_la_CFLAGS =3D -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we # lose automake's automatic dependencies on an appropriate subset of diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 0a9717adec6..8556a3b8523 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -72,6 +72,7 @@ libvirt_admin_la_LDFLAGS =3D \ =20 libvirt_admin_la_LIBADD =3D \ libvirt.la \ + $(XDR_LIBS) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(DEVMAPPER_LIBS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index d1bf49cd3fb..ab01d8e0482 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -120,6 +120,7 @@ lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD =3D \ libvirt.la \ $(GLIB_LIBS) \ + $(XDR_LIBS) \ $(NULL) augeas_DATA +=3D locking/libvirt_lockd.aug if WITH_DTRACE_PROBES @@ -161,6 +162,7 @@ virtlockd_CFLAGS =3D \ virtlockd_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlockd_LDADD =3D \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dc09cfe3fa8..4be33765e9e 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -99,6 +99,7 @@ virtlogd_CFLAGS =3D \ virtlogd_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlogd_LDADD =3D \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 1b1be8340df..8a40c96563c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -69,6 +69,7 @@ REMOTE_DAEMON_LD_ADD =3D \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(XDR_LIBS) \ $(DBUS_LIBS) \ $(LIBNL_LIBS) \ $(NULL) --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692979; cv=none; d=zohomail.com; s=zohoarc; b=CdiGPWCYkl3v+yoF0F2jmj2hMgSNGhWEpE2O/FWSS1M1a5LeHeXEfqNASfeYxCWK+99t7l9xcYzx/RUtGQUKS9nCFZW8BqzlsVmkANDzcY1S0iJTzYQNY4JOpsGu1EJ+6En+Htf7WkkIDuZdErE4nSox3mF0cNVsx1BudNwPDY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692979; 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=+y4N1itbl92S/hrEvkYTItVEdeTDPrM7RyH00j3ftHA=; b=TnEGyNpCPMzEpVthpj+A6vuO04pY0ie/MqS4/phEhMSgf/Nr1toxquRPlwVMur7RHEXc6N3NYKjD2LSZbdlAQvhd0rsBQxIL7Tf1idlZ3K1A5nviiK7dHv331wEsFFeBD/326j6RMlfeHaZjzqdNxAF3OGA7DT+XK6eFJFeNfSA= 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 1593692979483261.28198043657335; Thu, 2 Jul 2020 05:29:39 -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-508-1dHRc_9WP_6OcitlbdQUeA-1; Thu, 02 Jul 2020 08:29:35 -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 E18DC193F56E; Thu, 2 Jul 2020 12:29:29 +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 C138D79256; Thu, 2 Jul 2020 12:29:29 +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 926F56C9CD; Thu, 2 Jul 2020 12:29:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPsR2020363 for ; Thu, 2 Jul 2020 08:25:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D4F673FD3; Thu, 2 Jul 2020 12:25:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B111773FEA for ; Thu, 2 Jul 2020 12:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692978; 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=+y4N1itbl92S/hrEvkYTItVEdeTDPrM7RyH00j3ftHA=; b=ULLKpEJ8yJCvbNTKmknNVuAwq0hzD7RQvCYB5mXynCwn09rYvaKSgkEz428PQHYj3x99Oi XeIp/ANKV5NHUNtYRfp0fyJ4RS2VZaRCL3ig8Rulj6KCynUNFXKZdOHrc7kPCIVJiWWoQR Mqa/FW7K8Mvc5kWjJAx9zO2VEgRU7V0= X-MC-Unique: 1dHRc_9WP_6OcitlbdQUeA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 17/31] po: change the format of POTFILES.in Date: Thu, 2 Jul 2020 14:25:15 +0200 Message-Id: <47fe0b37b01ae76417e5a951ef1ed1040f0ef699.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to provide relative paths to the current directory if we provide search paths using --directory option for xgentext. In addition it will make libvirt.pot file look cleaner as it will not contain relative paths to current directory. It improves the situation for developers which are using different build path as that would change the relative path in libvirt.pot as well. After this patch it will not happen anymore. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 4 +- po/Makefile.am | 6 +- po/POTFILES.in | 726 +++++++++++++++++++------------------- 3 files changed, 369 insertions(+), 367 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d47a92b530f..bf229c42a74 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1869,8 +1869,8 @@ sc_po_check: gen_source_files { $(VC_LIST_EXCEPT); echo $(generated_files); } \ | xargs perl $(perl_translatable_files_list_) \ | xargs $(GREP) -E -l '$(_gl_translatable_string_re)' \ - | $(SED) 's|^$(_dot_escaped_srcdir)|@SRCDIR@|' \ - | $(SED) 's|^$(_dot_escaped_builddir)|@BUILDDIR@|' \ + | $(SED) 's|^$(_dot_escaped_srcdir)/|@SRCDIR@|' \ + | $(SED) 's|^$(_dot_escaped_builddir)/|@BUILDDIR@|' \ | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ diff --git a/po/Makefile.am b/po/Makefile.am index 95294aa12ed..f0698b455ba 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -7,8 +7,8 @@ LANGS :=3D $(shell cat $(srcdir)/LINGUAS) POTFILES_IN =3D $(srcdir)/POTFILES.in POTFILES: $(POTFILES_IN) $(AM_V_GEN) cat $(POTFILES_IN) | \ - $(SED) 's|[@]SRCDIR[@]|$(top_srcdir)|' | \ - $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@ + $(SED) 's|[@]SRCDIR[@]||' | \ + $(SED) 's|[@]BUILDDIR[@]||' > $@ POTFILE_DEPS =3D $(shell cat POTFILES) POTFILE :=3D $(DOMAIN).pot POFILES :=3D $(LANGS:%=3D%.po) @@ -32,6 +32,8 @@ XGETTEXT_ARGS =3D \ --package-name=3D"$(PACKAGE_NAME)" \ --package-version=3D"$(PACKAGE_VERSION)" \ --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ + --directory=3D"$(top_srcdir)" \ + --directory=3D"$(top_builddir)" \ --sort-output \ $(NULL) =20 diff --git a/po/POTFILES.in b/po/POTFILES.in index af52054aa4e..b10008ae3d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,363 +1,363 @@ -@BUILDDIR@/src/access/viraccessapicheck.c -@BUILDDIR@/src/access/viraccessapichecklxc.c -@BUILDDIR@/src/access/viraccessapicheckqemu.c -@BUILDDIR@/src/admin/admin_client.h -@BUILDDIR@/src/admin/admin_server_dispatch_stubs.h -@BUILDDIR@/src/remote/remote_client_bodies.h -@BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h -@SRCDIR@/src/access/viraccessdriverpolkit.c -@SRCDIR@/src/access/viraccessmanager.c -@SRCDIR@/src/admin/admin_server.c -@SRCDIR@/src/admin/admin_server_dispatch.c -@SRCDIR@/src/admin/libvirt-admin.c -@SRCDIR@/src/bhyve/bhyve_capabilities.c -@SRCDIR@/src/bhyve/bhyve_command.c -@SRCDIR@/src/bhyve/bhyve_device.c -@SRCDIR@/src/bhyve/bhyve_domain.c -@SRCDIR@/src/bhyve/bhyve_driver.c -@SRCDIR@/src/bhyve/bhyve_monitor.c -@SRCDIR@/src/bhyve/bhyve_parse_command.c -@SRCDIR@/src/bhyve/bhyve_process.c -@SRCDIR@/src/conf/backup_conf.c -@SRCDIR@/src/conf/capabilities.c -@SRCDIR@/src/conf/checkpoint_conf.c -@SRCDIR@/src/conf/cpu_conf.c -@SRCDIR@/src/conf/device_conf.c -@SRCDIR@/src/conf/domain_addr.c -@SRCDIR@/src/conf/domain_capabilities.c -@SRCDIR@/src/conf/domain_conf.c -@SRCDIR@/src/conf/domain_event.c -@SRCDIR@/src/conf/interface_conf.c -@SRCDIR@/src/conf/netdev_bandwidth_conf.c -@SRCDIR@/src/conf/netdev_vlan_conf.c -@SRCDIR@/src/conf/netdev_vport_profile_conf.c -@SRCDIR@/src/conf/network_conf.c -@SRCDIR@/src/conf/networkcommon_conf.c -@SRCDIR@/src/conf/node_device_conf.c -@SRCDIR@/src/conf/node_device_util.c -@SRCDIR@/src/conf/numa_conf.c -@SRCDIR@/src/conf/nwfilter_conf.c -@SRCDIR@/src/conf/nwfilter_params.c -@SRCDIR@/src/conf/object_event.c -@SRCDIR@/src/conf/secret_conf.c -@SRCDIR@/src/conf/snapshot_conf.c -@SRCDIR@/src/conf/storage_adapter_conf.c -@SRCDIR@/src/conf/storage_conf.c -@SRCDIR@/src/conf/virchrdev.c -@SRCDIR@/src/conf/virdomainmomentobjlist.c -@SRCDIR@/src/conf/virdomainobjlist.c -@SRCDIR@/src/conf/virnetworkobj.c -@SRCDIR@/src/conf/virnetworkportdef.c -@SRCDIR@/src/conf/virnodedeviceobj.c -@SRCDIR@/src/conf/virnwfilterbindingdef.c -@SRCDIR@/src/conf/virnwfilterbindingobj.c -@SRCDIR@/src/conf/virnwfilterbindingobjlist.c -@SRCDIR@/src/conf/virnwfilterobj.c -@SRCDIR@/src/conf/virsavecookie.c -@SRCDIR@/src/conf/virsecretobj.c -@SRCDIR@/src/conf/virstorageobj.c -@SRCDIR@/src/cpu/cpu.c -@SRCDIR@/src/cpu/cpu_arm.c -@SRCDIR@/src/cpu/cpu_map.c -@SRCDIR@/src/cpu/cpu_ppc64.c -@SRCDIR@/src/cpu/cpu_s390.c -@SRCDIR@/src/cpu/cpu_x86.c -@SRCDIR@/src/datatypes.c -@SRCDIR@/src/driver.c -@SRCDIR@/src/esx/esx_driver.c -@SRCDIR@/src/esx/esx_network_driver.c -@SRCDIR@/src/esx/esx_storage_backend_iscsi.c -@SRCDIR@/src/esx/esx_storage_backend_vmfs.c -@SRCDIR@/src/esx/esx_storage_driver.c -@SRCDIR@/src/esx/esx_stream.c -@SRCDIR@/src/esx/esx_util.c -@SRCDIR@/src/esx/esx_util.h -@SRCDIR@/src/esx/esx_vi.c -@SRCDIR@/src/esx/esx_vi_methods.c -@SRCDIR@/src/esx/esx_vi_types.c -@SRCDIR@/src/hyperv/hyperv_driver.c -@SRCDIR@/src/hyperv/hyperv_util.c -@SRCDIR@/src/hyperv/hyperv_wmi.c -@SRCDIR@/src/hypervisor/domain_cgroup.c -@SRCDIR@/src/hypervisor/domain_driver.c -@SRCDIR@/src/hypervisor/virclosecallbacks.c -@SRCDIR@/src/hypervisor/virhostdev.c -@SRCDIR@/src/interface/interface_backend_netcf.c -@SRCDIR@/src/interface/interface_backend_udev.c -@SRCDIR@/src/internal.h -@SRCDIR@/src/libvirt-domain-checkpoint.c -@SRCDIR@/src/libvirt-domain-snapshot.c -@SRCDIR@/src/libvirt-domain.c -@SRCDIR@/src/libvirt-host.c -@SRCDIR@/src/libvirt-lxc.c -@SRCDIR@/src/libvirt-network.c -@SRCDIR@/src/libvirt-nodedev.c -@SRCDIR@/src/libvirt-nwfilter.c -@SRCDIR@/src/libvirt-qemu.c -@SRCDIR@/src/libvirt-secret.c -@SRCDIR@/src/libvirt-storage.c -@SRCDIR@/src/libvirt-stream.c -@SRCDIR@/src/libvirt.c -@SRCDIR@/src/libxl/libxl_capabilities.c -@SRCDIR@/src/libxl/libxl_conf.c -@SRCDIR@/src/libxl/libxl_domain.c -@SRCDIR@/src/libxl/libxl_driver.c -@SRCDIR@/src/libxl/libxl_migration.c -@SRCDIR@/src/libxl/xen_common.c -@SRCDIR@/src/libxl/xen_xl.c -@SRCDIR@/src/libxl/xen_xm.c -@SRCDIR@/src/locking/lock_daemon.c -@SRCDIR@/src/locking/lock_daemon_dispatch.c -@SRCDIR@/src/locking/lock_driver_lockd.c -@SRCDIR@/src/locking/lock_driver_sanlock.c -@SRCDIR@/src/locking/lock_manager.c -@SRCDIR@/src/locking/sanlock_helper.c -@SRCDIR@/src/logging/log_daemon.c -@SRCDIR@/src/logging/log_daemon_dispatch.c -@SRCDIR@/src/logging/log_handler.c -@SRCDIR@/src/logging/log_manager.c -@SRCDIR@/src/lxc/lxc_cgroup.c -@SRCDIR@/src/lxc/lxc_conf.c -@SRCDIR@/src/lxc/lxc_container.c -@SRCDIR@/src/lxc/lxc_controller.c -@SRCDIR@/src/lxc/lxc_domain.c -@SRCDIR@/src/lxc/lxc_driver.c -@SRCDIR@/src/lxc/lxc_fuse.c -@SRCDIR@/src/lxc/lxc_hostdev.c -@SRCDIR@/src/lxc/lxc_native.c -@SRCDIR@/src/lxc/lxc_process.c -@SRCDIR@/src/network/bridge_driver.c -@SRCDIR@/src/network/bridge_driver_linux.c -@SRCDIR@/src/network/leaseshelper.c -@SRCDIR@/src/node_device/node_device_driver.c -@SRCDIR@/src/node_device/node_device_hal.c -@SRCDIR@/src/node_device/node_device_udev.c -@SRCDIR@/src/nwfilter/nwfilter_dhcpsnoop.c -@SRCDIR@/src/nwfilter/nwfilter_driver.c -@SRCDIR@/src/nwfilter/nwfilter_ebiptables_driver.c -@SRCDIR@/src/nwfilter/nwfilter_gentech_driver.c -@SRCDIR@/src/nwfilter/nwfilter_learnipaddr.c -@SRCDIR@/src/openvz/openvz_conf.c -@SRCDIR@/src/openvz/openvz_driver.c -@SRCDIR@/src/openvz/openvz_util.c -@SRCDIR@/src/qemu/qemu_agent.c -@SRCDIR@/src/qemu/qemu_alias.c -@SRCDIR@/src/qemu/qemu_backup.c -@SRCDIR@/src/qemu/qemu_block.c -@SRCDIR@/src/qemu/qemu_blockjob.c -@SRCDIR@/src/qemu/qemu_capabilities.c -@SRCDIR@/src/qemu/qemu_cgroup.c -@SRCDIR@/src/qemu/qemu_checkpoint.c -@SRCDIR@/src/qemu/qemu_command.c -@SRCDIR@/src/qemu/qemu_conf.c -@SRCDIR@/src/qemu/qemu_dbus.c -@SRCDIR@/src/qemu/qemu_domain.c -@SRCDIR@/src/qemu/qemu_domainjob.c -@SRCDIR@/src/qemu/qemu_domain_address.c -@SRCDIR@/src/qemu/qemu_driver.c -@SRCDIR@/src/qemu/qemu_extdevice.c -@SRCDIR@/src/qemu/qemu_firmware.c -@SRCDIR@/src/qemu/qemu_hostdev.c -@SRCDIR@/src/qemu/qemu_hotplug.c -@SRCDIR@/src/qemu/qemu_interface.c -@SRCDIR@/src/qemu/qemu_interop_config.c -@SRCDIR@/src/qemu/qemu_migration.c -@SRCDIR@/src/qemu/qemu_migration_cookie.c -@SRCDIR@/src/qemu/qemu_migration_params.c -@SRCDIR@/src/qemu/qemu_monitor.c -@SRCDIR@/src/qemu/qemu_monitor_json.c -@SRCDIR@/src/qemu/qemu_monitor_text.c -@SRCDIR@/src/qemu/qemu_process.c -@SRCDIR@/src/qemu/qemu_qapi.c -@SRCDIR@/src/qemu/qemu_slirp.c -@SRCDIR@/src/qemu/qemu_tpm.c -@SRCDIR@/src/qemu/qemu_validate.c -@SRCDIR@/src/qemu/qemu_vhost_user.c -@SRCDIR@/src/qemu/qemu_vhost_user_gpu.c -@SRCDIR@/src/qemu/qemu_virtiofs.c -@SRCDIR@/src/remote/remote_daemon.c -@SRCDIR@/src/remote/remote_daemon_config.c -@SRCDIR@/src/remote/remote_daemon_dispatch.c -@SRCDIR@/src/remote/remote_daemon_stream.c -@SRCDIR@/src/remote/remote_driver.c -@SRCDIR@/src/rpc/virkeepalive.c -@SRCDIR@/src/rpc/virnetclient.c -@SRCDIR@/src/rpc/virnetclientprogram.c -@SRCDIR@/src/rpc/virnetclientstream.c -@SRCDIR@/src/rpc/virnetdaemon.c -@SRCDIR@/src/rpc/virnetlibsshsession.c -@SRCDIR@/src/rpc/virnetmessage.c -@SRCDIR@/src/rpc/virnetsaslcontext.c -@SRCDIR@/src/rpc/virnetserver.c -@SRCDIR@/src/rpc/virnetserverclient.c -@SRCDIR@/src/rpc/virnetserverprogram.c -@SRCDIR@/src/rpc/virnetserverservice.c -@SRCDIR@/src/rpc/virnetsocket.c -@SRCDIR@/src/rpc/virnetsshsession.c -@SRCDIR@/src/rpc/virnettlscontext.c -@SRCDIR@/src/secret/secret_driver.c -@SRCDIR@/src/security/security_apparmor.c -@SRCDIR@/src/security/security_dac.c -@SRCDIR@/src/security/security_driver.c -@SRCDIR@/src/security/security_manager.c -@SRCDIR@/src/security/security_selinux.c -@SRCDIR@/src/security/security_util.c -@SRCDIR@/src/security/virt-aa-helper.c -@SRCDIR@/src/storage/parthelper.c -@SRCDIR@/src/storage/storage_backend.c -@SRCDIR@/src/storage/storage_backend_disk.c -@SRCDIR@/src/storage/storage_backend_fs.c -@SRCDIR@/src/storage/storage_backend_gluster.c -@SRCDIR@/src/storage/storage_backend_iscsi.c -@SRCDIR@/src/storage/storage_backend_iscsi_direct.c -@SRCDIR@/src/storage/storage_backend_logical.c -@SRCDIR@/src/storage/storage_backend_mpath.c -@SRCDIR@/src/storage/storage_backend_rbd.c -@SRCDIR@/src/storage/storage_backend_scsi.c -@SRCDIR@/src/storage/storage_backend_sheepdog.c -@SRCDIR@/src/storage/storage_backend_vstorage.c -@SRCDIR@/src/storage/storage_backend_zfs.c -@SRCDIR@/src/storage/storage_driver.c -@SRCDIR@/src/storage/storage_file_fs.c -@SRCDIR@/src/storage/storage_file_gluster.c -@SRCDIR@/src/storage/storage_util.c -@SRCDIR@/src/test/test_driver.c -@SRCDIR@/src/util/iohelper.c -@SRCDIR@/src/util/viralloc.c -@SRCDIR@/src/util/virarptable.c -@SRCDIR@/src/util/viraudit.c -@SRCDIR@/src/util/virauth.c -@SRCDIR@/src/util/virauthconfig.c -@SRCDIR@/src/util/virbitmap.c -@SRCDIR@/src/util/vircgroup.c -@SRCDIR@/src/util/vircgroupbackend.c -@SRCDIR@/src/util/vircgroupbackend.h -@SRCDIR@/src/util/vircgroupv1.c -@SRCDIR@/src/util/vircgroupv2.c -@SRCDIR@/src/util/vircgroupv2devices.c -@SRCDIR@/src/util/vircommand.c -@SRCDIR@/src/util/virconf.c -@SRCDIR@/src/util/vircrypto.c -@SRCDIR@/src/util/virdaemon.c -@SRCDIR@/src/util/virdbus.c -@SRCDIR@/src/util/virdnsmasq.c -@SRCDIR@/src/util/virerror.c -@SRCDIR@/src/util/virerror.h -@SRCDIR@/src/util/virevent.c -@SRCDIR@/src/util/vireventthread.c -@SRCDIR@/src/util/virfcp.c -@SRCDIR@/src/util/virfdstream.c -@SRCDIR@/src/util/virfile.c -@SRCDIR@/src/util/virfilecache.c -@SRCDIR@/src/util/virfirewall.c -@SRCDIR@/src/util/virfirewalld.c -@SRCDIR@/src/util/virfirmware.c -@SRCDIR@/src/util/virhash.c -@SRCDIR@/src/util/virhook.c -@SRCDIR@/src/util/virhostcpu.c -@SRCDIR@/src/util/virhostmem.c -@SRCDIR@/src/util/virhostuptime.c -@SRCDIR@/src/util/viridentity.c -@SRCDIR@/src/util/virinitctl.c -@SRCDIR@/src/util/viriptables.c -@SRCDIR@/src/util/viriscsi.c -@SRCDIR@/src/util/virjson.c -@SRCDIR@/src/util/virlease.c -@SRCDIR@/src/util/virlockspace.c -@SRCDIR@/src/util/virlog.c -@SRCDIR@/src/util/virmacmap.c -@SRCDIR@/src/util/virmdev.c -@SRCDIR@/src/util/virmodule.c -@SRCDIR@/src/util/virnetdev.c -@SRCDIR@/src/util/virnetdevbandwidth.c -@SRCDIR@/src/util/virnetdevbridge.c -@SRCDIR@/src/util/virnetdevip.c -@SRCDIR@/src/util/virnetdevmacvlan.c -@SRCDIR@/src/util/virnetdevmidonet.c -@SRCDIR@/src/util/virnetdevopenvswitch.c -@SRCDIR@/src/util/virnetdevtap.c -@SRCDIR@/src/util/virnetdevveth.c -@SRCDIR@/src/util/virnetdevvportprofile.c -@SRCDIR@/src/util/virnetlink.c -@SRCDIR@/src/util/virnodesuspend.c -@SRCDIR@/src/util/virnuma.c -@SRCDIR@/src/util/virnvme.c -@SRCDIR@/src/util/virobject.c -@SRCDIR@/src/util/virpci.c -@SRCDIR@/src/util/virperf.c -@SRCDIR@/src/util/virpidfile.c -@SRCDIR@/src/util/virpolkit.c -@SRCDIR@/src/util/virportallocator.c -@SRCDIR@/src/util/virprocess.c -@SRCDIR@/src/util/virqemu.c -@SRCDIR@/src/util/virrandom.c -@SRCDIR@/src/util/virresctrl.c -@SRCDIR@/src/util/virrotatingfile.c -@SRCDIR@/src/util/virscsi.c -@SRCDIR@/src/util/virscsihost.c -@SRCDIR@/src/util/virscsivhost.c -@SRCDIR@/src/util/virsecret.c -@SRCDIR@/src/util/virsocketaddr.c -@SRCDIR@/src/util/virstorageencryption.c -@SRCDIR@/src/util/virstoragefile.c -@SRCDIR@/src/util/virstoragefilebackend.c -@SRCDIR@/src/util/virstring.c -@SRCDIR@/src/util/virsysinfo.c -@SRCDIR@/src/util/virsystemd.c -@SRCDIR@/src/util/virthreadjob.c -@SRCDIR@/src/util/virthreadpool.c -@SRCDIR@/src/util/virtime.c -@SRCDIR@/src/util/virtpm.c -@SRCDIR@/src/util/virtypedparam-public.c -@SRCDIR@/src/util/virtypedparam.c -@SRCDIR@/src/util/viruri.c -@SRCDIR@/src/util/virusb.c -@SRCDIR@/src/util/virutil.c -@SRCDIR@/src/util/virvhba.c -@SRCDIR@/src/util/virvsock.c -@SRCDIR@/src/util/virxml.c -@SRCDIR@/src/vbox/vbox_XPCOMCGlue.c -@SRCDIR@/src/vbox/vbox_common.c -@SRCDIR@/src/vbox/vbox_driver.c -@SRCDIR@/src/vbox/vbox_network.c -@SRCDIR@/src/vbox/vbox_snapshot_conf.c -@SRCDIR@/src/vbox/vbox_storage.c -@SRCDIR@/src/vbox/vbox_tmpl.c -@SRCDIR@/src/vmware/vmware_conf.c -@SRCDIR@/src/vmware/vmware_driver.c -@SRCDIR@/src/vmx/vmx.c -@SRCDIR@/src/vz/vz_driver.c -@SRCDIR@/src/vz/vz_sdk.c -@SRCDIR@/src/vz/vz_utils.c -@SRCDIR@/src/vz/vz_utils.h -@SRCDIR@/tests/virpolkittest.c -@SRCDIR@/tools/libvirt-guests.sh.in -@SRCDIR@/tools/virsh-backup.c -@SRCDIR@/tools/virsh-checkpoint.c -@SRCDIR@/tools/virsh-completer-host.c -@SRCDIR@/tools/virsh-console.c -@SRCDIR@/tools/virsh-domain-monitor.c -@SRCDIR@/tools/virsh-domain.c -@SRCDIR@/tools/virsh-edit.c -@SRCDIR@/tools/virsh-host.c -@SRCDIR@/tools/virsh-interface.c -@SRCDIR@/tools/virsh-network.c -@SRCDIR@/tools/virsh-nodedev.c -@SRCDIR@/tools/virsh-nwfilter.c -@SRCDIR@/tools/virsh-pool.c -@SRCDIR@/tools/virsh-secret.c -@SRCDIR@/tools/virsh-snapshot.c -@SRCDIR@/tools/virsh-util.c -@SRCDIR@/tools/virsh-volume.c -@SRCDIR@/tools/virsh.c -@SRCDIR@/tools/virsh.h -@SRCDIR@/tools/virt-admin.c -@SRCDIR@/tools/virt-host-validate-bhyve.c -@SRCDIR@/tools/virt-host-validate-common.c -@SRCDIR@/tools/virt-host-validate-lxc.c -@SRCDIR@/tools/virt-host-validate-qemu.c -@SRCDIR@/tools/virt-host-validate.c -@SRCDIR@/tools/virt-login-shell-helper.c -@SRCDIR@/tools/vsh-table.c -@SRCDIR@/tools/vsh.c -@SRCDIR@/tools/vsh.h +@BUILDDIR@src/access/viraccessapicheck.c +@BUILDDIR@src/access/viraccessapichecklxc.c +@BUILDDIR@src/access/viraccessapicheckqemu.c +@BUILDDIR@src/admin/admin_client.h +@BUILDDIR@src/admin/admin_server_dispatch_stubs.h +@BUILDDIR@src/remote/remote_client_bodies.h +@BUILDDIR@src/remote/remote_daemon_dispatch_stubs.h +@SRCDIR@src/access/viraccessdriverpolkit.c +@SRCDIR@src/access/viraccessmanager.c +@SRCDIR@src/admin/admin_server.c +@SRCDIR@src/admin/admin_server_dispatch.c +@SRCDIR@src/admin/libvirt-admin.c +@SRCDIR@src/bhyve/bhyve_capabilities.c +@SRCDIR@src/bhyve/bhyve_command.c +@SRCDIR@src/bhyve/bhyve_device.c +@SRCDIR@src/bhyve/bhyve_domain.c +@SRCDIR@src/bhyve/bhyve_driver.c +@SRCDIR@src/bhyve/bhyve_monitor.c +@SRCDIR@src/bhyve/bhyve_parse_command.c +@SRCDIR@src/bhyve/bhyve_process.c +@SRCDIR@src/conf/backup_conf.c +@SRCDIR@src/conf/capabilities.c +@SRCDIR@src/conf/checkpoint_conf.c +@SRCDIR@src/conf/cpu_conf.c +@SRCDIR@src/conf/device_conf.c +@SRCDIR@src/conf/domain_addr.c +@SRCDIR@src/conf/domain_capabilities.c +@SRCDIR@src/conf/domain_conf.c +@SRCDIR@src/conf/domain_event.c +@SRCDIR@src/conf/interface_conf.c +@SRCDIR@src/conf/netdev_bandwidth_conf.c +@SRCDIR@src/conf/netdev_vlan_conf.c +@SRCDIR@src/conf/netdev_vport_profile_conf.c +@SRCDIR@src/conf/network_conf.c +@SRCDIR@src/conf/networkcommon_conf.c +@SRCDIR@src/conf/node_device_conf.c +@SRCDIR@src/conf/node_device_util.c +@SRCDIR@src/conf/numa_conf.c +@SRCDIR@src/conf/nwfilter_conf.c +@SRCDIR@src/conf/nwfilter_params.c +@SRCDIR@src/conf/object_event.c +@SRCDIR@src/conf/secret_conf.c +@SRCDIR@src/conf/snapshot_conf.c +@SRCDIR@src/conf/storage_adapter_conf.c +@SRCDIR@src/conf/storage_conf.c +@SRCDIR@src/conf/virchrdev.c +@SRCDIR@src/conf/virdomainmomentobjlist.c +@SRCDIR@src/conf/virdomainobjlist.c +@SRCDIR@src/conf/virnetworkobj.c +@SRCDIR@src/conf/virnetworkportdef.c +@SRCDIR@src/conf/virnodedeviceobj.c +@SRCDIR@src/conf/virnwfilterbindingdef.c +@SRCDIR@src/conf/virnwfilterbindingobj.c +@SRCDIR@src/conf/virnwfilterbindingobjlist.c +@SRCDIR@src/conf/virnwfilterobj.c +@SRCDIR@src/conf/virsavecookie.c +@SRCDIR@src/conf/virsecretobj.c +@SRCDIR@src/conf/virstorageobj.c +@SRCDIR@src/cpu/cpu.c +@SRCDIR@src/cpu/cpu_arm.c +@SRCDIR@src/cpu/cpu_map.c +@SRCDIR@src/cpu/cpu_ppc64.c +@SRCDIR@src/cpu/cpu_s390.c +@SRCDIR@src/cpu/cpu_x86.c +@SRCDIR@src/datatypes.c +@SRCDIR@src/driver.c +@SRCDIR@src/esx/esx_driver.c +@SRCDIR@src/esx/esx_network_driver.c +@SRCDIR@src/esx/esx_storage_backend_iscsi.c +@SRCDIR@src/esx/esx_storage_backend_vmfs.c +@SRCDIR@src/esx/esx_storage_driver.c +@SRCDIR@src/esx/esx_stream.c +@SRCDIR@src/esx/esx_util.c +@SRCDIR@src/esx/esx_util.h +@SRCDIR@src/esx/esx_vi.c +@SRCDIR@src/esx/esx_vi_methods.c +@SRCDIR@src/esx/esx_vi_types.c +@SRCDIR@src/hyperv/hyperv_driver.c +@SRCDIR@src/hyperv/hyperv_util.c +@SRCDIR@src/hyperv/hyperv_wmi.c +@SRCDIR@src/hypervisor/domain_cgroup.c +@SRCDIR@src/hypervisor/domain_driver.c +@SRCDIR@src/hypervisor/virclosecallbacks.c +@SRCDIR@src/hypervisor/virhostdev.c +@SRCDIR@src/interface/interface_backend_netcf.c +@SRCDIR@src/interface/interface_backend_udev.c +@SRCDIR@src/internal.h +@SRCDIR@src/libvirt-domain-checkpoint.c +@SRCDIR@src/libvirt-domain-snapshot.c +@SRCDIR@src/libvirt-domain.c +@SRCDIR@src/libvirt-host.c +@SRCDIR@src/libvirt-lxc.c +@SRCDIR@src/libvirt-network.c +@SRCDIR@src/libvirt-nodedev.c +@SRCDIR@src/libvirt-nwfilter.c +@SRCDIR@src/libvirt-qemu.c +@SRCDIR@src/libvirt-secret.c +@SRCDIR@src/libvirt-storage.c +@SRCDIR@src/libvirt-stream.c +@SRCDIR@src/libvirt.c +@SRCDIR@src/libxl/libxl_capabilities.c +@SRCDIR@src/libxl/libxl_conf.c +@SRCDIR@src/libxl/libxl_domain.c +@SRCDIR@src/libxl/libxl_driver.c +@SRCDIR@src/libxl/libxl_migration.c +@SRCDIR@src/libxl/xen_common.c +@SRCDIR@src/libxl/xen_xl.c +@SRCDIR@src/libxl/xen_xm.c +@SRCDIR@src/locking/lock_daemon.c +@SRCDIR@src/locking/lock_daemon_dispatch.c +@SRCDIR@src/locking/lock_driver_lockd.c +@SRCDIR@src/locking/lock_driver_sanlock.c +@SRCDIR@src/locking/lock_manager.c +@SRCDIR@src/locking/sanlock_helper.c +@SRCDIR@src/logging/log_daemon.c +@SRCDIR@src/logging/log_daemon_dispatch.c +@SRCDIR@src/logging/log_handler.c +@SRCDIR@src/logging/log_manager.c +@SRCDIR@src/lxc/lxc_cgroup.c +@SRCDIR@src/lxc/lxc_conf.c +@SRCDIR@src/lxc/lxc_container.c +@SRCDIR@src/lxc/lxc_controller.c +@SRCDIR@src/lxc/lxc_domain.c +@SRCDIR@src/lxc/lxc_driver.c +@SRCDIR@src/lxc/lxc_fuse.c +@SRCDIR@src/lxc/lxc_hostdev.c +@SRCDIR@src/lxc/lxc_native.c +@SRCDIR@src/lxc/lxc_process.c +@SRCDIR@src/network/bridge_driver.c +@SRCDIR@src/network/bridge_driver_linux.c +@SRCDIR@src/network/leaseshelper.c +@SRCDIR@src/node_device/node_device_driver.c +@SRCDIR@src/node_device/node_device_hal.c +@SRCDIR@src/node_device/node_device_udev.c +@SRCDIR@src/nwfilter/nwfilter_dhcpsnoop.c +@SRCDIR@src/nwfilter/nwfilter_driver.c +@SRCDIR@src/nwfilter/nwfilter_ebiptables_driver.c +@SRCDIR@src/nwfilter/nwfilter_gentech_driver.c +@SRCDIR@src/nwfilter/nwfilter_learnipaddr.c +@SRCDIR@src/openvz/openvz_conf.c +@SRCDIR@src/openvz/openvz_driver.c +@SRCDIR@src/openvz/openvz_util.c +@SRCDIR@src/qemu/qemu_agent.c +@SRCDIR@src/qemu/qemu_alias.c +@SRCDIR@src/qemu/qemu_backup.c +@SRCDIR@src/qemu/qemu_block.c +@SRCDIR@src/qemu/qemu_blockjob.c +@SRCDIR@src/qemu/qemu_capabilities.c +@SRCDIR@src/qemu/qemu_cgroup.c +@SRCDIR@src/qemu/qemu_checkpoint.c +@SRCDIR@src/qemu/qemu_command.c +@SRCDIR@src/qemu/qemu_conf.c +@SRCDIR@src/qemu/qemu_dbus.c +@SRCDIR@src/qemu/qemu_domain.c +@SRCDIR@src/qemu/qemu_domain_address.c +@SRCDIR@src/qemu/qemu_domainjob.c +@SRCDIR@src/qemu/qemu_driver.c +@SRCDIR@src/qemu/qemu_extdevice.c +@SRCDIR@src/qemu/qemu_firmware.c +@SRCDIR@src/qemu/qemu_hostdev.c +@SRCDIR@src/qemu/qemu_hotplug.c +@SRCDIR@src/qemu/qemu_interface.c +@SRCDIR@src/qemu/qemu_interop_config.c +@SRCDIR@src/qemu/qemu_migration.c +@SRCDIR@src/qemu/qemu_migration_cookie.c +@SRCDIR@src/qemu/qemu_migration_params.c +@SRCDIR@src/qemu/qemu_monitor.c +@SRCDIR@src/qemu/qemu_monitor_json.c +@SRCDIR@src/qemu/qemu_monitor_text.c +@SRCDIR@src/qemu/qemu_process.c +@SRCDIR@src/qemu/qemu_qapi.c +@SRCDIR@src/qemu/qemu_slirp.c +@SRCDIR@src/qemu/qemu_tpm.c +@SRCDIR@src/qemu/qemu_validate.c +@SRCDIR@src/qemu/qemu_vhost_user.c +@SRCDIR@src/qemu/qemu_vhost_user_gpu.c +@SRCDIR@src/qemu/qemu_virtiofs.c +@SRCDIR@src/remote/remote_daemon.c +@SRCDIR@src/remote/remote_daemon_config.c +@SRCDIR@src/remote/remote_daemon_dispatch.c +@SRCDIR@src/remote/remote_daemon_stream.c +@SRCDIR@src/remote/remote_driver.c +@SRCDIR@src/rpc/virkeepalive.c +@SRCDIR@src/rpc/virnetclient.c +@SRCDIR@src/rpc/virnetclientprogram.c +@SRCDIR@src/rpc/virnetclientstream.c +@SRCDIR@src/rpc/virnetdaemon.c +@SRCDIR@src/rpc/virnetlibsshsession.c +@SRCDIR@src/rpc/virnetmessage.c +@SRCDIR@src/rpc/virnetsaslcontext.c +@SRCDIR@src/rpc/virnetserver.c +@SRCDIR@src/rpc/virnetserverclient.c +@SRCDIR@src/rpc/virnetserverprogram.c +@SRCDIR@src/rpc/virnetserverservice.c +@SRCDIR@src/rpc/virnetsocket.c +@SRCDIR@src/rpc/virnetsshsession.c +@SRCDIR@src/rpc/virnettlscontext.c +@SRCDIR@src/secret/secret_driver.c +@SRCDIR@src/security/security_apparmor.c +@SRCDIR@src/security/security_dac.c +@SRCDIR@src/security/security_driver.c +@SRCDIR@src/security/security_manager.c +@SRCDIR@src/security/security_selinux.c +@SRCDIR@src/security/security_util.c +@SRCDIR@src/security/virt-aa-helper.c +@SRCDIR@src/storage/parthelper.c +@SRCDIR@src/storage/storage_backend.c +@SRCDIR@src/storage/storage_backend_disk.c +@SRCDIR@src/storage/storage_backend_fs.c +@SRCDIR@src/storage/storage_backend_gluster.c +@SRCDIR@src/storage/storage_backend_iscsi.c +@SRCDIR@src/storage/storage_backend_iscsi_direct.c +@SRCDIR@src/storage/storage_backend_logical.c +@SRCDIR@src/storage/storage_backend_mpath.c +@SRCDIR@src/storage/storage_backend_rbd.c +@SRCDIR@src/storage/storage_backend_scsi.c +@SRCDIR@src/storage/storage_backend_sheepdog.c +@SRCDIR@src/storage/storage_backend_vstorage.c +@SRCDIR@src/storage/storage_backend_zfs.c +@SRCDIR@src/storage/storage_driver.c +@SRCDIR@src/storage/storage_file_fs.c +@SRCDIR@src/storage/storage_file_gluster.c +@SRCDIR@src/storage/storage_util.c +@SRCDIR@src/test/test_driver.c +@SRCDIR@src/util/iohelper.c +@SRCDIR@src/util/viralloc.c +@SRCDIR@src/util/virarptable.c +@SRCDIR@src/util/viraudit.c +@SRCDIR@src/util/virauth.c +@SRCDIR@src/util/virauthconfig.c +@SRCDIR@src/util/virbitmap.c +@SRCDIR@src/util/vircgroup.c +@SRCDIR@src/util/vircgroupbackend.c +@SRCDIR@src/util/vircgroupbackend.h +@SRCDIR@src/util/vircgroupv1.c +@SRCDIR@src/util/vircgroupv2.c +@SRCDIR@src/util/vircgroupv2devices.c +@SRCDIR@src/util/vircommand.c +@SRCDIR@src/util/virconf.c +@SRCDIR@src/util/vircrypto.c +@SRCDIR@src/util/virdaemon.c +@SRCDIR@src/util/virdbus.c +@SRCDIR@src/util/virdnsmasq.c +@SRCDIR@src/util/virerror.c +@SRCDIR@src/util/virerror.h +@SRCDIR@src/util/virevent.c +@SRCDIR@src/util/vireventthread.c +@SRCDIR@src/util/virfcp.c +@SRCDIR@src/util/virfdstream.c +@SRCDIR@src/util/virfile.c +@SRCDIR@src/util/virfilecache.c +@SRCDIR@src/util/virfirewall.c +@SRCDIR@src/util/virfirewalld.c +@SRCDIR@src/util/virfirmware.c +@SRCDIR@src/util/virhash.c +@SRCDIR@src/util/virhook.c +@SRCDIR@src/util/virhostcpu.c +@SRCDIR@src/util/virhostmem.c +@SRCDIR@src/util/virhostuptime.c +@SRCDIR@src/util/viridentity.c +@SRCDIR@src/util/virinitctl.c +@SRCDIR@src/util/viriptables.c +@SRCDIR@src/util/viriscsi.c +@SRCDIR@src/util/virjson.c +@SRCDIR@src/util/virlease.c +@SRCDIR@src/util/virlockspace.c +@SRCDIR@src/util/virlog.c +@SRCDIR@src/util/virmacmap.c +@SRCDIR@src/util/virmdev.c +@SRCDIR@src/util/virmodule.c +@SRCDIR@src/util/virnetdev.c +@SRCDIR@src/util/virnetdevbandwidth.c +@SRCDIR@src/util/virnetdevbridge.c +@SRCDIR@src/util/virnetdevip.c +@SRCDIR@src/util/virnetdevmacvlan.c +@SRCDIR@src/util/virnetdevmidonet.c +@SRCDIR@src/util/virnetdevopenvswitch.c +@SRCDIR@src/util/virnetdevtap.c +@SRCDIR@src/util/virnetdevveth.c +@SRCDIR@src/util/virnetdevvportprofile.c +@SRCDIR@src/util/virnetlink.c +@SRCDIR@src/util/virnodesuspend.c +@SRCDIR@src/util/virnuma.c +@SRCDIR@src/util/virnvme.c +@SRCDIR@src/util/virobject.c +@SRCDIR@src/util/virpci.c +@SRCDIR@src/util/virperf.c +@SRCDIR@src/util/virpidfile.c +@SRCDIR@src/util/virpolkit.c +@SRCDIR@src/util/virportallocator.c +@SRCDIR@src/util/virprocess.c +@SRCDIR@src/util/virqemu.c +@SRCDIR@src/util/virrandom.c +@SRCDIR@src/util/virresctrl.c +@SRCDIR@src/util/virrotatingfile.c +@SRCDIR@src/util/virscsi.c +@SRCDIR@src/util/virscsihost.c +@SRCDIR@src/util/virscsivhost.c +@SRCDIR@src/util/virsecret.c +@SRCDIR@src/util/virsocketaddr.c +@SRCDIR@src/util/virstorageencryption.c +@SRCDIR@src/util/virstoragefile.c +@SRCDIR@src/util/virstoragefilebackend.c +@SRCDIR@src/util/virstring.c +@SRCDIR@src/util/virsysinfo.c +@SRCDIR@src/util/virsystemd.c +@SRCDIR@src/util/virthreadjob.c +@SRCDIR@src/util/virthreadpool.c +@SRCDIR@src/util/virtime.c +@SRCDIR@src/util/virtpm.c +@SRCDIR@src/util/virtypedparam-public.c +@SRCDIR@src/util/virtypedparam.c +@SRCDIR@src/util/viruri.c +@SRCDIR@src/util/virusb.c +@SRCDIR@src/util/virutil.c +@SRCDIR@src/util/virvhba.c +@SRCDIR@src/util/virvsock.c +@SRCDIR@src/util/virxml.c +@SRCDIR@src/vbox/vbox_XPCOMCGlue.c +@SRCDIR@src/vbox/vbox_common.c +@SRCDIR@src/vbox/vbox_driver.c +@SRCDIR@src/vbox/vbox_network.c +@SRCDIR@src/vbox/vbox_snapshot_conf.c +@SRCDIR@src/vbox/vbox_storage.c +@SRCDIR@src/vbox/vbox_tmpl.c +@SRCDIR@src/vmware/vmware_conf.c +@SRCDIR@src/vmware/vmware_driver.c +@SRCDIR@src/vmx/vmx.c +@SRCDIR@src/vz/vz_driver.c +@SRCDIR@src/vz/vz_sdk.c +@SRCDIR@src/vz/vz_utils.c +@SRCDIR@src/vz/vz_utils.h +@SRCDIR@tests/virpolkittest.c +@SRCDIR@tools/libvirt-guests.sh.in +@SRCDIR@tools/virsh-backup.c +@SRCDIR@tools/virsh-checkpoint.c +@SRCDIR@tools/virsh-completer-host.c +@SRCDIR@tools/virsh-console.c +@SRCDIR@tools/virsh-domain-monitor.c +@SRCDIR@tools/virsh-domain.c +@SRCDIR@tools/virsh-edit.c +@SRCDIR@tools/virsh-host.c +@SRCDIR@tools/virsh-interface.c +@SRCDIR@tools/virsh-network.c +@SRCDIR@tools/virsh-nodedev.c +@SRCDIR@tools/virsh-nwfilter.c +@SRCDIR@tools/virsh-pool.c +@SRCDIR@tools/virsh-secret.c +@SRCDIR@tools/virsh-snapshot.c +@SRCDIR@tools/virsh-util.c +@SRCDIR@tools/virsh-volume.c +@SRCDIR@tools/virsh.c +@SRCDIR@tools/virsh.h +@SRCDIR@tools/virt-admin.c +@SRCDIR@tools/virt-host-validate-bhyve.c +@SRCDIR@tools/virt-host-validate-common.c +@SRCDIR@tools/virt-host-validate-lxc.c +@SRCDIR@tools/virt-host-validate-qemu.c +@SRCDIR@tools/virt-host-validate.c +@SRCDIR@tools/virt-login-shell-helper.c +@SRCDIR@tools/vsh-table.c +@SRCDIR@tools/vsh.c +@SRCDIR@tools/vsh.h --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692981; cv=none; d=zohomail.com; s=zohoarc; b=bX9lOHTG4zJXUwKK76jyY4WQuF8dJ3etb7HmNTfD+3lhJ2Mz+6xpDTqqgBIHh2GW+HW7eq3/wIeiLfgFQPW2d6dyUSbCgCXuCsqBxj/VE/lxEpG2+r7g8jXJAPrVLd0Kd49rf5WsacB66TmbttHxMeYaJII8mG2O9JSkDWwJ0A8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692981; 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=bALNGW640/WciVHoDAn8JrQpPvPn61tRDzcdWJCD5vg=; b=j2NMbSL5yHfJoJbXxaKBPyANQFZj70XjRQFN5vorY2MXULGznIbvNpbYp+lMUS5/2bIzdc2U/jnk8dAXcclwzM+PDvm8fGBKSFT7XH4i467YzyJ81N9N48YSdssjlv1H4dlqB7IQqJ9Wh5HZw2hARRPYOd+D5N9tdZ9fO2muYiM= 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 1593692981576638.8669758538072; Thu, 2 Jul 2020 05:29:41 -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-425-4IKpNK6FMJWn820-0Rc8fA-1; Thu, 02 Jul 2020 08:29:37 -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 290971054F9F; Thu, 2 Jul 2020 12:29:32 +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 08A6679256; Thu, 2 Jul 2020 12:29:32 +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 CD0DE180599D; Thu, 2 Jul 2020 12:29:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPtQ0020374 for ; Thu, 2 Jul 2020 08:25:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 544CA73FE1; Thu, 2 Jul 2020 12:25:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id C38ED73FD3 for ; Thu, 2 Jul 2020 12:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692980; 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=bALNGW640/WciVHoDAn8JrQpPvPn61tRDzcdWJCD5vg=; b=QS370WPUXyqqpeQEO7K7mgkid6dEa6Z3I7rsrGdg4Dkd+FeQtzFV3FF0Loywby2Cqnq8RE qsj9zp3OeBpXYyIFLh4k1fwTGmLfPnSGYWH7BqRYnVno+s9VSlSgxyzyXD1RTQ7d1A+ATA qO0ewy8V7vW5kB9Wr1p8cI8JyWhlL6c= X-MC-Unique: 4IKpNK6FMJWn820-0Rc8fA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 18/31] scripts: check-remote-protocol: remove unused OBJEXT argument Date: Thu, 2 Jul 2020 14:25:16 +0200 Message-Id: <97a30a75880edc5e34cd98b56158dfe18e63022f.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- scripts/check-remote-protocol.py | 5 ++--- src/Makefile.am | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protoc= ol.py index cf9e3f84a1b..e28fb80cdd1 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -32,9 +32,8 @@ import subprocess import sys =20 cc =3D sys.argv[1] -objext =3D sys.argv[2] -proto_lo =3D sys.argv[3] -expected =3D sys.argv[4] +proto_lo =3D sys.argv[2] +expected =3D sys.argv[3] =20 proto_lo =3D proto_lo.replace("/", "/.libs/") =20 diff --git a/src/Makefile.am b/src/Makefile.am index 8b0cbb6fc86..e1117029ebc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -228,25 +228,25 @@ $(srcdir)/remote_protocol-struct \ $(srcdir)/lxc_protocol-struct: \ $(srcdir)/%-struct: remote/libvirt_driver_remote_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s $(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \ $(srcdir)/%-struct: rpc/libvirt_net_rpc_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s if WITH_LXC $(srcdir)/lxc_monitor_protocol-struct: \ $(srcdir)/%-struct: lxc/libvirt_driver_lxc_impl_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s endif WITH_LXC $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s $(srcdir)/admin_protocol-struct: \ $(srcdir)/%-struct: admin/libvirt_admin_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s =20 else !WITH_REMOTE # The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693089; cv=none; d=zohomail.com; s=zohoarc; b=WYGHQ5NpAP40bhq6X0Cje9dFfPZdVkbGuf1RIx40YQCUyQRhsqWG6Esr5X7pSPp6wNu64MMjMWFRnTIXgKwlYtV49LKgukpw341LWDbKL6QZIS57SkP0gLFn92Rht7cIaOqlug+kzjCPt8ym9rbYyjyxekZmNvVPXs9emYRymUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693089; 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=ncWKGXZcyUyNaDWpuaA0lxem3J1hLMUNCH14pJruPI8=; b=Rwd1Ba3hBuQPcy2MBdFGbGk2+wCGE6B09Y9ZThaG2XqAbTJ5SuMBjwrHi1SYZyOP2x45719teJHbFbnt/nlYDCOjP6Out9PwSyipKnx1P/haj6hq0LmSJ3mmqWlaeNi3YoIor+5wmFA6e2dqVTmDM3yLR0QpOhwQyv5GOenMwHg= 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 1593693089240641.4914644701292; Thu, 2 Jul 2020 05:31:29 -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-492-0W2q9KgHPz6kKVeQ0ZBMKw-1; Thu, 02 Jul 2020 08:30:04 -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 0032A107ACF2; Thu, 2 Jul 2020 12:29:58 +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 DA1E9741B9; Thu, 2 Jul 2020 12:29:57 +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 A92FA180B791; Thu, 2 Jul 2020 12:29:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPuKB020387 for ; Thu, 2 Jul 2020 08:25:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 39C8D73FC5; Thu, 2 Jul 2020 12:25:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA03D73FD3 for ; Thu, 2 Jul 2020 12:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693086; 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=ncWKGXZcyUyNaDWpuaA0lxem3J1hLMUNCH14pJruPI8=; b=GU5KuXpz4BuRmmqTKPKgHA+Rh6aNDa3NhAEdTc4RlCQFMkvYBLsFiTUuEw3GKRQeQu85P+ cSIoUQ4Vo2PqQ82EYNY6lEoO1GlNYEZz+PEMoJ9+s9M3hupcMhWQlLdy8RyeV76LIqZe5Y 2JKNthjwXb+YarMShGy/CKbX+4dp59E= X-MC-Unique: 0W2q9KgHPz6kKVeQ0ZBMKw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 19/31] src: Makefile: remove LOCK_CHECKING_CFLAGS leftover Date: Thu, 2 Jul 2020 14:25:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit removed objectlocking test but forgot to remove all of the usages of LOCK_CHECKING_CFLAGS. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index e1117029ebc..834e356b68b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,6 @@ AM_CPPFLAGS =3D -I$(top_srcdir) \ AM_CFLAGS =3D $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593692999; cv=none; d=zohomail.com; s=zohoarc; b=n9ZkAq8pUpEnkdHUFdyb470aLmp8iPjieNY/lcNKlyc5/wmX6cLL3mNeLJGZCjrTe4x2u1uAJ5wHAPQBWpMAxIzXlSAz8RBiemHaYzgLD8CWRZqnGK+Jnvs21ayYSxWW7J250JUy/4BcUDXFr4SIlOF/GAHylU1TFwZlzqQTzIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692999; 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=Uh+tUl2rNtjbGAPuPSZSHKJevphXQynaPdSCtkaQRss=; b=VGIs2RoJjRuHWICcsEKbFCT1XCRPdJueSFAgC1MKJ4mVE8bUX7uuzfxWVeIwxJ9WZwMJwkgIB3ia6eTC6DHEro/4jKfiFI3gfAedplEIYbtI4uIZITVJuRQtjtGAbGaqCwzcL75MBmSGdbolTvmBnxvB2GXGMtsgCmdl0Yp7T6o= 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 1593692998619896.280781563502; Thu, 2 Jul 2020 05:29:58 -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-414-odpmJG0IMX-QYrKCiCxEoQ-1; Thu, 02 Jul 2020 08:29:51 -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 380EE193F564; Thu, 2 Jul 2020 12:29:46 +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 18CED5C1D6; Thu, 2 Jul 2020 12:29:46 +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 E12CF6C9D6; Thu, 2 Jul 2020 12:29:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPvk6020397 for ; Thu, 2 Jul 2020 08:25:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2093373FC7; Thu, 2 Jul 2020 12:25:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FF5373FC5 for ; Thu, 2 Jul 2020 12:25:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692994; 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=Uh+tUl2rNtjbGAPuPSZSHKJevphXQynaPdSCtkaQRss=; b=ht+VOI+KUmwIKBPFmHS77QQ3m0AvGl63b016IuUlN59PnyiF6LKwfoiG85sW3clf/ZjCQQ h2jq6AOr8hH/8UlfS7RLiCdPhR3UnFM1eqqU+XkjUReWY4EhgAT1bFQ0C4ATeIs64AKqiq Xm93o/V+U6O7w93ACdAObWqWgSoHefA= X-MC-Unique: odpmJG0IMX-QYrKCiCxEoQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 20/31] src: remove unnecessary -I$(srcdir)/secret include Date: Thu, 2 Jul 2020 14:25:18 +0200 Message-Id: <62c843faaca8a659824c26f81c21322dc92135ff.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <894556ca813ad3c4ebb01083b7971d73b4f53c8b> moved function virSecretGetSecretString out of secret directory but forgot to update CFLAGS in places where the include is no longer needed. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libxl/Makefile.inc.am | 1 - src/qemu/Makefile.inc.am | 1 - src/storage/Makefile.inc.am | 4 ---- 3 files changed, 6 deletions(-) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 619835a46b6..9037ba61ef3 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -45,7 +45,6 @@ libvirt_driver_libxl_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f83a675ba2f..9e1d6192f5e 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -103,7 +103,6 @@ libvirt_driver_qemu_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 2f46d244f3a..5e98a7ef5c5 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -123,7 +123,6 @@ libvirt_driver_storage_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_storage_impl_la_LDFLAGS =3D $(AM_LDFLAGS) @@ -269,7 +268,6 @@ if WITH_STORAGE_ISCSI libvirt_storage_backend_iscsi_la_SOURCES =3D $(STORAGE_DRIVER_ISCSI_SOURCE= S) libvirt_storage_backend_iscsi_la_CFLAGS =3D \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) =20 @@ -286,7 +284,6 @@ libvirt_storage_backend_iscsi_direct_la_SOURCES =3D \ $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) libvirt_storage_backend_iscsi_direct_la_CFLAGS =3D \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(LIBISCSI_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) @@ -356,7 +353,6 @@ libvirt_storage_backend_rbd_la_LIBADD =3D \ $(NULL) libvirt_storage_backend_rbd_la_CFLAGS =3D \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) =20 --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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-delivery-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=1593693012; cv=none; d=zohomail.com; s=zohoarc; b=i4eEiptC4cLUtXDMmVWZFR8mNJc7b6ASlHJ4fQ6PrJY0k+mEHCKSCdozLM0KhymZ08d81rzbl/VURrp7yRZLPlKmhGKp7LXL9vj5P2MAY4kGIYqVNSwnY4idFuFjseeWLjesyaSPSqNrqysPLJCk2wPuK6hr6/eWZvRcNi4RzEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693012; 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=bDg/SwX8M4HEHc5mTSevNksllkIB2e9BNcnOukJl2P0=; b=YDqFAMx+7r1ZcDCxM6BIZKbxtOZDJMDl23GsLxhLwQ7MBxO4NCtk6P+kqJwrMawPTJfpMgChTB3PY6SOTPeXH62pjmVuGrT/49yWuqvecGC3uqshKrO/LvrVz1846jrxs1RHfh67TGtRaEmFfUmClsBDFihDOuBpOZVzIwEHyJY= 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593693012322700.4708892660959; Thu, 2 Jul 2020 05:30:12 -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-315-5-DeuH7HM8C5ue-Os5uRNA-1; Thu, 02 Jul 2020 08:30:07 -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 4ACEAEC1A5; Thu, 2 Jul 2020 12:30:00 +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 2B8435C1D3; Thu, 2 Jul 2020 12:30:00 +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 F05896C9E6; Thu, 2 Jul 2020 12:29:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPw4c020410 for ; Thu, 2 Jul 2020 08:25:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 06A4273FC7; Thu, 2 Jul 2020 12:25:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7677E73FC5 for ; Thu, 2 Jul 2020 12:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693009; 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=bDg/SwX8M4HEHc5mTSevNksllkIB2e9BNcnOukJl2P0=; b=bIIDADSjqvelZWcviQ/ZYc6hUnRfvdgjNJSCLuS3wc8nrXG+6HbQIo3cYBtZK1BqLpP64d uLzMxu32Rt/Q91mqd6CLuFHZumAdfnf9nitJUYTMnqTPrHkSssZon0vsl1l5yFgL1PtVhm x4rzpekjsAYnihylNgcJkvn3vrdbdpc= X-MC-Unique: 5-DeuH7HM8C5ue-Os5uRNA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 21/31] src: remote: Makefile: drop CFLAGS and LDFLAGS duplication Date: Thu, 2 Jul 2020 14:25:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/remote/Makefile.inc.am | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 8a40c96563c..893d6894e2f 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -35,16 +35,13 @@ REMOTE_DAEMON_SOURCES =3D \ $(NULL) =20 REMOTE_DAEMON_CFLAGS =3D \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(AM_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(XDR_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ @@ -54,11 +51,9 @@ REMOTE_DAEMON_CFLAGS =3D \ $(NULL) =20 REMOTE_DAEMON_LD_FLAGS =3D \ - $(RELRO_LDFLAGS) \ + $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) =20 REMOTE_DAEMON_LD_ADD =3D \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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-delivery-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=1593692986; cv=none; d=zohomail.com; s=zohoarc; b=Q5icSNgem5q5d+qxnD23vCwZFjbXZrRibKE8c8lJ9JE6Pj4dbouCSzJsHcjJyV6U7zs5DGAx7W4x5Tck4sdEWGJH28LPqc2Fm8ufQgX5fG5H1p8OUutuM+slYrpiTg4U8D25dsa81D+BldYGmAfiw3lSOt9Z9FlVbG6Kkk5vfH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692986; 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=riNrA4kvJDHmiDmKg05uidTLV/9Nb4xDXX1ToZywlKo=; b=IsQsVzNH3Mb5YF7MYo/2jXm+3LFPSETNldDNK45WHwqkLWB5RNTmUMdbP2Q3YiRV0fqU0zOwia3PlRXDRzi6fqmP8IqtQhvXiZf0SD5BsBbc96m5oIvAtRGi83mcdqO0YnkwlVO6VglYdV4FthtwSqQv2hOQVGUbXjAIWNhsWFs= 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593692986202578.9853749694446; Thu, 2 Jul 2020 05:29:46 -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-75-ie6WuvYaOIesmINNnrzYDg-1; Thu, 02 Jul 2020 08:29:43 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 817F787951A; Thu, 2 Jul 2020 12:29:34 +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 600002B4DD; Thu, 2 Jul 2020 12:29:34 +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 2CDC0180530B; Thu, 2 Jul 2020 12:29:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPwRU020419 for ; Thu, 2 Jul 2020 08:25:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id E169073FC5; Thu, 2 Jul 2020 12:25:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CC9473FD3 for ; Thu, 2 Jul 2020 12:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692985; 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=riNrA4kvJDHmiDmKg05uidTLV/9Nb4xDXX1ToZywlKo=; b=QhI6FQTmym37YDOfT6LadMyYkF+QM96DTlQcJORr38twpcA5KixAdULcvuoQvr6OK0BGv6 5BC90S7HuXI5GuAq4hYuSsEcOaXwIkaRV5JTSzLvio04E7Ae5z0u6zzCxG5PBr/TlzgnER DAwfMkriTaC1W6uimVpMaxEDs2agXkY= X-MC-Unique: ie6WuvYaOIesmINNnrzYDg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 22/31] src: logging: Makefile: drop undefined LOG_DRIVER Date: Thu, 2 Jul 2020 14:25:20 +0200 Message-Id: <3cd553a85d4924218fb2fb4ee630fc15c3aac7ff.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <0985a9597bb0348d46c0d18dc548a676bf0ad8e2> added unused variable so remove it. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/logging/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 4be33765e9e..873e6029dd5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -30,7 +30,6 @@ LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x EXTRA_DIST +=3D \ $(LOG_PROTOCOL) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693011; cv=none; d=zohomail.com; s=zohoarc; b=T0CG8HchiGo0VQ3z/5dV40QRoX1cHjlijUbZFElyjmbc6X3dtgFb8Y6v2D9izckdNVQjIowGlaXL3Joxy3KQfsPzAJvHOfeHRypnJI5XjoL24/N+/IxJyjBBL8QDhc49TuD6hQJcPF6vuqOaedR3/oBtvAF0C1P3rARnWCnr7Aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693011; 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=EFr8ov5H7fNzUYeq4hVKgK/BRlgYpwcI5TKL/hqVPS8=; b=Kn5qDvqvKgqyToEgNwuEUsEKWWSJSaHhTWVzXPMFZp993/F/BjdkH2mGOyZVDMWGNC3CfqYicV/IFuX4GJVd/TZO5RYF9glQ5YXiPUikx14rpvgrCUH7SbCfxbbY5eWMY6fwzM0i82ByjYQS+DSkcaV9/Yltz8guBkL6hyalcZc= 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 1593693011472510.901041755842; Thu, 2 Jul 2020 05:30:11 -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-38-TZ2Y7NowNpuyVaMHA_Y88Q-1; Thu, 02 Jul 2020 08:29:55 -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 A538C8031F6; Thu, 2 Jul 2020 12:29:48 +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 857F179221; Thu, 2 Jul 2020 12:29:48 +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 559B31804749; Thu, 2 Jul 2020 12:29:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CPxlZ020432 for ; Thu, 2 Jul 2020 08:25:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id C7C9173FC7; Thu, 2 Jul 2020 12:25:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 436F473FC5 for ; Thu, 2 Jul 2020 12:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693009; 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=EFr8ov5H7fNzUYeq4hVKgK/BRlgYpwcI5TKL/hqVPS8=; b=Ds+nxUv2O6sk5Fh70DVy5rPqJWRD8rYcR3sAaX1Xu1ezAOBRCnRgFYGGmiwRfquFZHkWAO TrjxhsOwighWoYNcjpyQtSQVM7XMBlyxqL2DVq3mVFVtv23qxroLtGZbnCvElfH6VqH7KU KfFHgWI22BF7cv6Ajccc6Gg4uVNIVC4= X-MC-Unique: TZ2Y7NowNpuyVaMHA_Y88Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 23/31] src: util: rename some program macros Date: Thu, 2 Jul 2020 14:25:21 +0200 Message-Id: <90ad4b41820c95f96eb3bc2ec22aa5f2b30d1226.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Fixes inconsistency with macro names for external programs. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-external-programs.m4 | 8 ++++---- src/util/virnetdevmidonet.c | 4 ++-- src/util/virnetdevopenvswitch.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index bd3cb1f7576..d905beed71d 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -61,8 +61,8 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ AC_PATH_PROG([UDEVADM], [udevadm], [udevadm], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([MM_CTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([OVS_VSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([SCRUB], [scrub], [scrub], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([ADDR2LINE], [addr2line], [addr2line], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MDEVCTL], [mdevctl], [mdevctl], [$LIBVIRT_SBIN_PATH]) @@ -75,9 +75,9 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC], ["$TC"], [Location or name of the tc program (see iproute2)]) - AC_DEFINE_UNQUOTED([MMCTL], ["$MMCTL"], + AC_DEFINE_UNQUOTED([MM_CTL], ["$MM_CTL"], [Location or name of the mm-ctl program]) - AC_DEFINE_UNQUOTED([OVSVSCTL], ["$OVSVSCTL"], + AC_DEFINE_UNQUOTED([OVS_VSCTL], ["$OVS_VSCTL"], [Location or name of the ovs-vsctl program]) AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 354350ce1b7..be1b6e8a457 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -45,7 +45,7 @@ virNetDevMidonetBindPort(const char *ifname, =20 virUUIDFormat(virtualport->interfaceID, virtportuuid); =20 - cmd =3D virCommandNew(MMCTL); + cmd =3D virCommandNew(MM_CTL); =20 virCommandAddArgList(cmd, "--bind-port", virtportuuid, ifname, NULL); =20 @@ -79,7 +79,7 @@ virNetDevMidonetUnbindPort(const virNetDevVPortProfile *v= irtualport) =20 virUUIDFormat(virtualport->interfaceID, virtportuuid); =20 - cmd =3D virCommandNew(MMCTL); + cmd =3D virCommandNew(MM_CTL); virCommandAddArgList(cmd, "--unbind-port", virtportuuid, NULL); =20 if (virCommandRun(cmd, NULL) < 0) { diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index dbb489d174d..89e55650083 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,7 +151,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, con= st char *ifname, ovsport->profileID); } =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); @@ -199,7 +199,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname G= _GNUC_UNUSED, const char { g_autoptr(virCommand) cmd =3D NULL; =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NUL= L); =20 @@ -226,7 +226,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, = const char *ifname) size_t len; g_autoptr(virCommand) cmd =3D NULL; =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); @@ -267,7 +267,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, c= onst char *ifname) return 0; } =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=3D%s", migrate); @@ -373,7 +373,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, g_autoptr(virCommand) cmd =3D NULL; g_autofree char *output =3D NULL; =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "--format=3Dlist", "--data=3D= json", "--no-headings", "--columns=3Dstatistics", "list", @@ -439,7 +439,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifna= me, char **master) =20 *master =3D NULL; =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "iface-to-br", ifname, NULL); virCommandSetOutputBuffer(cmd, master); @@ -498,7 +498,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, return 0; =20 tmpIfname++; - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "get", "Interface", tmpIfname, "name", NULL); if (virCommandRun(cmd, &status) < 0 || @@ -525,7 +525,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, { g_autoptr(virCommand) cmd =3D NULL; =20 - cmd =3D virCommandNew(OVSVSCTL); + cmd =3D virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "clear", "Port", ifname, "ta= g", --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1593693088; cv=none; d=zohomail.com; s=zohoarc; b=QG7BqdtERx5HEMsAjahmUvktjyLvjEt2/sWs1tWuYB1WSd/RKsO70fmorJc9egeIH+yBLaDzbV04rDmpRprF1uuRmOnRLzz2X/iG/PN34V3RFo6yPQZx/aKMq+u0KBXFm184Po5f3bnuJiCd3ks3B9Fg2+4X7PMlK8lGbn38ZsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693088; 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=ZWWGadRYOO6mKad8T1ZoDMRJEwDjibPWfIw+sacLubs=; b=WJv6pJJ4fIvHMHwjx0cuv5eZWjAGaOsGD9wa4ms3aO3G0Fg7v7J24lzF2Ws+u9kfjbKo7a/NbnsQDCJkJjTZ5iff/gQLyg1yNpsSU+2uv/QxyKP4ubm5eXkn4K6dvLMIxH+zGkV9vHFBmSkBS9JPDGEqZwb2MHfEdLteARQXzbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1593693088970891.1727305018647; Thu, 2 Jul 2020 05:31:28 -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-63-93h6QYKeOIGZ2W06x4uvKA-1; Thu, 02 Jul 2020 08:29:58 -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 EABE01054F93; Thu, 2 Jul 2020 12:29:50 +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 CC7CF741B9; Thu, 2 Jul 2020 12:29:50 +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 9E2766C9DA; Thu, 2 Jul 2020 12:29:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ0O3020445 for ; Thu, 2 Jul 2020 08:26:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE0E173FC7; Thu, 2 Jul 2020 12:26:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 298F873FC5 for ; Thu, 2 Jul 2020 12:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693086; 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=ZWWGadRYOO6mKad8T1ZoDMRJEwDjibPWfIw+sacLubs=; b=LCyvhydT6wXKLgq1LUJRh8Ghe0U2ZuNw2GCtS3BLdQy2n3eEq4tQ8wcCi6TEML8ujt9HZF GHJ+OoxOgvW4Nie2F1p6pH/bxicGajiLCClhQJL8y+yS+c05K6Dl8Jf/MFfGSNQNdv1EBO SdcDAMsfpux89T+lXADpdOm567qqF3s= X-MC-Unique: 93h6QYKeOIGZ2W06x4uvKA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 24/31] src: util: Makefile: drop undefined LDEXP_LIBM Date: Thu, 2 Jul 2020 14:25:22 +0200 Message-Id: <5c059d6700717b92d8b0bd3ccdc5b4958ec144b0.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It was introduced by commit as a gnulib ldexp module and later removed by commit <09fe607b4de8eb883c966e90aaf5563299a22738>. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 6d732518f40..5203fa28d48 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -275,7 +275,6 @@ libvirt_util_la_CFLAGS =3D \ $(AUDIT_CFLAGS) \ $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) \ - $(LDEXP_LIBM) \ $(NUMACTL_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(ACL_CFLAGS) \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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-delivery-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=1593692985; cv=none; d=zohomail.com; s=zohoarc; b=bMFr2HQlYGL3cIGmzSoQSrszGuQOG1l65xZuF/urf5b595ePPRB8UNp34s9YUCrs1KQz6/W9f7ymzUs+i/rJaEm7r7gLz5W1BxqCSibfskNPkma98eyXowYa7SyzKQPQjDg0epi4YUv6bf5SKoIsGj+QtvTfexmmQPlrzF/CFxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593692985; 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=LCuR1Ch6bJripxBS3Gscfn/77uHNn0uMi6ZgZWRmF7U=; b=iAnxTC7H3/OkNs+rfTAWK/mWeIRLtmt0pVXCQ5/Iihjj04N0F46f5d7FpCo4RXM/2Ccw1WpfLygAuryE8LKwTG0Odby5ltdOqlLoFdrX01NERR48M3rh2cjX1mPUJw+Uq0qzaZ2zoUftcR8IQkVJctnPfePdKfMvFPzw6/HvAIo= 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593692985898720.6209100096896; Thu, 2 Jul 2020 05:29:45 -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-361-pzcBzdPvMvG6vN2p2VZhcw-1; Thu, 02 Jul 2020 08:29:42 -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 37E26107ACF7; Thu, 2 Jul 2020 12:29:37 +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 16ACF79221; Thu, 2 Jul 2020 12:29:37 +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 DCF766C9CC; Thu, 2 Jul 2020 12:29:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ1ED020450 for ; Thu, 2 Jul 2020 08:26:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 947D673FC7; Thu, 2 Jul 2020 12:26:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FFB673FC5 for ; Thu, 2 Jul 2020 12:26:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593692984; 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=LCuR1Ch6bJripxBS3Gscfn/77uHNn0uMi6ZgZWRmF7U=; b=g6iCunjm94oZr3g+ExdNrLGbrfCoRuvPYoCU+LbSsblpNpNEpfE4G/rX8R1skBjh+sjv7V nyPLx7EIOsBFa74M4BYE/5qOKZhPzOZCwD2Pa76R/Dp7IoiwbTiFZZflKk7REgWyNVKm6U UDXJ5TwIqm3fkC93dNRqBkZ0YtyNWls= X-MC-Unique: pzcBzdPvMvG6vN2p2VZhcw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 25/31] src: util: Makefile: drop undefined OPENPTY_LIBS Date: Thu, 2 Jul 2020 14:25:23 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit added check for openpty function from util library using AC_CHECK_LIB(). However, that macro doesn't define OPENPTY_LIBS, it only defines WITH_LIBUTIL and prepends -lutil into LIBS for the whole project. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 5203fa28d48..eca7e7e0a1e 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -281,7 +281,6 @@ libvirt_util_la_CFLAGS =3D \ $(NULL) libvirt_util_la_LIBADD =3D \ -lm \ - $(OPENPTY_LIBS) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(LIBNL_LIBS) \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1593693081; cv=none; d=zohomail.com; s=zohoarc; b=j/0kXM2CbHE5MC1V+qoTZzrHar1pZs5rPPjRUY57L15bxaAhTGa19Kg0tcm9nbfvDuJn6JP9rdiRtzqRtaRwbVvUBdxUXlPLZ9wKIOJRoCbXsUsEcQKxIaK690qzC1yMrbSjz+vh1QrMBYvX98cJob3sQRKMfi/f3xN5OwOilmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693081; 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=5Pk49DGD3mDA01RWBy+c1aOw85BsjDFzX/usG9gUOuY=; b=NdOAVqlqlcJwXRBO8+jUI/bRwwXEf4/p+d8Z4yUaXoDdLa21+SmH2TKrRIb847npn75OTp/1RKq8P16Z4yO47jsSYG5kqQjLyu+NlnB5uv34/v2qcKb8Egw6T3IFbiyxtcbsvFhNcSHv8gI1r9Gfjnh52l4qjJFPkqnYV+PFjgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1593693081628208.0219334222611; Thu, 2 Jul 2020 05:31:21 -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-406-f7JxJQYXOlC_-Ei1le0Pmw-1; Thu, 02 Jul 2020 08:30:09 -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 AD6081054F99; Thu, 2 Jul 2020 12:30:02 +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 8B17918772; Thu, 2 Jul 2020 12:30:02 +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 58DB76C9EE; Thu, 2 Jul 2020 12:30:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ2U7020456 for ; Thu, 2 Jul 2020 08:26:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A69F73FC7; Thu, 2 Jul 2020 12:26:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA4CD73FC5 for ; Thu, 2 Jul 2020 12:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693080; 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=5Pk49DGD3mDA01RWBy+c1aOw85BsjDFzX/usG9gUOuY=; b=Fdx1kf9PbZv1GyhH+irLO6mp8NB9v8vCP1T6/tM7xiXDT9DuX2LarwnIfeIunbM3Fm7fYN OKwFXvWiro1BICOSDWflS349b469hlebRdci7S5AKJFcHA9pqTqtoyRpARGKrINzj9kK8i fSF+5Yhh9MS2ZU35Ov3UotQId4lcZfY= X-MC-Unique: f7JxJQYXOlC_-Ei1le0Pmw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 26/31] src: remote: Makefile: properly format sysconfdir in virtproxyd.conf Date: Thu, 2 Jul 2020 14:25:24 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <5b816e16968ba02def56f067774ecd9a8c8d44d7> removed hard-coded sysconfdir path from *.conf files but missed virtproxyd. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/remote/Makefile.inc.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 893d6894e2f..80f4aad7828 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -276,6 +276,7 @@ remote/virtproxyd.conf: remote/libvirtd.conf.in $(AM_V_GEN)sed \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]runstatedir[@]|@runstatedir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ $< > $@ @@ -301,6 +302,7 @@ remote/virtproxyd.aug: remote/libvirtd.aug.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ $< > $@ @@ -325,6 +327,7 @@ remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in= \ $(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]runstatedir[@]|@runstatedir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693130; cv=none; d=zohomail.com; s=zohoarc; b=ZdBlcLjhjIf0ObcJtmxbZv168LUIIQPkQMATvRoR7SDQClBl8NCTKqtbKkjWWzzF2H8F97zCh0JKXFPkzTzvhwv1Mx1aQNI9b9GEv++n8oJxwVgfKBfYJRLDGi7hDnoGlts413KFPp9Z7JG3/Jc9dvV5ipkC2C8kKXH8bY0PtV0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693130; 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=B4P1BZsrXfjRPQhjjGCO7lMjLNXUctUPyKaIuIUmrQI=; b=aYK5K1912NYROH1nlHIaz88lCp81Bp0/VLSs63YN6z4MwCOfjo6GLgQa2RaCUi9K7nsc13OzynXEzmYdGQoz56pJ22tG4p0JSblSQj/ch7qoY4h7wQGtKWgGOcSvmA+7xYLwngYlgNTtpQmSEbHtHocSFy68CluHzpD7l1dWFn4= 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 159369313036424.00991868764868; Thu, 2 Jul 2020 05:32:10 -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-431-2pG7bKEJMROOKbS8jKZDbQ-1; Thu, 02 Jul 2020 08:30:01 -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 41715100AA22; Thu, 2 Jul 2020 12:29:53 +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 23AFC5C1D0; Thu, 2 Jul 2020 12:29:53 +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 E6F386C9E4; Thu, 2 Jul 2020 12:29:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ3ES020479 for ; Thu, 2 Jul 2020 08:26:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 611A173FC7; Thu, 2 Jul 2020 12:26:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id D119F73FC5 for ; Thu, 2 Jul 2020 12:26:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693129; 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=B4P1BZsrXfjRPQhjjGCO7lMjLNXUctUPyKaIuIUmrQI=; b=QxmR4Vt/x4SG4LVM2gq4Pz4ZNwx8b4tMsg9tYNAbT7tpO8RJzGu2YJOj4v2uA4kjq7woaS QlSVacCMK+NfAqqkhzCSSMYB+h35wjKCy+Oj8zeBUJMtcSK5gNuWkW+DdjuCUKKqtQb+VQ VDkGqxwBV711fYoz5J/OyfpCjkpRWzo= X-MC-Unique: 2pG7bKEJMROOKbS8jKZDbQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 27/31] src: unify virFileActivateDirOverride() Date: Thu, 2 Jul 2020 14:25:25 +0200 Message-Id: <662dafd097d1e9a1ffff08f4b7f0451724ea0b83.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We have two functions to set that we want to override directory where to look for libvirt files, one checks the binary name and the other one checks env variable. This patch removes the binary name check to simplify code by using only the env variable. This change will be required for Meson introduction where the binary name doesn't have any prefix by default. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libvirt.c | 2 +- src/libvirt_private.syms | 3 +-- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/qemu/qemu_shim.c | 2 +- src/remote/remote_daemon.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/virfile.c | 25 +------------------------ src/util/virfile.h | 4 +--- tests/Makefile.am | 1 + tests/qemucapsprobe.c | 2 +- tests/testutils.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- 14 files changed, 14 insertions(+), 39 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index b2d0ba3d232..e3d68dc81d5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -221,7 +221,7 @@ virGlobalInit(void) if (virErrorInitialize() < 0) goto error; =20 - virFileActivateDirOverrideForLib(); + virFileActivateDirOverride(); =20 if (getuid() !=3D geteuid() || getgid() !=3D getegid()) { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ae0e253ab9f..f2808945c21 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2041,8 +2041,7 @@ virDirOpenQuiet; virDirRead; virFileAbsPath; virFileAccessibleAs; -virFileActivateDirOverrideForLib; -virFileActivateDirOverrideForProg; +virFileActivateDirOverride; virFileBindMountDevice; virFileBuildPath; virFileCanonicalizePath; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index b0cd89375be..7dc1fcb28f2 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -954,7 +954,7 @@ int main(int argc, char **argv) { } } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (!(config =3D virLockDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 028f771f149..8e92543a3a1 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -733,7 +733,7 @@ int main(int argc, char **argv) { } } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (!(config =3D virLogDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7e87b8fb962..1e4e2b22ee4 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -167,7 +167,7 @@ int main(int argc, char **argv) } } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (verbose) g_printerr("%s: %lld: preparing event loop thread\n", diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 1aa9bfc0d2f..901af6e934e 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -808,7 +808,7 @@ int main(int argc, char **argv) { =20 virUpdateSelfLastChanged(argv[0]); =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 while (1) { int optidx =3D 0; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 08eb162b8cd..82d27efa7b3 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1459,7 +1459,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 /* Initialize the log system */ virLogSetFromEnv(); diff --git a/src/util/virfile.c b/src/util/virfile.c index c034df5931e..9e8dee4cb0f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1777,29 +1777,6 @@ virFileFindResource(const char *filename, } =20 =20 -/** - * virFileActivateDirOverrideForProg: - * @argv0: argv[0] of the calling program - * - * Look at @argv0 and try to detect if running from - * a build directory, by looking for a 'lt-' prefix - * on the binary name, or '/.libs/' in the path - */ -void -virFileActivateDirOverrideForProg(const char *argv0) -{ - char *file =3D strrchr(argv0, '/'); - if (!file || file[1] =3D=3D '\0') - return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { - useDirOverride =3D true; - VIR_DEBUG("Activating build dir override for %s", argv0); - } -} - - /** * virFileActivateDirOverrideForLib: * @@ -1807,7 +1784,7 @@ virFileActivateDirOverrideForProg(const char *argv0) * the build/src tree instead of install tree. */ void -virFileActivateDirOverrideForLib(void) +virFileActivateDirOverride(void) { if (getenv("LIBVIRT_DIR_OVERRIDE") !=3D NULL) useDirOverride =3D true; diff --git a/src/util/virfile.h b/src/util/virfile.h index 7a92364a5c9..fc0f6360506 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -190,9 +190,7 @@ char *virFileFindResourceFull(const char *filename, const char *installdir, const char *envname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); -void virFileActivateDirOverrideForProg(const char *argv0) - ATTRIBUTE_NONNULL(1); -void virFileActivateDirOverrideForLib(void); +void virFileActivateDirOverride(void); =20 off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); diff --git a/tests/Makefile.am b/tests/Makefile.am index c87b12d28c3..f237c134213 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -484,6 +484,7 @@ TESTS_ENVIRONMENT =3D \ abs_builddir=3D"$(abs_builddir)" \ abs_srcdir=3D"$(abs_srcdir)" \ LIBVIRT_AUTOSTART=3D0 \ + LIBVIRT_DIR_OVERRIDE=3D1 \ LC_ALL=3DC \ VIR_TEST_EXPENSIVE=3D$(VIR_TEST_EXPENSIVE) \ $(VG) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 26ea9ff5ed1..f18b7792b02 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -55,7 +55,7 @@ main(int argc, char **argv) =20 VIR_TEST_PRELOAD(mock); =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (argc !=3D 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/testutils.c b/tests/testutils.c index 7f1776b2449..191917b01f0 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -794,7 +794,7 @@ int virTestMain(int argc, =20 g_setenv("VIR_TEST_MOCK_PROGNAME", progname, TRUE); =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (virTestSetEnvPath() < 0) return EXIT_AM_HARDFAIL; diff --git a/tools/virsh.c b/tools/virsh.c index 197a90636d3..4f5e6ed65ef 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -887,7 +887,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index fef0332a0d3..fdb0a130523 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1573,7 +1573,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } =20 - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); =20 if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693070; cv=none; d=zohomail.com; s=zohoarc; b=VIiBCpAtuRIRepwMPcFplnvVVwKpjmA3XuQVOEj8yTUoHpAQ8wkTz7ZU7xTYXj3agvghSJyO3OdJOa749VQWEhBlAsC7apaAGQ4jKDrcFzZOarJSsgKDNtWi1n0VI7/5A37+dUkGfLGlQ/nMCFvduRQ9611PjNSlh8fFNfOje+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693070; 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=fHZrfbX0F4WPx+d+LdcfqjBWQ+87k5kVV+VChpe0LlM=; b=ZJr6annYiqAXw90WzXBDSuy10U7OEs7S6YOtT8vHJlvL1i7I3fnhblONmcJgYXt6z83VwiBskE4G08Yv+FNHgXZ+3/ciCjIxcI2Nexl3pcEQ76IiQ3on1XdSooHDLvSN/2KEA9WMYPg4DabwTWwxvBGaevgytF+MS1braXqaqxM= 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 1593693070052838.961825213504; Thu, 2 Jul 2020 05:31:10 -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-336-_cSjmh1MPzeF4ReOwFZ6jg-1; Thu, 02 Jul 2020 08:30:05 -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 7E855108BD0E; Thu, 2 Jul 2020 12:29:55 +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 5E8F67922A; Thu, 2 Jul 2020 12:29:55 +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 312836C9E8; Thu, 2 Jul 2020 12:29:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ4Q7020489 for ; Thu, 2 Jul 2020 08:26:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 482BA73FC7; Thu, 2 Jul 2020 12:26:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7B7F73FC5 for ; Thu, 2 Jul 2020 12:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693068; 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=fHZrfbX0F4WPx+d+LdcfqjBWQ+87k5kVV+VChpe0LlM=; b=K0116RWIrOj1SzYy9MCr3+WIX9K0LJZTXn4LBnCtpFmRl5R3Ap/V276w88MTR6S8cXKuDp bI1sILavLDOvnMImKhxld6zuRtEufeywQtwy2kBs571Cl2ONnKYFuMRgOQ1MEQDQtytD/d fJwH0jDikzteM3fDPgI4k7HB9bmTLnQ= X-MC-Unique: _cSjmh1MPzeF4ReOwFZ6jg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 28/31] tests: commandhelper: change how we detect if running as daemon Date: Thu, 2 Jul 2020 14:25:26 +0200 Message-Id: <0f32a10b227d252245a05a1d1c00b24f1d877bd4.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The old code works correctly with make and running directly from shell but it failed with Meson test suite where session ID and process group are the same in both cases. What changes in both cases is parent process ID so use that instead of session ID. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/commandhelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 3f040be8f22..4266e11902f 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -126,7 +126,7 @@ int main(int argc, char **argv) { fprintf(log, "FD:%zu\n", i); } =20 - fprintf(log, "DAEMON:%s\n", getpgrp() =3D=3D getsid(0) ? "yes" : "no"); + fprintf(log, "DAEMON:%s\n", getpgrp() !=3D getppid() ? "yes" : "no"); if (!(cwd =3D getcwd(NULL, 0))) goto cleanup; if (strlen(cwd) > strlen(".../commanddata") && --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693018; cv=none; d=zohomail.com; s=zohoarc; b=TJunbSxYpdvc7McJqRD0R19nWtUI4Vb9ubxUN47zltHVcw5+eIb30AQ+Z0wlwO6jTXD6U8VJlFEFlBwrL/EdLqHDWKWnRnlne6vpIU3Y18yo62EWnDTw3aAVjTcqRHXigxUDiKaZrEu4IoRv0f2nyj7hTA2eIlCOyhT91UN0dWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693018; 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=z1ccO/Q/uD0Xb1DVDre0D+vVfXSACFC54VlMfWqgYOA=; b=JrCGq8tChuvMyLRqpgI1p9xv8Ho13DtUMoG3e49boUxTZ5wu6o21YzZOcpv3Yup5RXdB8qxr/awV2p66fVR8PbNpgS4PdJ+RkVy/+Lq+ygBdX1IQQEykuqmpdwk7w+eZNGtTV52wjU3ZA1WU9V/LX8c87s2fLncL8Oro6nEZSBE= 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 1593693017374137.75027054715758; Thu, 2 Jul 2020 05:30:17 -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-277-Uk45vMQbMPGQxwRfWh3ilQ-1; Thu, 02 Jul 2020 08:30:11 -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 2F6A88015FD; Thu, 2 Jul 2020 12:30:05 +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 11E9218217; Thu, 2 Jul 2020 12:30:05 +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 D08161804771; Thu, 2 Jul 2020 12:30:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ5EO020498 for ; Thu, 2 Jul 2020 08:26:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E5AA73FC7; Thu, 2 Jul 2020 12:26:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E20A73FC5 for ; Thu, 2 Jul 2020 12:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693014; 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=z1ccO/Q/uD0Xb1DVDre0D+vVfXSACFC54VlMfWqgYOA=; b=O+YqvB1nTqOR0EQVo1tf4wYk6a8W/eHCqrmrxdueOZETtrqlUA6s3VN7qUZZEwlQw8c0lu WPMekvYI42AkzZbpF9PEVQLypek8Tw2hEfJQlafbhNPw3e0GdO31v7xnM9oDQZQ2ZTF9k1 j9fFIvvgYL/4VpxO5fn8fEqVx7J+7zY= X-MC-Unique: Uk45vMQbMPGQxwRfWh3ilQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 29/31] tests: use WITH_NSS instead of NSS Date: Thu, 2 Jul 2020 14:25:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- m4/virt-nss.m4 | 2 +- tests/nssmock.c | 2 +- tests/nsstest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index 951a74e835b..b519c36e859 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -58,7 +58,7 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[ fi =20 if test "x$with_nss_plugin" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled]) + AC_DEFINE_UNQUOTED([WITH_NSS], 1, [whether nss plugin is enabled]) =20 AC_CHECK_TYPE([struct gaih_addrtuple], [AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1], diff --git a/tests/nssmock.c b/tests/nssmock.c index 62e8fa372a2..b1c1aba957a 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -18,7 +18,7 @@ =20 #include =20 -#ifdef NSS +#ifdef WITH_NSS # include "virmock.h" # include # include diff --git a/tests/nsstest.c b/tests/nsstest.c index 514b4f7195d..135f6b6c939 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -20,7 +20,7 @@ =20 #include "testutils.h" =20 -#ifdef NSS +#ifdef WITH_NSS =20 # include "libvirt_nss.h" # include "virsocket.h" --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693065; cv=none; d=zohomail.com; s=zohoarc; b=JlFwZYtubRPQKWDh2DFR2eTyOKwbTZr8gFxoJrc1Ko6vJ+DG8SEPEAEn9td7HBpxEDzymXdqYu3WVSZUC7qmU2RGswd/FtWaaXsbPZTlb/KO8hDh/w/SQOiyXLANSIeiIUbEC/Su2cYNYSLJtEDfj3s8wYaoiFHGMLH4oXDbpAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693065; 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=YGPq67rSXEnW/ID4v+jWMshWm58cOtjs532KRgWgNv4=; b=ZgQxcsJbG+oOVg2wy6B0bMal2/eVyo17RSGuT/OWG0wxSWTyrCcH5xWMgOGtq5nsOlhJanZtOMmSb+zx8HRHSngCMSA+TMyvowivrrsq5TZjGeSpY+QRLj7q2JpcRBduGuNb0FZzp6qQZ2EIkf395s33Zn0sbuw0riZPDLwamCQ= 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 1593693065295852.834865116922; Thu, 2 Jul 2020 05:31:05 -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-3-rLFH0z06NQS07CuzOR5ioA-1; Thu, 02 Jul 2020 08:30:06 -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 B21ABEC1A1; Thu, 2 Jul 2020 12:29:58 +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 9088B79229; Thu, 2 Jul 2020 12:29:58 +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 5F6F21804769; Thu, 2 Jul 2020 12:29:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ6h2020503 for ; Thu, 2 Jul 2020 08:26:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1481273FC7; Thu, 2 Jul 2020 12:26:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8452873FC5 for ; Thu, 2 Jul 2020 12:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693062; 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=YGPq67rSXEnW/ID4v+jWMshWm58cOtjs532KRgWgNv4=; b=R107Y3sL9+9xPt+701GY//9sAUvCUm99/hq4dcnyviQZ1EahCMm1iZxubKn39KtRxGCDSe 3tPhub5iz2jeeeAcLxI3R0fGF0pizTGMqBbEvTOJJTTBSrn0GqqoWIHKWznDl2SiLhO1uu 38wYH0qOTkR0+EoLXfiq9j8NBr4jBS4= X-MC-Unique: rLFH0z06NQS07CuzOR5ioA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 30/31] tools: virsh-secret: fix compilation error Date: Thu, 2 Jul 2020 14:25:28 +0200 Message-Id: <843b5af3db8f08c0154dcdcd66945446225ed88c.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) ../tools/virsh-secret.c: In function =E2=80=98cmdSecretSetValue=E2=80=99: ../tools/virsh-secret.c:262:15: error: pointer targets in assignment from = =E2=80=98char *=E2=80=99 to =E2=80=98unsigned char *=E2=80=99 differ in sig= nedness [-Werror=3Dpointer-sign] 262 | value =3D g_steal_pointer(&file_buf); | ^ cc1: all warnings being treated as errors Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tools/virsh-secret.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index be4adc416ec..92801361477 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -259,7 +259,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) } =20 if (plain) { - value =3D g_steal_pointer(&file_buf); + value =3D (unsigned char *) g_steal_pointer(&file_buf); value_size =3D file_len; file_len =3D 0; } else { --=20 2.26.2 From nobody Mon Apr 29 03:21:23 2024 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=1593693082; cv=none; d=zohomail.com; s=zohoarc; b=Oi5jtjOIxwmb68TBf74yGhe6XFcPOz95Pgv9U3+xSFpNstrqXhIWGXrQm8qpZHeZeZe7XJ4NCo51PkSxLfDmOinWGsEUcoz9GnSCXueXyeNAGBmnFHLfqR/FvUIrsuAX48Sym2byhSH/hclzkabDRWztKdACowfQnE/FTPIYrx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593693082; 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=/Lfwx+LYvBJ5NGa7PZ5H/dRuOc8zXENMXpO9c7YC60o=; b=RkUQflnFQIs8ihmGqiTpWI/zRK6cAYIWKakUJzNvR+EmLAcl6LFknwcQPDFG9cr6qpRG9ZRReaDvJlIyhZ9JRft/cuAU7Dibo1qz/TO/G1yodIfXFzWwFhf19vKJR6TdPA0kGR6EPQEc5aLMPjv80++sV3yy9wjiTmed08KeCi4= 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 1593693082779434.94738848568704; Thu, 2 Jul 2020 05:31:22 -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-388-skr01IcDOFiTrKliDNIj5g-1; Thu, 02 Jul 2020 08:29:50 -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 198411005513; Thu, 2 Jul 2020 12:29:45 +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 EF9045C578; Thu, 2 Jul 2020 12:29:44 +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 78CFB1805319; Thu, 2 Jul 2020 12:29:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062CQ6Q6020518 for ; Thu, 2 Jul 2020 08:26:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id EEFDB73FC5; Thu, 2 Jul 2020 12:26:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A65973FD3 for ; Thu, 2 Jul 2020 12:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593693081; 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=/Lfwx+LYvBJ5NGa7PZ5H/dRuOc8zXENMXpO9c7YC60o=; b=MhU/Ee5KenqWWS1w0YuH3vlqUTGSbNdCJr+prDrZyxiDDXJVjwGtiIcrXHkAevcUh9U1B1 NvVFQpwCsIiToCahGfLqBzFgqjprZrg92NhDB7I42G6W84b5KUladuvJa1PnYv/g63MrxI uDbhEwoYYJgh0/B1Nm+Voa2Q2EyjymA= X-MC-Unique: skr01IcDOFiTrKliDNIj5g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 31/31] tools: wireshark: fix compilation errors Date: Thu, 2 Jul 2020 14:25:29 +0200 Message-Id: <4e37d0eae57eb43cbe5ac1be4c808c93f75df70e.1593692174.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" With meson introduction which is using the same CFLAGS for the whole project some compilation errors were discovered. Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- tools/wireshark/src/packet-libvirt.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index 20b7a3ec812..db8efe45a39 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -77,15 +77,15 @@ static gint ett_libvirt_stream_hole =3D -1; =20 XDR_PRIMITIVE_DISSECTOR(int, gint32, int) XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) -XDR_PRIMITIVE_DISSECTOR(short, gint16, int) +//XDR_PRIMITIVE_DISSECTOR(short, gint16, int) XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) XDR_PRIMITIVE_DISSECTOR(char, gchar, int) XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) XDR_PRIMITIVE_DISSECTOR(hyper, gint64, int64) XDR_PRIMITIVE_DISSECTOR(u_hyper, guint64, uint64) -XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) +//XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) -XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) +//XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) =20 typedef gboolean (*vir_xdr_dissector_t)(tvbuff_t *tvb, proto_tree *tree, X= DR *xdrs, int hf); =20 @@ -345,7 +345,9 @@ dissect_libvirt_num_of_fds(tvbuff_t *tvb, proto_tree *t= ree) } =20 static void -dissect_libvirt_fds(tvbuff_t *tvb, gint start, gint32 nfds) +dissect_libvirt_fds(tvbuff_t *tvb G_GNUC_UNUSED, + gint start G_GNUC_UNUSED, + gint32 nfds G_GNUC_UNUSED) { /* TODO: NOP for now */ } @@ -420,8 +422,13 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tre= e, return; /* No payload */ =20 if (status =3D=3D VIR_NET_OK) { - vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, get_= program_data(prog, VIR_PROGRAM_DISSECTORS), - *(gsize *)get_prog= ram_data(prog, VIR_PROGRAM_DISSECTORS_LEN)); + const vir_dissector_index_t *pds =3D get_program_data(prog, VIR_PR= OGRAM_DISSECTORS); + const gsize *len =3D get_program_data(prog, VIR_PROGRAM_DISSECTORS= _LEN); + + if (!len) + goto unknown; + + vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, pds,= *len); if (xd =3D=3D NULL) goto unknown; dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status= , xd); --=20 2.26.2