From nobody Mon Feb 9 23:39:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1643061856; cv=none; d=zohomail.com; s=zohoarc; b=WvTB58a0XmjVVK1K+VZ+wMPQpSsyrdHfSrDySnC+rYKLxbK8EcSuLMRhmaiKdOZypQUzAo68FC/7r1b8WG5dPM8ouZGRrPhPCFhbgNAZGGUb4rSjcVHOCZCE0ebmEf4xcH3rmrc1D5lX241xObo3PdEGUDX5ZqnZUx/jSStcpL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643061856; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=P14hKF1dbCTOrpRzjWYlLNVZ0tWnPHlKq9+Ut2Sqkbo4PnYzh3PqPyz2FBoGICJ5+Y+Md5Nov3FvGnVTr3hOItVRm/Hm3J89XGR+wyZPZ9RfCxfhRiHixR+XysvMv41KQL/kgBVOhNtsZ8EfADMFJVbWxH579e8kJ4XkM4IzcNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1643061856265344.407749249179; Mon, 24 Jan 2022 14:04:16 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id r9-20020a1c4409000000b0034e043aaac7so291583wma.5 for ; Mon, 24 Jan 2022 14:04:15 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y2sm477336wmj.13.2022.01.24.14.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 14:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=ZCvmbXHcerVeFZJlTMPOcCoQ7ywbnx/kikB/K1H85cuRI947JoZw20MZ02RU0/fyGI ohBBBAohJPxhAd6L9AuFzM81gYq0c1onisYsFCRfnacM2qU/bIfaJZWMGJzf0NzklNDc qN8IMsIqd8rftzmsycQNhuiZWwb3Y8p+kmaiMGkcusB0/yAT6Yjb0T1nGauZo9bbErTR 33S+Z6YypXRGT0iyZ0rx5yhyfK59U0b4zsWsLZlJg7y4RIUDz+wIaSkB/8+LF+qGNpyw VK3CzjCstg+Jt/2oj/J/HW77EFmlSg7rIdAnCiMnmdDNINcIpPaFRTFqj206YZN65DWR LFKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=1KLtn5UpPub5R84IGnH/j1lqf5fDa02w3zXU1e6t22EX6wOn5HUgEPDr7H3+3MOtnW tSjy2qyWXgSK77UJmrj70eAb2x1SUbm5Cjla6thr4LshCTKIJChIGn/QVkm1evFk2DtS J5KPWppLrHV/x4PunfbxNH0sVsI7XT7icM0wfOW6TQWUkaOMHr+SYLVgHWnz52QdWcw7 FEZMD7VtB/ZVfJKtNKY78A8zViXsl12UhIpe+STuvc0GiPSFZ1tv76Wj+MLFppVOhYpQ 0E6KqhMMftbSgFdvZfL6XK04wHJP3PkqIxlMViujz2EBiLCuvhNYy26dwIeeORNoiQY6 zmng== X-Gm-Message-State: AOAM533eSJ8A8NdJG9Qg2Su3d2Ckd55lSWwEdIfPz76kGhyE9TOLqASP xsGOOFLca1WSp+pQAs/t8UQ= X-Google-Smtp-Source: ABdhPJy/BwEqc+Y6Ffn/QdJHd1kgU1zIQ2tJVqGYYs9LweNSs/I0Zz76MzxUJ8gjtcn7e6rz2iYgSw== X-Received: by 2002:a05:600c:4101:: with SMTP id j1mr296977wmi.28.1643061854779; Mon, 24 Jan 2022 14:04:14 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/3] block/export/fuse: Fix build failure on FreeBSD Date: Mon, 24 Jan 2022 23:03:57 +0100 Message-Id: <20220124220357.74017-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124220357.74017-1-f4bug@amsat.org> References: <20220124220357.74017-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1643061858900100032 When building on FreeBSD we get: [816/6851] Compiling C object libblockdev.fa.p/block_export_fuse.c.o ../block/export/fuse.c:612:16: error: use of undeclared identifier 'FALLO= C_FL_KEEP_SIZE' if (mode & FALLOC_FL_KEEP_SIZE) { ^ ../block/export/fuse.c:616:16: error: use of undeclared identifier 'FALLO= C_FL_PUNCH_HOLE' if (mode & FALLOC_FL_PUNCH_HOLE) { ^ ../block/export/fuse.c:619:22: error: use of undeclared identifier 'FALLO= C_FL_KEEP_SIZE' if (!(mode & FALLOC_FL_KEEP_SIZE)) { ^ 3 errors generated. FAILED: libblockdev.fa.p/block_export_fuse.c.o Meson indeed reported FALLOC_FL_PUNCH_HOLE is not available: C compiler for the host machine: cc (clang 10.0.1 "FreeBSD clang version = 10.0.1") Checking for function "fallocate" : NO Checking for function "posix_fallocate" : YES Header has symbol "FALLOC_FL_PUNCH_HOLE" : NO Header has symbol "FALLOC_FL_ZERO_RANGE" : NO ... Similarly to commit 304332039 ("block/export/fuse.c: fix musl build"), guard the code requiring FALLOC_FL_KEEP_SIZE / FALLOC_FL_PUNCH_HOLE definitions under CONFIG_FALLOCATE_PUNCH_HOLE #ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/export/fuse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/export/fuse.c b/block/export/fuse.c index 3a158342c75..4c5d662be87 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -607,6 +607,7 @@ static bool fuse_fallocate_punch_hole(fuse_req_t req, f= use_ino_t inode, int mode, int64_t blk_len, off_t offset, off_t *length) { +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE FuseExport *exp =3D fuse_req_userdata(req); =20 if (mode & FALLOC_FL_KEEP_SIZE) { @@ -629,6 +630,7 @@ static bool fuse_fallocate_punch_hole(fuse_req_t req, f= use_ino_t inode, *length -=3D size; } while (ret =3D=3D 0 && *length > 0); } +#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ return true; } =20 --=20 2.34.1