From nobody Mon Feb 9 05:03:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565785147; cv=none; d=zoho.com; s=zohoarc; b=KXsmH+ko8QsSm/blGgQOqOOBs3EZZaeqrr0Iy5C9AHTN5RdaTC2j+7hyc9RtX/UdA8PxexNPI6xAizce6lNi7FR1qXBRv7db0jydHlcB7uSGIhyRQTGBWMawAlhAjT4GP/qtNju3QDSrCpB5D0f+wx5fpeYzxxLxvAijJ9BSdEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565785147; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=DARXn7D14G6hf1/uxqN4gnYjibC2PNJLpcfsqs2UVlA=; b=mnUapeEGcQoC6VFkd/0ozEuywM/52HozH6O3GaCibn1IciX4QudLwzxBvtI6rWY0Ymu0zSB58ZlcdCsSQfoomMF5sfGOrz9HeGoXkTlmaHggYxxQhrE8gv84bCkvNPhq38FfDsF3eMrBxpSFkCXHx94WDea8NOMW0K5OPQG7Xr0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565785147103889.8308329002352; Wed, 14 Aug 2019 05:19:07 -0700 (PDT) Received: from localhost ([::1]:60064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsF4-00024D-Eh for importer@patchew.org; Wed, 14 Aug 2019 08:19:02 -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=20Mathieu-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) Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , Max Reitz , =?UTF-8?q?=E5=91=A8=E6=96=87=E9=9D=92?= <1151451036@qq.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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: =E5=91=A8=E6=96=87=E9=9D=92 <1151451036@qq.com> Fixes: https://bugs.launchpad.net/qemu/+bug/1838763 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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" =3D "yes"; then cat > $TMPC < +#ifdef HAVE_LIBSSH_0_8 +static const enum ssh_known_hosts_e val =3D 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=3D"-DHAVE_LIBSSH_0_8 $libssh_cflags" fi if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then libssh_cflags=3D"-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 =20 ########################################## --=20 2.20.1