From patchwork Tue Feb 13 18:34:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 136671 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6314443B0D; Tue, 13 Feb 2024 19:37:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A8A5642EF6; Tue, 13 Feb 2024 19:35:17 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id B72C742E1B for ; Tue, 13 Feb 2024 19:34:56 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id D05C720B2012; Tue, 13 Feb 2024 10:34:54 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D05C720B2012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1707849294; bh=HIDqoatjiMeL04O5I5MaMOHAvXluLbzbiH8rzXAxlQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CRloWS6hq/mhrJbBdFoVDvj/LHQmGlAF1kTOSJgBZPD0YIn6+RM1ULeraxkVBQEy6 lZZjGzpcbxd17W0WVWYc0BWZqFAfMd8d+yoYO2hUyAERiMQK1TL0oTePjpWbKRH0j9 mldFscmy0IGbnLypcHvJGxLpoL37UG+hPM9F3rIU= From: Tyler Retzlaff To: dev@dpdk.org Cc: Ajit Khaparde , Akhil Goyal , Andrew Rybchenko , Anoob Joseph , Bruce Richardson , Chaoyong He , Chenbo Xia , David Hunt , Ferruh Yigit , Harry van Haaren , Hemant Agrawal , Honnappa Nagarahalli , Jerin Jacob , Jingjing Wu , Jochen Behrens , John McNamara , Kiran Kumar K , Konstantin Ananyev , Maxime Coquelin , Nicolas Chautru , Nithin Dabilpuram , Ori Kam , Pavan Nikhilesh , Sachin Saxena , Somnath Kotur , Thomas Monjalon , Volodymyr Fialko , Zhirun Yan , david.marchand@redhat.com, Tyler Retzlaff Subject: [PATCH v2 19/21] net/virtio: use C11 alignof Date: Tue, 13 Feb 2024 10:34:50 -0800 Message-Id: <1707849292-19519-20-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1707849292-19519-1-git-send-email-roretzla@linux.microsoft.com> References: <1706138276-28224-1-git-send-email-roretzla@linux.microsoft.com> <1707849292-19519-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace use of __alignof__(T) with C11 alignof(T) to improve portability between toolchains. Signed-off-by: Tyler Retzlaff --- drivers/net/virtio/virtio_rxtx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 99b9519..f69b945 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -2,6 +2,7 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include #include #include #include @@ -1797,7 +1798,7 @@ txm->nb_segs == 1 && rte_pktmbuf_headroom(txm) >= hdr_size && rte_is_aligned(rte_pktmbuf_mtod(txm, char *), - __alignof__(struct virtio_net_hdr_mrg_rxbuf))) + alignof(struct virtio_net_hdr_mrg_rxbuf))) can_push = 1; else if (virtio_with_feature(hw, VIRTIO_RING_F_INDIRECT_DESC) && txm->nb_segs < VIRTIO_MAX_TX_INDIRECT) @@ -1878,7 +1879,7 @@ txm->nb_segs == 1 && rte_pktmbuf_headroom(txm) >= hdr_size && rte_is_aligned(rte_pktmbuf_mtod(txm, char *), - __alignof__(struct virtio_net_hdr_mrg_rxbuf))) + alignof(struct virtio_net_hdr_mrg_rxbuf))) can_push = 1; else if (virtio_with_feature(hw, VIRTIO_RING_F_INDIRECT_DESC) && txm->nb_segs < VIRTIO_MAX_TX_INDIRECT) @@ -1980,7 +1981,7 @@ txm->nb_segs == 1 && rte_pktmbuf_headroom(txm) >= hdr_size && rte_is_aligned(rte_pktmbuf_mtod(txm, char *), - __alignof__(struct virtio_net_hdr_mrg_rxbuf))) { + alignof(struct virtio_net_hdr_mrg_rxbuf))) { inorder_pkts[nb_inorder_pkts] = txm; nb_inorder_pkts++;