From nobody Mon Feb 9 07:07:12 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688131498; cv=none; d=zohomail.com; s=zohoarc; b=Z4ZLvmNpCh9x3CF27MetqRzu+3He6t1HWi78RTNoImFqg8KQwXTLWHceCkkV/SwLeXk9QayA4FJevngMID7/clgWwF+bj8S1I13PIwO+lSZtiiMUm40vlHQYSOWDwH6kPhSzi8MwUdZP1inu5x/RCnhMPS7QL34pltWzI6NFwrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688131498; 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=Y+10pK3jsTYW1WCPIup4C/1EWfB9z1pijxAEzc/XV9s=; b=F7xvJ/8HD1YebMyp4tXlSSpBNi+A0XQ7K1lKgbD3IpY52l4AGZ8YYKXH38E8J+dz8rNIljM97Ih3ARuYjzZmOf8nqq2rKPtnVnGmk0opan9cwOuqClCmf3SYfkayxiamesk3m7NtnV0jRmU54zgsrzIjNddSZNLtE2arngJJwig= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1688131498066894.8508141200474; Fri, 30 Jun 2023 06:24:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFE5N-00006R-MP; Fri, 30 Jun 2023 09:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFE5H-0008Jd-F0 for qemu-devel@nongnu.org; Fri, 30 Jun 2023 09:22:49 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFE5F-0003YE-Ou for qemu-devel@nongnu.org; Fri, 30 Jun 2023 09:22:47 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-55b12286476so1095977a12.1 for ; Fri, 30 Jun 2023 06:22:45 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id j15-20020a17090a3e0f00b002638e5d2986sm282963pjc.17.2023.06.30.06.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 06:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688131364; x=1690723364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y+10pK3jsTYW1WCPIup4C/1EWfB9z1pijxAEzc/XV9s=; b=nGmxeZW68Ll+wdcQDaJ0qFAtBWkC4GlWB2uYbY/UgiyxzLAkT9IGFeRK6ztJ8rSf77 Z6uyHSbDl8SEsEtLXpdxrfNbEirqq7Z/JJIZiP0+kwOJUojyAaMILw/ETXfW0Q6HloxF 7d9AHapaic0b9PVQSh0G8XR0f0/9J298Zem+eI7W4AT9oYX2WNoqF7PGlZn2j34tZ5Ww RhV2yeG30t4A4WxbTyoJxSrCxwQcgcdRO7t16Bx2X/y1HtIU7Ptn66/NApRTEPo4DaSj FovjjJ6W98iV6upT59Lwu6j1m7vInWOJFRRIn76N6lYS5l/XHF6jFTIrGHdon4vi4ASI /yIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688131364; x=1690723364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y+10pK3jsTYW1WCPIup4C/1EWfB9z1pijxAEzc/XV9s=; b=WZt90oQ2aJ7NWnDEubsosnER0JLvSauFRsuKrtGzxQCVygH1GSnguM+q60uOLlZWyk lW/Ef0XJFhnmDmT2JrlM8sCZitgXzGGxoawXofUwNSNHtCZz3YGeYMdvDN6WQuahA5dL jMEeTyMghC+zV0SpcyyWTDh5i2JDsz/gC9BeAGzBBvNxCzlV1H7ZLJ0gZ8HMtjv7d2Lk xL8xHp/EMsNm6eQ/xlChkLxiWnJU2L42HDUZRVRpAouKttzF/2KtU+Bd4oBVCizKH8TL LNvA7xeP3t6mobCwBIWWrQW1EMBJbhbqyJ1xB1H0z9KTXNdkF100rzn4UlVB8/ThqPbj xqHg== X-Gm-Message-State: ABy/qLbtWUpyHsiNOQzePj1rtQ8rCvhuSVzC3YglEIHnWFVSUhRIr51Y aPSs/z9Cu8dHTx5LW109fWo= X-Google-Smtp-Source: APBJJlF4TF7BeOEv4sWYEtV3+p76C3hTnzirHA3470DQx9OFWPdmHy5rLuTF18SFuq2KstuT5ba70g== X-Received: by 2002:a17:90a:e60f:b0:262:e742:f40a with SMTP id j15-20020a17090ae60f00b00262e742f40amr1657184pjy.44.1688131363931; Fri, 30 Jun 2023 06:22:43 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com, philmd@linaro.org Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 2/2] vdpa: Sort vdpa_feature_bits array alphabetically Date: Fri, 30 Jun 2023 21:21:48 +0800 Message-Id: <07632fb387d8eafb7ad76dd07e321658e0f40842.1688130570.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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=2607:f8b0:4864:20::52e; envelope-from=yin31149@gmail.com; helo=mail-pg1-x52e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UPPERCASE_50_75=0.008 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @gmail.com) X-ZM-MESSAGEID: 1688131500150100011 Content-Type: text/plain; charset="utf-8" This patch sorts the vdpa_feature_bits array alphabetically in ascending order to avoid future duplicates. Signed-off-by: Hawkins Jiawei --- v3: - sort array alphabetically suggested by Philippe v2: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg06766.html - resolve conflicts with the master branch v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg01585.html net/vhost-vdpa.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 0479988a79..c0e93ce568 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -50,38 +50,45 @@ typedef struct VhostVDPAState { bool started; } VhostVDPAState; =20 +/* + * The array is sorted alphabetically in ascending order, + * with the exception of VHOST_INVALID_FEATURE_BIT, + * which should always be the last entry. + */ const int vdpa_feature_bits[] =3D { - VIRTIO_F_NOTIFY_ON_EMPTY, - VIRTIO_RING_F_INDIRECT_DESC, - VIRTIO_RING_F_EVENT_IDX, VIRTIO_F_ANY_LAYOUT, + VIRTIO_F_IOMMU_PLATFORM, + VIRTIO_F_NOTIFY_ON_EMPTY, + VIRTIO_F_RING_PACKED, + VIRTIO_F_RING_RESET, VIRTIO_F_VERSION_1, VIRTIO_NET_F_CSUM, - VIRTIO_NET_F_GUEST_CSUM, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, + VIRTIO_NET_F_CTRL_MAC_ADDR, + VIRTIO_NET_F_CTRL_RX, + VIRTIO_NET_F_CTRL_RX_EXTRA, + VIRTIO_NET_F_CTRL_VLAN, + VIRTIO_NET_F_CTRL_VQ, VIRTIO_NET_F_GSO, + VIRTIO_NET_F_GUEST_CSUM, + VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, - VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO, + VIRTIO_NET_F_HASH_REPORT, + VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_TSO6, - VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_HOST_UFO, + VIRTIO_NET_F_MQ, VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_MTU, - VIRTIO_NET_F_CTRL_RX, - VIRTIO_NET_F_CTRL_RX_EXTRA, - VIRTIO_NET_F_CTRL_VLAN, - VIRTIO_NET_F_CTRL_MAC_ADDR, - VIRTIO_NET_F_MQ, - VIRTIO_NET_F_CTRL_VQ, - VIRTIO_F_IOMMU_PLATFORM, - VIRTIO_F_RING_PACKED, - VIRTIO_F_RING_RESET, VIRTIO_NET_F_RSS, - VIRTIO_NET_F_HASH_REPORT, VIRTIO_NET_F_STATUS, + VIRTIO_RING_F_EVENT_IDX, + VIRTIO_RING_F_INDIRECT_DESC, + + /* VHOST_INVALID_FEATURE_BIT should always be the last entry */ VHOST_INVALID_FEATURE_BIT }; =20 --=20 2.25.1