From nobody Tue Apr 30 08:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515937625793203.23063833509036; Sun, 14 Jan 2018 05:47:05 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 9C12581E01; Sun, 14 Jan 2018 13:47:03 +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 0AD3860CA1; Sun, 14 Jan 2018 13:47:03 +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 5513E18033DA; Sun, 14 Jan 2018 13:46:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0EDkv86015407 for ; Sun, 14 Jan 2018 08:46:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3BE0C5C890; Sun, 14 Jan 2018 13:46:57 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-54.brq.redhat.com [10.40.204.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7449E5C88F; Sun, 14 Jan 2018 13:46:56 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Sun, 14 Jan 2018 14:46:43 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: abologna@redhat.com Subject: [libvirt] [PATCH 1/3] vsh: Mark cmdComplete arguments as unused 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 14 Jan 2018 13:47:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When building without readline, this function does nothing but return false. Without touching any of its arguments. Therefore, we have to mark them as unused even though they might be used when building with readline support. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- tools/vsh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 4426c08d6..88561ef61 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3500,7 +3500,8 @@ const vshCmdInfo info_complete[] =3D { }; =20 bool -cmdComplete(vshControl *ctl, const vshCmd *cmd) +cmdComplete(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED) { bool ret =3D false; #ifdef WITH_READLINE --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 08:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515937625728796.5285416602721; Sun, 14 Jan 2018 05:47:05 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 5D50481DFF; Sun, 14 Jan 2018 13:47:03 +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 29D0360C4A; Sun, 14 Jan 2018 13:47: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 D61E718033D9; Sun, 14 Jan 2018 13:46:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0EDkwSD015418 for ; Sun, 14 Jan 2018 08:46:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 601A95C899; Sun, 14 Jan 2018 13:46:58 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-54.brq.redhat.com [10.40.204.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9755B5C88F; Sun, 14 Jan 2018 13:46:57 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Sun, 14 Jan 2018 14:46:44 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: abologna@redhat.com Subject: [libvirt] [PATCH 2/3] tools: Always compile {virsh, virt-admin}-completer.c 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 14 Jan 2018 13:47:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The functions defined in these sources are referenced all over the place, however, compiler only when building with readline. Thus when building without it linker gets sad as it can't find them. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- tools/Makefile.am | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 48125f516..e9597cdb4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -216,6 +216,7 @@ virt_login_shell_CFLAGS =3D \ =20 virsh_SOURCES =3D \ virsh.c virsh.h \ + virsh-completer.c virsh-completer.h \ virsh-console.c virsh-console.h \ virsh-domain.c virsh-domain.h \ virsh-domain-monitor.c virsh-domain-monitor.h \ @@ -231,15 +232,6 @@ virsh_SOURCES =3D \ virsh-volume.c virsh-volume.h \ $(NULL) =20 -VIRSH_COMPLETER =3D \ - virsh-completer.c virsh-completer.h - -if WITH_READLINE -virsh_SOURCES +=3D $(VIRSH_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST +=3D $(VIRSH_COMPLETER) -endif ! WITH_READLINE - virsh_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ @@ -256,17 +248,9 @@ virsh_CFLAGS =3D \ =20 virt_admin_SOURCES =3D \ virt-admin.c virt-admin.h \ + virt-admin-completer.c virt-admin-completer.h \ $(NULL) =20 -VIRT_ADMIN_COMPLETER =3D \ - virt-admin-completer.c virt-admin-completer.h - -if WITH_READLINE -virt_admin_SOURCES +=3D $(VIRT_ADMIN_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST +=3D $(VIRT_ADMIN_COMPLETER) -endif ! WITH_READLINE - virt_admin_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 08:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515937654389467.17142136768086; Sun, 14 Jan 2018 05:47:34 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 7D41EC0587E0; Sun, 14 Jan 2018 13:47: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 29B285D75C; Sun, 14 Jan 2018 13:47: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 4876F18033DE; Sun, 14 Jan 2018 13:47:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0EDkxma015429 for ; Sun, 14 Jan 2018 08:46:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 83D0E5C899; Sun, 14 Jan 2018 13:46:59 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-54.brq.redhat.com [10.40.204.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC1FD5C88F; Sun, 14 Jan 2018 13:46:58 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Sun, 14 Jan 2018 14:46:45 +0100 Message-Id: <045bb9210b6779d101e3c52184350d813acf0f93.1515937364.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: abologna@redhat.com Subject: [libvirt] [PATCH 3/3] m4: Check for rl_completion_quote_character 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 14 Jan 2018 13:47:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Apparently we can't assume that people run readline recent enough to have rl_completion_quote_character (added in readline-5.0 released in 2011). However, we can't compile without it. So if not present, disable readline. Signed-off-by: Michal Privoznik --- Frankly, I hate this patch. How far into the past do we want to go when introducing something new? 10 years? 15? I've only written this patch because travis is unhappy without it (I'm looking at you Mac OS/X). m4/virt-readline.m4 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 index 9fba5148a..34b3ff3c4 100644 --- a/m4/virt-readline.m4 +++ b/m4/virt-readline.m4 @@ -38,6 +38,19 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[ LIBS=3D"$lv_saved_libs $extra_LIBS" fi =20 + AC_CHECK_DECLS([rl_completion_quote_character], + [], [], + [[#include + #include ]]) + + if test "$ac_cv_have_decl_rl_completion_quote_character" =3D "no" ; then + if test "$with_readline" =3D "yes" ; then + AC_MSG_ERROR([readline is missing rl_completion_quote_character]) + else + with_readline=3Dno; + fi + fi + # The normal library check... LIBVIRT_CHECK_LIB([READLINE], [readline], [readline], [readline/readline= .h]) =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list