From nobody Sat Feb 7 07:11:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1679486979; cv=none; d=zohomail.com; s=zohoarc; b=jpbeaycQi19WMTUgEtV2ds59gcrfKJUV9xYUrtwRIhUcYYmNpnjM5TvBCO82vIVjBZdKNsMq6Vb/UC4mdIzVQptYJzoo4A8X5qZRMrV1yHa60wgTFPhxxprGlHmFVjJsmLzC7io3i8MEfvr7qjPQmKuOF73APF9hag9dfc2XXHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679486979; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=afC9LuDOI4S1LmIJPeS//2B8HX3QZZNvVY/3xGApvhI=; b=WCAmAbcoP+auXz+TaaAAN4xPdHRZvjh/LOI74+GMgHIeYucDVnndmMElBMw0x6GZeZmfVZl+AyuZtmlGZHX5NzFVhzdLyExKSqvNxF11/9K5rB1vR3CAZUBA4MjxxhzO8meMRv++h440DATi0QpiddBqNu99ac2HXbdEVYngfvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679486979949902.7757515201376; Wed, 22 Mar 2023 05:09:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513374.794268 (Exim 4.92) (envelope-from ) id 1pexHG-0001Tz-AP; Wed, 22 Mar 2023 12:09:14 +0000 Received: by outflank-mailman (output) from mailman id 513374.794268; Wed, 22 Mar 2023 12:09:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pexHG-0001Tq-7S; Wed, 22 Mar 2023 12:09:14 +0000 Received: by outflank-mailman (input) for mailman id 513374; Wed, 22 Mar 2023 12:09:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pexHE-0008Jp-Ag for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 12:09:12 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2001:67c:2178:6::1c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5a5b3cbb-c8aa-11ed-b464-930f4c7d94ae; Wed, 22 Mar 2023 13:09:10 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 58EB333AA9; Wed, 22 Mar 2023 12:09:10 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 31EA213416; Wed, 22 Mar 2023 12:09:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id vOmdCubvGmRLTwAAMHmgww (envelope-from ); Wed, 22 Mar 2023 12:09:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5a5b3cbb-c8aa-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679486950; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=afC9LuDOI4S1LmIJPeS//2B8HX3QZZNvVY/3xGApvhI=; b=ssEDpoBuEnwP30B5l08mfrpuyXCplYaFseHcDSO8k7yAqv9kKPzecOWam6vZaPdij/vQiV bcyuiVg6a9iyh7jYkPsYslmCO3g2Yf1wDoEXxKWMClylUb18QY4AHvyvtARKJgIjDX2vrV ZQlnVg02ABY0Ar7xWjtYPh5ssJmkBPw= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH v4 4/5] tools/libfsimage: remove private offsetof() definition Date: Wed, 22 Mar 2023 13:08:43 +0100 Message-Id: <20230322120844.19657-5-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322120844.19657-1-jgross@suse.com> References: <20230322120844.19657-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679486981804100001 Content-Type: text/plain; charset="utf-8" xfs/fsys_xfs.c is defining offsetof privately. Remove that definition and just use stddef.h instead. Signed-off-by: Juergen Gross --- V4: - new patch --- tools/libfsimage/xfs/fsys_xfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/libfsimage/xfs/fsys_xfs.c b/tools/libfsimage/xfs/fsys_xf= s.c index d735a88e55..b8b4ca928c 100644 --- a/tools/libfsimage/xfs/fsys_xfs.c +++ b/tools/libfsimage/xfs/fsys_xfs.c @@ -17,6 +17,7 @@ * along with this program; If not, see . */ =20 +#include #include #include "xfs.h" =20 @@ -182,9 +183,6 @@ fsb2daddr (xfs_fsblock_t fsbno) (xfs_agblock_t)(fsbno & mask32lo(xfs.agblklog))); } =20 -#undef offsetof -#define offsetof(t,m) ((size_t)&(((t *)0)->m)) - static inline int btroot_maxrecs (fsi_file_t *ffi) { --=20 2.35.3