From patchwork Tue Jul 26 19:21:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 593474 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3824516mab; Tue, 26 Jul 2022 12:39:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vpHI28+LKNHKoAwLIQ2w6WoRB30ahyQl9/ouRJvGjPr/LMczO+/FskfE+BfpB9nCr9e37I X-Received: by 2002:a05:622a:5d2:b0:31e:e353:4f76 with SMTP id d18-20020a05622a05d200b0031ee3534f76mr16256388qtb.99.1658864377333; Tue, 26 Jul 2022 12:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658864377; cv=none; d=google.com; s=arc-20160816; b=gfpnZVa/Ukup9oWNR01JiJQD7+Vfz12ccpAfAgAy6rCX0jd5PgvYorCiJyIFqMu9aj T7jqC/jD0aQ+8s/kQfcDiHS0lGtibrJ1lPd5mjVY0/PJiaM7EJQSP2QmT1Iof8M1DZeo VvjDooExuiZsmxwOK9JClMS6wOK/NC47H6oVeKQ1lwWgHpIANROMUWoKAUGrmqXgoYyF JKpd/HSY/YFm47uiB3O7Dz79BjPFZOoZ+rQ8t6NlMmkRcFQSb3noSU/JoSupRhIZnWZN H1u8J8B5fs4U4ll0lDYcn5/MhdAaUZ9tFF5XP/c9+TwC2biYBHUa2jSXMgNMYrx7DFQ1 OhbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c6PIYMIE3JaTrY/DQKZRjBqoWth+KWJVDK8v0sIayL0=; b=pTQP/Z0AdifpG3kk4FzsEXwtoAxdzN8ERHH61r/hYwIXMl7epc5ElWAWNCj090+m/Q mIb/22XWMi5nS7b4xRQWLmr+Tt3/thqCzlCvPo2p6BNjyjTJMiTXtboR19x13xEbFLI/ OhJ6tRKIGRzkOn0532+jkEKQ30syXHZXONUoHSj4tZDK6ekApiEgIE34c8ThhpCKWGlE K7NSVFvAuvB1/ZPWzkjOOgqlgOi4igwFDkF+rtGejoVgcoTyY8R8mU0vqGvO7gsxgUy3 gz1bf9Du6aFWWDCiUicnEzp4e7CumUaKzM3raTs5KWjTZ7UxdgMP6MJ0diaS7lkiBHQr UZ9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yd1RoS03; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q14-20020ad45cae000000b00474129f32ddsi9002637qvh.97.2022.07.26.12.39.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 12:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yd1RoS03; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGQOz-0003Ul-6w for patch@linaro.org; Tue, 26 Jul 2022 15:39:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGQ85-0003F9-1O for qemu-devel@nongnu.org; Tue, 26 Jul 2022 15:22:05 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:34653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGQ83-0002Jm-Jm for qemu-devel@nongnu.org; Tue, 26 Jul 2022 15:22:04 -0400 Received: by mail-wm1-x333.google.com with SMTP id r1-20020a05600c35c100b003a326685e7cso1292854wmq.1 for ; Tue, 26 Jul 2022 12:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c6PIYMIE3JaTrY/DQKZRjBqoWth+KWJVDK8v0sIayL0=; b=Yd1RoS03X2dpWLourmcbXGS38aK3+3OavISnGFTifCiACdYTsYuAM/VnhG3XMXv1Jd s6kcKw9HFfzu3Xa0Z+jm9NP6xnKsteMi36yME18o6xLclNZuX+Xq7BuxATIqQUijw0Gr SIKuveVbEZ5EvAMUAaUoGZE/MbWIvk1dC9IMuFOO1aYsH93t/Ddt8z94WQ1VphMsnZny 6REMkZ8dS9zopGQNP4gHydFnWtk6KVWHlMCWdFU87mp1ebMYhj1c6mWENRRjLJugRG9+ 3aVQPO+k0cX9ax7FZoIF9pVYOknXhuFlX+3rlgu6httxTv9iUHb4W85giUi/LMO4RYiB 3xXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c6PIYMIE3JaTrY/DQKZRjBqoWth+KWJVDK8v0sIayL0=; b=S96P140QL/Gt4fmneV2GI5ld2MnYBeQPaG6Kzy7/DgvSqjdtcFO6la+hG6rm/O6E4M xKLPtsNinZ5mVraDjwZ7BM9FQpsHeCw/gCqeTWU2GZF0BGF27mK7TCwW4XKXQy4BKxUX tiHwcClc3QnL7+gT6b2rfAYCL+/AfHsFB8+nf9kJVBooEDAclF5JkSLQZP7Lojq5CMg9 glrQMolchi2FrSxJsmsPnUDJcwqH+Rc6CkQG5f5DcUtrmYydgz6pY4VaKABA+KfDA7zS NddGp8b7K3h3B0KKfcXMNoOX/zy/ULUbmwyvqe1LLBd/v/Kk8QYd6HUbwfy7A2UgJ0Xd FsHA== X-Gm-Message-State: AJIora+qYAlx7owHLuDU7YehUStjNb5HnJ3TYcr/ALMHrpnwqFiLw1kZ sHmfvjXsofSRkhR8V25u1UtemQ== X-Received: by 2002:a1c:2981:0:b0:3a2:ffe9:945c with SMTP id p123-20020a1c2981000000b003a2ffe9945cmr478140wmp.38.1658863321016; Tue, 26 Jul 2022 12:22:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bd6-20020a05600c1f0600b003a050a391e8sm19502099wmb.38.2022.07.26.12.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 12:21:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B8A781FFBD; Tue, 26 Jul 2022 20:21:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: slp@redhat.com, mst@redhat.com, marcandre.lureau@redhat.com, stefanha@redhat.com, mathieu.poirier@linaro.org, viresh.kumar@linaro.org, mark.cave-ayland@ilande.co.uk, jasowang@redhat.com, =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Coiby Xu , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PATCH v3 05/21] block/vhost-user-blk-server: don't expose VHOST_USER_F_PROTOCOL_FEATURES Date: Tue, 26 Jul 2022 20:21:34 +0100 Message-Id: <20220726192150.2435175-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220726192150.2435175-1-alex.bennee@linaro.org> References: <20220726192150.2435175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This bit is unused in actual VirtIO feature negotiation and should only appear in the vhost-user messages between master and slave. [AJB: experiment, this doesn't break the tests but I'm not super confident of the range of tests] Signed-off-by: Alex Bennée --- block/export/vhost-user-blk-server.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c index 3409d9e02e..d31436006d 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -125,8 +125,7 @@ static uint64_t vu_blk_get_features(VuDev *dev) 1ull << VIRTIO_BLK_F_MQ | 1ull << VIRTIO_F_VERSION_1 | 1ull << VIRTIO_RING_F_INDIRECT_DESC | - 1ull << VIRTIO_RING_F_EVENT_IDX | - 1ull << VHOST_USER_F_PROTOCOL_FEATURES; + 1ull << VIRTIO_RING_F_EVENT_IDX ; if (!vexp->handler.writable) { features |= 1ull << VIRTIO_BLK_F_RO;