From nobody Sun Nov 16 05:42:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1598547717; cv=none; d=zohomail.com; s=zohoarc; b=MLCB/17+SndM/mKGn97XQCbWPfP1t2GwCLdODKEfC9UnxMqCc9CVwwM1LmtFcJ39Oiqdr9zgsnSio59JLOcSyjeqIKJ8wqm5dmIyfSI6avS3nVGmUfYDHHCThnmPIWUkix6QYe6Ml9Ha8LBe35N72VXs8CAI1bPgn4ULrfwlqE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547717; 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; bh=EnjvU88cAwFF+qc9CW8oMqgJGUmWasA62ifrpCJGzYE=; b=C58aGenFvg9BxplweM561TXTgRfDIhd3+LwsYY5l2clrN/yOZ37tEApbLEmn6Z9lZot5tH77A8LCilmYKl9kPFF4Rq2calTeUopXMMxmAx8DvdzV7dlEAzCB04fm4GLRxZCgYk5d8T5Pp3xtdumGvocX2+tKuJsIGgrxaK9IIzE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598547717443443.97586238961765; Thu, 27 Aug 2020 10:01:57 -0700 (PDT) Received: from localhost ([::1]:37504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLHf-0007bn-Sk for importer@patchew.org; Thu, 27 Aug 2020 13:01:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLG1-0005pm-Ip for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21291 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLFw-0005Mv-11 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:13 -0400 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-411-_LTGKjY0NjqV6bNAo0GkPQ-1; Thu, 27 Aug 2020 13:00:04 -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 E72EB1009637 for ; Thu, 27 Aug 2020 17:00:03 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAB8778426; Thu, 27 Aug 2020 17:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EnjvU88cAwFF+qc9CW8oMqgJGUmWasA62ifrpCJGzYE=; b=RljYEWr7qcRDiBrPFsbjCN3mXRwV2T5egapncJZl9hlfd4sP/oUPGjPhPotkhEnSFyluOp /3Z1aZAnZ+NzrA/mE2Lt8JeKokA+kj7kK3AgcV1w4CvWByDIjwt0ZvXIE3p5lW0npjvNg9 Fdg/BmbUo8hHhmSFVaXE2hSbY+5MaJg= X-MC-Unique: _LTGKjY0NjqV6bNAo0GkPQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/17] meson: Build qemu-nbd on macOS again Date: Thu, 27 Aug 2020 12:59:41 -0400 Message-Id: <20200827165956.12925-3-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Before switching to the meson build system, we used to compile qemu-nbd for macOS, too, which is especially important for running the iotests there. Commit b7c70bf2c5 disabled it by accident, since it did not take into consideration that the $bsd variable in the configure script was also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems but Windows now instead (which was likely the original intention of the old code in the configure script). Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}") Signed-off-by: Thomas Huth Acked-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f2aa5a7700..38d0abc0ea 100644 --- a/meson.build +++ b/meson.build @@ -1081,7 +1081,7 @@ if have_tools qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_img, qemu_io] - if targetos =3D=3D 'linux' or targetos =3D=3D 'sunos' or targetos.endswi= th('bsd') + if targetos !=3D 'windows' qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_nbd] --=20 2.26.2