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.5 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,URIBL_BLOCKED,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 27197C49EAB for ; Thu, 24 Jun 2021 18:14:24 +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 E74C261249 for ; Thu, 24 Jun 2021 18:14:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E74C261249 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]:40850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwTrr-00012h-3w for qemu-devel@archiver.kernel.org; Thu, 24 Jun 2021 14:14:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwTiS-00081Y-65; Thu, 24 Jun 2021 14:04:41 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:42580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwTiN-0001US-Vl; Thu, 24 Jun 2021 14:04:38 -0400 Received: by mail-ej1-x62b.google.com with SMTP id bg14so10853600ejb.9; Thu, 24 Jun 2021 11:04:33 -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=WRN9g/NoEZLbkWiwwJHbOcIt/+zi5y6rwgfm406D0pw=; b=ZoSazrxxj5EGv6bI5oEcIla9sFSg5UaqLCIGhdW8F9JH8FksklOFOSKBhFPf1pGXpb gLVpWHi6P97aXY5t0o8LbYDpnQppMmik4KSbM/bdySHEZhX+09boI3zgZ1SoUnucIp3/ pnbXfM0JJ1vaMCixOYklKqURXR0tSi00dAL/YQVB/nAapgmGmymG77d7eVJ0ZKVitVVs mKcoTwghuYT/2HNuwufRAcyjf1weCO1hHfxLZQLlMIXWS3J+FAGhuP/BL9kj8dU/dggh kB6E8ysSBnYkTgjhPt8olVHJkCAf4wjd5oZJM4/Sef0jEgEPzwlCuMsYvZ94oMs+5HcJ Jrtw== 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=WRN9g/NoEZLbkWiwwJHbOcIt/+zi5y6rwgfm406D0pw=; b=sOTp8Hz0L+MFeCwpw1tdy2fi8ZO4+xfnULRSYUKSoaXtXtMhdTle8PV5Et28ArCgFK rp+eBgo3HDWBvfnqLT2hk7D1rHQUfwiHvNq0/YAN2y+M9PGg1lcTjwvka5J5VyoihJSc EAWiQ4EaUsTt4NA2TibdkfQW6Hh59eQatfyKRA5CaQXlD5MQF1Azwn47EONganXTqh2m bcjJ5TM+e9V9tKd85tOZRiT+ugGgLCRxCJ+GSqrWNyKGcWyQi1JYAq1oa34CC415DZn0 8vy/pIMp+3APCgxXPnz6vMEq75FWHJWx+4H+wEFBrrHyEEI+rAbkSIXkyIkS83l2C8gM ITyA== X-Gm-Message-State: AOAM531OvFcfV3Zi9ENjQMxMY8UVndq8NVd52yjXrHkLgmB9QG9y+v7I x1ii0Me090WPpwAajajxD1j5mhVRjSM= X-Google-Smtp-Source: ABdhPJzWfX7zImDFRRqxt95f0+mrHH3+BmRJe14OqTQkKPrjq/BmXlNlutkmpxCUDB85GI7kufO82w== X-Received: by 2002:a17:906:edc7:: with SMTP id sb7mr6565991ejb.29.1624557872561; Thu, 24 Jun 2021 11:04:32 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a1sm2436466edt.16.2021.06.24.11.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 11:04:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/11] block: check for sys/disk.h Date: Thu, 24 Jun 2021 20:04:20 +0200 Message-Id: <20210624180423.1322165-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210624180423.1322165-1-pbonzini@redhat.com> References: <20210624180423.1322165-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::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.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 , qemu-block@nongnu.org, mreitz@redhat.com, Joelle van Dyne , mlevitsk@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 bb3a5be796..a95a9fbcbf 100644 --- a/meson.build +++ b/meson.build @@ -1250,6 +1250,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