From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C9AC48BC2 for ; Fri, 25 Jun 2021 14:38:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B66016195F for ; Fri, 25 Jun 2021 14:38:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B66016195F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwmyC-0006gu-PH for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 10:38:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwmfN-0003XQ-Us for qemu-devel@nongnu.org; Fri, 25 Jun 2021 10:18:46 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:37627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwmfM-0003I5-Ap for qemu-devel@nongnu.org; Fri, 25 Jun 2021 10:18:45 -0400 Received: by mail-ej1-x630.google.com with SMTP id o11so2224401ejd.4 for ; Fri, 25 Jun 2021 07:18:43 -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=SDfMHDSuKxMkZiFUP2o6GnGmA2A8MNufC6YTUOx3lYw=; b=rcFpB4Yb5JV8Fx3aYGr807kt/lOyvBbaSBvrPfWmREvjMbtvZjy2eCaplbsGk0Pt3n v1QlZXo9uQbKT59meejw4QgJqo9efn4HOvQAOV3qmaoFqh2xgte4HOAEvMiX6SqA0Ija sfUMJKKTxShf8wpGBQ0+UNmG6SCO9gdD2wqH69xdvmL7NpW4zSBF09T7DOyrV6PuJ8Y3 9ddMpgui2HbziHJ/TfMh9mSH8vxJfrNY8kZ6fFW0OVMtbFmekjjVcKy0WSxOrbxrVIzM GJhPOplNFg4dxWAtDArsDm6IrtokqRGR6Jmfx8c8s6ciS41iz7lG1Xc4S668ts6BAPmn b4hg== 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=SDfMHDSuKxMkZiFUP2o6GnGmA2A8MNufC6YTUOx3lYw=; b=s2LPBzVN5Wbx/9YhLZzoYuRzGhaKfGWp2WckW0wjGJyj8tfnc0EPip5Qw8IvxL3nR4 2D8MPgAlAAw/uqBk19lXkguedy+FC1iZ1AyEk5BEf0HSbN/pmdFc/i3vL9k6BPkRejRU 4vJZ8m6nyINGFueQpdcHuGTO1ZYmYWx2eBO4U9+bQmfB+sNPQ5ddJnE2prdTBwCklh95 GnPN+MB67/XkpR/u6xOsGXqksbGB5nPU0CvQeSM47ybuGXDcLfBuWWogYdRaTaT8gGjR R5rBE0zHcNP6/4ZiXOoVlw3w6MRgYXTSMLMkXxmz04IJnym9lDFzf0SV5ieYbIbvimhM FASA== X-Gm-Message-State: AOAM531XF1dtHPREgkVm4fKdCIvGNV4WLhYIYdRBAqZ3cpiKsTyVh39D 4tFk/Xowd/r9wA2TGGcttGoNKZ3zy4E= X-Google-Smtp-Source: ABdhPJy3mA9yZG0xf6qCY42j5njvbqGF2lk5gpROnTD64Jo1ILCLrdz3iLLayEFeMqqFGn44DTau8A== X-Received: by 2002:a17:906:3c4a:: with SMTP id i10mr10937210ejg.372.1624630723101; Fri, 25 Jun 2021 07:18:43 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id c28sm326579ejc.102.2021.06.25.07.18.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 07:18:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/28] block: check for sys/disk.h Date: Fri, 25 Jun 2021 16:18:14 +0200 Message-Id: <20210625141822.1368639-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625141822.1368639-1-pbonzini@redhat.com> References: <20210625141822.1368639-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.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.25, 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 , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Joelle van Dyne Some BSD platforms do not have this header. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-3-j@getutm.app> Reviewed-by: Max Reitz 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 3f456892d0..1d37f133a8 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 6419d4ee41..144456426c 100644 --- a/meson.build +++ b/meson.build @@ -1251,6 +1251,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('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', prefix: '#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')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include ')) -- 2.31.1