From nobody Mon Aug 24 00:37:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1781168814; cv=none; d=zohomail.com; s=zohoarc; b=LteaHeQhhs0Cdcl6kvu0gVRwLZ0LhsAEkw0Ww3y0fTr+qGry8QlzdcCK/olsreoHBaLiO6DIhDNsXASexl/JTGe2IFBF5Dq0R8I9yOpgdYV7lfuo/n4tinY6tTl1XfvE1Ki9a3w19DyLA/YSCQ0N2HcBNfha3m0YYZO+dLXRLFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781168814; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9Uq/YOD4Tyc0jQlm9DPacra4GuZK8eNHou9efZzgg2Y=; b=NhK6X+DSADEZpVJ7cS2TEAztW9KWmgqWzsVabEMLa/kf1iKZp4kVrEvBPGsYW4dos+zoE1E862lsOM9XnFpSRNyEpvgE4VGpcfu0WcauabIOz6Z7ZNLSsrbuJtrOxFDXIM1pJdevITIrq4/iF2fr6/BN4cZSedbDbU5feWBGBYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781168814257242.6799417739901; Thu, 11 Jun 2026 02:06:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXbKs-0000OJ-Hx; Thu, 11 Jun 2026 05:04:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbKr-0000O0-Hh for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:04:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbKq-0004dn-7H for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:04:25 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-gutft811ObqBsC0Ib2jKYg-1; Thu, 11 Jun 2026 05:04:18 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7BB011800378; Thu, 11 Jun 2026 09:04:17 +0000 (UTC) Received: from localhost (unknown [10.44.24.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E21B180029C; Thu, 11 Jun 2026 09:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781168663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Uq/YOD4Tyc0jQlm9DPacra4GuZK8eNHou9efZzgg2Y=; b=D7KVuheOyHTWPG3L7vuvHpCSWl7nfMf0WernMa/QRuKZzdn0z1BLZerNESqjXUVAL4xUTr gojvQbSL1YuGiydPH4RndYwcwNkYGZ9k5Tn5aFG61XVrDQo7BVOZ83L4HjRF+vdGP5xTv3 uAAatYnz4PhgiebdZH00rgKYr42Kk40= X-MC-Unique: gutft811ObqBsC0Ib2jKYg-1 X-Mimecast-MFC-AGG-ID: gutft811ObqBsC0Ib2jKYg_1781168657 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 11 Jun 2026 13:03:22 +0400 Subject: [PATCH v3 07/35] glib-compat: add fallback for g_clear_fd/g_autofd MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260611-b4-ui-v3-7-72bcbbea0fae@redhat.com> References: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> In-Reply-To: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Fabiano Rosas , Laurent Vivier , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Akihiko Odaki , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=1464; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Oc6bYtbmoQuSGvRLMjbnGE3Qy+VIBvYlZ2fSX7bu/zw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqKnndJS3U8ds+2xrkI61RwjnGLXrpSNf13PGyS M57Wl52yh6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaip53QAKCRDa6OEJdZac 5UWnD/wM854nGLRh4wNJWnYDe2QKcyIg5vZLMVPQtAWXLsGTs+2hdf8jAZkXXzcY/kqxNciKXCU Ln3cq1FWxUWUNwVkneBx5UuFKmy8aRl/RbhMbT+imv4EFaR/FTkccrt1FGDivuhIMsbNrJLFGnF i9ruQM4jA/XD2sumz0LJlzBxskX0gDPS/aRy1sm8CMyeH1D5eWrA0DEkco7CGQxLROMNIjUQCbF e6PUav9nMG430kJpUjwvp2DogbkJV4jL/SaqTSE67rwueiebcULzlMSMq14TEitWUGIfuFD53Of 16h0bN0prRKQZ8EBWzl5tXsep414Yju26DSDkR9k4I68h5wcpPAj2P9SO/yahtm1V1V/NdineEO +EpkhDxtXxKaOvBOjsKa9IqaRY2oksF1c1aeVU/k69L8ZmWjvV8fl9NNaQbGJHgpA6UWzBTrntt 6or1PwtSa9NoghAAc0GnTFgI4oaCY1AinOySo7YiUfPZTvRgXb7KxDVgQLiiCPae4oTZcZqlHcc K/cLTt7BYriUyeJh6hQ6yid7LGaBGmXFA76VCPXxBEudf0MvpUJM4AtsDbnqQTYb/+s19jKjkC5 yDikjeV3fk9WfuF6TwAwrtKyiWgRny3tx3QV7VyWnAwyxkrBFGgkSMerBg4ygFkYNwl9gQEldzW 7wYKP/HaVxSTOJQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1781168816312158500 Those helpers were added in glib 2.76. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/glib-compat.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/glib-compat.h b/include/glib-compat.h index 2e32b90f051..32ee2afdcdf 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -30,6 +30,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" =20 #include +#include #if defined(G_OS_UNIX) #include #include @@ -129,6 +130,34 @@ qemu_g_test_slow(void) #define g_test_thorough() qemu_g_test_slow() #define g_test_quick() (!qemu_g_test_slow()) =20 +static inline gboolean g_clear_fd_qemu(int *fd_ptr, GError **error) +{ +#if GLIB_CHECK_VERSION(2, 76, 0) + return g_clear_fd(fd_ptr, error); +#else + int fd =3D *fd_ptr; + + *fd_ptr =3D -1; + + if (fd < 0) { + return TRUE; + } + + return g_close(fd, error); +#endif +} +#define g_clear_fd(fd, err) g_clear_fd_qemu(fd, err) + +#if !GLIB_CHECK_VERSION(2, 76, 0) +static inline void _g_clear_fd_ignore_error(int *fd_ptr) +{ + int errsv =3D errno; + g_clear_fd(fd_ptr, NULL); + errno =3D errsv; +} +#define g_autofd __attribute__((cleanup(_g_clear_fd_ignore_error))) +#endif + #pragma GCC diagnostic pop =20 #ifndef G_NORETURN --=20 2.54.0