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,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 9C7A3C47082 for ; Tue, 8 Jun 2021 13:20:42 +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 62F856100A for ; Tue, 8 Jun 2021 13:20:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62F856100A 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]:60102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqber-0007fk-Ja for qemu-devel@archiver.kernel.org; Tue, 08 Jun 2021 09:20:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqbb2-0008CR-Aa; Tue, 08 Jun 2021 09:16:44 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:44931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqbb0-0001z7-C4; Tue, 08 Jun 2021 09:16:44 -0400 Received: by mail-wm1-x32d.google.com with SMTP id p13-20020a05600c358db029019f44afc845so1836427wmq.3; Tue, 08 Jun 2021 06:16:41 -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=z5JxGJSakRyFgaDMwSNCyo2E3Qm6rZqr75V7oP8N/jQ=; b=UL4W7WZlcT7T+cIOXMx3NvRNDqop0YtbSHjI80jt09VdrgyRg0fzECXQvt3IY+b/Mr Odqncv3051hmWSTc6dN+ZOzPXnJ0Shh/ttXt4OpN9fOp9nry1DUzJ4BUfgG6iLtJUfCg R9VkZQGv1xVTFOJJijEj/n5enSDK8aEDm6FK+7F5AGh7C+QDmnAJlKzqqqfwm6RaxXqM ffIkdaNwG11lRqhVBS7tCkWpd9+1oz+0c0DdwDV9wMVIZNhod03Bf4D1hBN2vxq5we1Q H6h4baMFzBv7i49adeZ06X6fca3Ak3FqqN4xuRO8lnHvJH7Q8A6NbhJoj31kHWFQzWKw vULA== 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=z5JxGJSakRyFgaDMwSNCyo2E3Qm6rZqr75V7oP8N/jQ=; b=IGflSqQgXVESq+ue54COKfhKpD6Dz6JQCG6U3+fLKRGiks4KiPCMOq0JCdl48QPnKm /H8MvGWch5otogbULR3iGJHPieiuLO5OCeQ+ZgvKunpX1kipicia23n8AYI5NPlUbTRr WnnVC00eM9+VpfgasXwFE7U+QpC+b2Nj8CxPGhkEcfyf15ZxIJPlcwyieg1MBin2q6M7 9kuO8bNcK4f5fu41ms+EUViEVs1seRN/YerXBNZwQfRIMIU2xiPZ1pyC7FtnO0eK4zUf bj6PoFhckh0ABKqx59CP6U+QAVa4xgIjPBZQ15wPfU0j280yfTQVa0avi4/ZL2T6bV6o CmXA== X-Gm-Message-State: AOAM533rUDdpiDRXuPoTBYbqsKaNss2FO59x6+OorUDmyarcMIXflLRE H8b2WVlzcfILIfW6I3HfNiskC2FpCy3OVg== X-Google-Smtp-Source: ABdhPJymI5jJE1X7rmJXBWVM3zAsHagJRqMGSWPCaAa3J6Peg7GERkCGjy99CtvlOKOntFlrXX4WqQ== X-Received: by 2002:a7b:c394:: with SMTP id s20mr17482703wmj.33.1623158200616; Tue, 08 Jun 2021 06:16:40 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id i9sm15855686wrn.54.2021.06.08.06.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 06:16:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v4 6/7] block: check for sys/disk.h Date: Tue, 8 Jun 2021 15:16:33 +0200 Message-Id: <20210608131634.423904-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210608131634.423904-1-pbonzini@redhat.com> References: <20210608131634.423904-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::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: kwolf@redhat.com, Peter Maydell , vsementsov@virtuozzo.com, qemu-block@nongnu.org, Joelle van Dyne , =?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> 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 53150866ac..7e3902b5c8 100644 --- a/meson.build +++ b/meson.build @@ -1187,6 +1187,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