From patchwork Wed Aug 14 12:15:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11093819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1A8A13AC for ; Wed, 14 Aug 2019 12:18:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE68528757 for ; Wed, 14 Aug 2019 12:18:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C269A28759; Wed, 14 Aug 2019 12:18:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6B69D28757 for ; Wed, 14 Aug 2019 12:18:37 +0000 (UTC) Received: from localhost ([::1]:60062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsEb-000208-33 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Aug 2019 08:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42702) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC5-0000Fd-3E for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC4-0001hH-1j for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsBz-0001dV-Oy; Wed, 14 Aug 2019 08:15:53 -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 mx1.redhat.com (Postfix) with ESMTPS id 10B0E31752A2; Wed, 14 Aug 2019 12:15:45 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-203.brq.redhat.com [10.40.204.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA5848309C; Wed, 14 Aug 2019 12:15:41 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Richard W . M . Jones" , qemu-devel@nongnu.org, Pino Toscano Date: Wed, 14 Aug 2019 14:15:25 +0200 Message-Id: <20190814121527.17876-3-philmd@redhat.com> In-Reply-To: <20190814121527.17876-1-philmd@redhat.com> References: <20190814121527.17876-1-philmd@redhat.com> MIME-Version: 1.0 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.49]); Wed, 14 Aug 2019 12:15:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] configure: Avoid using libssh deprecated API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , Andrea Bolognani , Max Reitz , =?utf-8?b?5ZGo5paH6Z2S?= <1151451036@qq.com>, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The libssh packaged by a distribution can predate version 0.8, but still provides the newer API introduced after version 0.7. Using the deprecated API leads to build failure, as on Ubuntu 18.04: CC block/ssh.o block/ssh.c: In function 'check_host_key_hash': block/ssh.c:444:5: error: 'ssh_get_publickey' is deprecated [-Werror=deprecated-declarations] r = ssh_get_publickey(s->session, &pubkey); ^ In file included from block/ssh.c:27:0: /usr/include/libssh/libssh.h:489:31: note: declared here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^~~~~~~~~~~~~~~~~ rules.mak:69: recipe for target 'block/ssh.o' failed make: *** [block/ssh.o] Error 1 Fix by using the newer API if available. Suggested-by: Andrea Bolognani Signed-off-by: Philippe Mathieu-Daudé --- block/ssh.c | 2 +- configure | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/block/ssh.c b/block/ssh.c index 501933b855..f5fea921c6 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -438,7 +438,7 @@ check_host_key_hash(BDRVSSHState *s, const char *hash, unsigned char *server_hash; size_t server_hash_len; -#ifdef HAVE_LIBSSH_0_8 +#ifdef HAVE_SSH_GET_SERVER_PUBLICKEY r = ssh_get_server_publickey(s->session, &pubkey); #else r = ssh_get_publickey(s->session, &pubkey); diff --git a/configure b/configure index 1d5c07de1f..fe3fef9309 100755 --- a/configure +++ b/configure @@ -3949,11 +3949,18 @@ fi if test "$libssh" = "yes"; then cat > $TMPC < +#ifdef HAVE_SSH_GET_SERVER_PUBLICKEY int main(void) { return ssh_get_server_publickey(NULL, NULL); } +#else +int main(void) { return ssh_get_publickey(NULL, NULL); } +#endif EOF if compile_object "$libssh_cflags"; then libssh_cflags="-DHAVE_LIBSSH_0_8 $libssh_cflags" fi + if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then + libssh_cflags="-DHAVE_SSH_GET_SERVER_PUBLICKEY $libssh_cflags" + fi fi ##########################################