From patchwork Wed Aug 14 12:15:26 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: 11093821 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 7858B13B1 for ; Wed, 14 Aug 2019 12:18:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6596C28757 for ; Wed, 14 Aug 2019 12:18:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 597E428759; Wed, 14 Aug 2019 12:18:46 +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 E8A5128757 for ; Wed, 14 Aug 2019 12:18:45 +0000 (UTC) Received: from localhost ([::1]:60064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsEm-00024D-Tu for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Aug 2019 08:18:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42720) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC5-0000Gt-Vn for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC4-0001he-Kq for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36656) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsBz-0001eE-Pv; 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 7E5708EB34; Wed, 14 Aug 2019 12:15:48 +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 AEAE01B2F5; Wed, 14 Aug 2019 12:15:45 +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:26 +0200 Message-Id: <20190814121527.17876-4-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.26]); Wed, 14 Aug 2019 12:15:48 +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 3/4] configure: Improve checking libssh version is 0.8 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?= , 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 To figure out which libssh version is installed, checking for ssh_get_server_publickey() is not sufficient. ssh_get_server_publickey() has been introduced in libssh commit bbd052202 (predating 0.8) but distributions also backported other pre-0.8 patches, such libssh commit 963c46e4f which introduce the ssh_known_hosts_e enum. Check the enum is available to assume the version is 0.8. This fixes build failure on Ubuntu 18.04: CC block/ssh.o block/ssh.c: In function 'check_host_key_knownhosts': block/ssh.c:281:28: error: storage size of 'state' isn't known enum ssh_known_hosts_e state; ^~~~~ rules.mak:69: recipe for target 'block/ssh.o' failed make: *** [block/ssh.o] Error 1 Reported-by: 周文青 <1151451036@qq.com> Fixes: https://bugs.launchpad.net/qemu/+bug/1838763 Signed-off-by: Philippe Mathieu-Daudé --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index fe3fef9309..040aa8eb6c 100755 --- a/configure +++ b/configure @@ -3949,18 +3949,24 @@ fi if test "$libssh" = "yes"; then cat > $TMPC < +#ifdef HAVE_LIBSSH_0_8 +static const enum ssh_known_hosts_e val = SSH_KNOWN_HOSTS_OK; +#endif #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 + if compile_object "$libssh_cflags -DHAVE_LIBSSH_0_8"; 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 + if ! compile_object "$libssh_cflags"; then + error_exit "cannot use with libssh (is it broken?)" + fi fi ##########################################