From nobody Mon Feb 9 14:33:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1609813630; cv=none; d=zohomail.com; s=zohoarc; b=Vsr933i7hBZ42vSE2gBcC/0B8RUzqGO68+qlFjXpZ7qjlQb2NJow4rJjF4JdXtQDO2KcJI28AeB+Il65N6CkIvaC9Qu5+RobSQ63w5Mv8LiGYkFtl3IhIAAf1HoulqGHoPW/kTZMcQi1R2M9qQMdtbLxs2S9hR1IIGDl2E7gHtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609813630; h=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=2beqqzeGhDVR66ppVSfUzIPL472cxrqAoVT6lzv9HXY=; b=SXCCuPxu2QTToqlbJ+Y8Y2J6cEvssJ2GRx2H9IgLMMy2pTXqmH7Oa1g8OsIETVzElVuuPu5gD1s5FC2KLw6NZwrf/OQo8xl7PtTgAXkvdBzN5N/Pr5NLU5eXDmDrRb8nUvM+Q9VSO4dz/x8hQR/5XgRLM3L59/T7qz6DvrzyF7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609813630593567.1627059863304; Mon, 4 Jan 2021 18:27:10 -0800 (PST) Received: from localhost ([::1]:44730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwc3x-0007GK-DS for importer@patchew.org; Mon, 04 Jan 2021 21:27:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwbyG-0000nQ-2f; Mon, 04 Jan 2021 21:21:16 -0500 Received: from mail-pf1-f178.google.com ([209.85.210.178]:44168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwbyA-000218-S4; Mon, 04 Jan 2021 21:21:15 -0500 Received: by mail-pf1-f178.google.com with SMTP id a188so4849795pfa.11; Mon, 04 Jan 2021 18:21:07 -0800 (PST) Received: from localhost.localdomain ([73.93.154.186]) by smtp.gmail.com with ESMTPSA id y27sm57674386pfr.78.2021.01.04.18.21.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 18:21:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2beqqzeGhDVR66ppVSfUzIPL472cxrqAoVT6lzv9HXY=; b=rLjpICn6GH8KT+vDp+TQE8KpBfzbHPkraC+oh4oWMymr7ZwlXGvyQJKww3rTAxY3H1 bqxwbRBmSrfgGrG/bmHLSXKoF4UEiNsF0Nv2FNxpE8CUlXqdKLQ6V1Z7gq/t1Vg6nj/6 gd0g52GXvwuHtIMb66PmcjBH3Ar4qIZf9B2uTU9T77Pk4uxacNve/9d8H9UCcjHv2DW0 rZ+SS3x5y8EjJP7t66RnfyLzU+nqQKBIF2cMiZmm4bQz6Bo9R8CQ/IjyDs3AP7j16H5Q waYujbDBmH8lOOhwtZEfEIB0Aon9qTuPh7Ai7/yqVuPRbjlboCQutj63nCwrklTfQOI9 Agww== X-Gm-Message-State: AOAM531Vx/n4X6Zkxx+c2TYut26RznquLqCQfFesY3GlzoSPgfyaentz akF7Mrw/J7t/mUJRbwwqnEqN20c8x48= X-Google-Smtp-Source: ABdhPJyoUpWlEImryPuPMXtw6Auz0GT4ete79/haeGmotxXm2ha+BhzkNUEm5hku+WmM8t2rxSH2hg== X-Received: by 2002:aa7:8159:0:b029:1a5:54e4:7cf2 with SMTP id d25-20020aa781590000b02901a554e47cf2mr45214006pfn.69.1609813266858; Mon, 04 Jan 2021 18:21:06 -0800 (PST) From: Joelle van Dyne To: qemu-devel@nongnu.org Subject: [PATCH v6 7/7] block: check availablity for preadv/pwritev on mac Date: Mon, 4 Jan 2021 18:20:55 -0800 Message-Id: <20210105022055.12113-8-j@getutm.app> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210105022055.12113-1-j@getutm.app> References: <20210105022055.12113-1-j@getutm.app> MIME-Version: 1.0 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=209.85.210.178; envelope-from=osy86github@gmail.com; helo=mail-pf1-f178.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Kevin Wolf , Roman Bolshakov , Joelle van Dyne , "open list:raw" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" macOS 11/iOS 14 added preadv/pwritev APIs. Due to weak linking, configure will succeed with CONFIG_PREADV even when targeting a lower OS version. We therefore need to check at run time if we can actually use these APIs. Signed-off-by: Joelle van Dyne --- block/file-posix.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 9f556322e6..f109e1f305 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1390,17 +1390,50 @@ static int handle_aiocb_flush(void *opaque) #ifdef CONFIG_PREADV =20 static bool preadv_present =3D true; +static bool preadv_checked; =20 static ssize_t qemu_preadv(int fd, const struct iovec *iov, int nr_iov, off_t offset) { +#ifdef CONFIG_DARWIN /* preadv introduced in macOS 11 */ + if (unlikely(!preadv_checked)) { + if (__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) { + preadv_checked =3D true; + } else { + preadv_present =3D false; + return -ENOSYS; + } + } + /* Now we suppress the availability warning since we use the cached ch= eck */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" + return preadv(fd, iov, nr_iov, offset); +#pragma clang diagnostic pop +#else /* CONFIG_DARWIN */ return preadv(fd, iov, nr_iov, offset); +#endif } =20 static ssize_t qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset) { +#ifdef CONFIG_DARWIN /* preadv introduced in macOS 11 */ + if (unlikely(!preadv_checked)) { + if (__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) { + preadv_checked =3D true; + } else { + preadv_present =3D false; + return -ENOSYS; + } + } + /* Now we suppress the availability warning since we use the cached ch= eck */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" + return pwritev(fd, iov, nr_iov, offset); +#pragma clang diagnostic pop +#else /* CONFIG_DARWIN */ return pwritev(fd, iov, nr_iov, offset); +#endif } =20 #else --=20 2.28.0