From nobody Mon Feb 9 20:32:40 2026 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=1621327561; cv=none; d=zohomail.com; s=zohoarc; b=cV5DBCzN+eOCeqcpfyAkqO9P4Ky+34/ff0+vSjaF22gHrPEk6ZhPICFpinehvOuMmiVdyeOMS+BQl1hS2UJ/lFDeXtR1aVk6wfvZ/dsf4G/JQYZrZrCaHqbtNS/Nz3fcGhQBRdpHlVvl50MDAW+GVqTJ3aO/pIpQtCAeNGofQPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621327561; 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=gy7bya1GfaCYAsMvtBUOrz63lYwfM7lAidIzQ0mKnCw=; b=CLYzSp444G7xj4jIEgGwWbhbNewfH+KklfhjQXB3ssCvxeZ5cLQzou3psmIvrZfdS2EygkqzhZDro/zYW4Sz52JmzvCkWmMG+P/EewcwsMo80ICUuh8gBHkSoA50E7EOhKgR1ihxyFbVXLUD5WK2oFGObTtbCfmj2HdBTmxMghg= 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 1621327560995415.817972619703; Tue, 18 May 2021 01:46:00 -0700 (PDT) Received: from localhost ([::1]:37168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1livMV-00084K-UY for importer@patchew.org; Tue, 18 May 2021 04:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1livFv-0003YB-2h; Tue, 18 May 2021 04:39:11 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:37870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1livFq-00048j-DJ; Tue, 18 May 2021 04:39:07 -0400 Received: by mail-wm1-x329.google.com with SMTP id f19-20020a05600c1553b02901794fafcfefso375799wmg.2; Tue, 18 May 2021 01:39:05 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id y6sm70959wmy.23.2021.05.18.01.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 01:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gy7bya1GfaCYAsMvtBUOrz63lYwfM7lAidIzQ0mKnCw=; b=I4pJcjvuT/OV7hdK2oFOQMztXSirzdWENCJXFeBxCr02lVULwO1RBcxJeiKlAN92vD yaj++b5LaW3h9j7Oul781IATP+f0nCiPP9N2nroSi9DC6DPgJMa4rBGXzjRC2A0/S2s8 1YYGD1zGI1alVMAT5XnYH2i8aNM9n5sA/sXkmBXln7U1XZm9J010q0ESnWgSabgr4JYW nKmYMkiof/GKbkEA5PyopcwDSZ+OKsFiIBecbxZUrrkJD6sDkK9UBoWKo6Tgp73XPpf1 UX0bgevpyS82aGiXP2mZGqpMbmc20XN4nMe/6fiY8OQC7lW96fbdl0wvZoXEu1nN6Qie u9eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gy7bya1GfaCYAsMvtBUOrz63lYwfM7lAidIzQ0mKnCw=; b=pWAZVN5ROOWurlC0SQ5wKqeZZPBXsRhNsdifDI1QRfCfEQOln+rzU65XAnDw9Zk//W maXJwU34x5Fwo3aP/Od9zLBA8IyreFHxxbVibP56SeMTBO0+FPCsGRi6Q9gTl4xa7RFu EhB3r8xXFrzAiyDamdH7HLdxY6UaZLJ/tdXBvH0F5llFc8owCUTJG/hZLccVFHUexf7c YHjSP8fCezr/vt43MazLz4y5th1+yS4KE/xom0mPNb20ox3KErKmx+z9wIxps764XvIF sn28PTTGaGyzHnz3Jc41rpJ19NnjGlrvc5zuNBFuV3gcCDE/Uirf0xG3rqiEHLchQjnD sS/g== X-Gm-Message-State: AOAM530AnBJ46hxXVuvwNXyGB9uaAREIisfvsLw0Y3Ck58ityL/rtGsS T+Gl+wtwlF/82zlD59jN3p4Quths4q4Caw== X-Google-Smtp-Source: ABdhPJw5/dmzzwjhEx5xuddZFpoApB7o+dkfDrlPrmVApOLSjdLEWKCv7P5SIsr8c+/4FZBIRTJdrA== X-Received: by 2002:a7b:c93a:: with SMTP id h26mr3616304wml.141.1621327144729; Tue, 18 May 2021 01:39:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/5] block: check for sys/disk.h Date: Tue, 18 May 2021 10:39:00 +0200 Message-Id: <20210518083901.97369-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518083901.97369-1-pbonzini@redhat.com> References: <20210518083901.97369-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Joelle van Dyne , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Joelle van Dyne Some BSD platforms do not have this header. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-3-j@getutm.app> Signed-off-by: Paolo Bonzini --- block.c | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 9ad725d205..86a8c638c6 100644 --- a/block.c +++ b/block.c @@ -54,7 +54,7 @@ #ifdef CONFIG_BSD #include #include -#ifndef __DragonFly__ +#if defined(HAVE_SYS_DISK_H) #include #endif #endif diff --git a/meson.build b/meson.build index b3cc45c41d..5f0d4a1bc3 100644 --- a/meson.build +++ b/meson.build @@ -1164,6 +1164,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_head= er('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', pre= fix: '#include ')) config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) +config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) =20 config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#= include ')) =20 --=20 2.31.1