From patchwork Wed Jul 27 15:56:49 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: 593745 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp466646maz; Wed, 27 Jul 2022 08:58:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tQQJIhJXDkjkjGktk1mqiwS7ME+F8ruUb5hkP1nG03Q8/4vy+dRUkqhGPWdGj23E5hP1xk X-Received: by 2002:a05:620a:2490:b0:6b5:fa36:c7dc with SMTP id i16-20020a05620a249000b006b5fa36c7dcmr17175229qkn.223.1658937532688; Wed, 27 Jul 2022 08:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658937532; cv=none; d=google.com; s=arc-20160816; b=VUxfzGk3UBZ78apYdBTDAg0ReXxicg56YVjVsCBdsCHYldaPMbWdg5ORCudUIo9S4Q 9rYWE3xhxSB+26yX5HFEv5HWafwBxj20NAUmuWkVHaZBAMhXETRxyZKda/EmwhMjQ8pY d6dgMk5Ak53/pUC65u0upfCRGKlkG3NQwEVZGn3Wtf/W2Rk9/2sxSP9+CQT6DS1o57zl IJMWoUssiO5r6qDteyagPPrch5mG1S2P8nCNVAybgZ+2lS11mldu6qbz9XBlkSH3sIOr L/jB4LQVNXUX0TdKO/ShdiP7Em58lHms5iAhIosXd01WZ4mgVEjcMtT7Y4/kSh2ThwoC insw== 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=9mEcK4sO4rPCFZLLkHp1PXNwdldjaLtha6aYBrlBQcI=; b=YX+C1QBkiJr1wiu4FFXBS24mcxAlxDguYkyAX3E+a/FOKvRcaQmbdFXRyldBL/qPcG tANjkd1cu9AidUc7+mxFoxXdTzVJiS+H3rUnEwWPyiDmZ0kZSZm93G59e6xkQ7QVFdEs Q0STH0nvwQDzBsc2Gv/RwZiWepGrcx79rW9oKi0QAH73SAo4lgNu+0qtYRIkIm0TPb4X ZG2GTJD3xWG6VTFJ0n03YeI7ebkDMYPuaWpJmVidVxrHIQusVZ2wF9NWfijYhtjXI7Pe BcI+kEwjmC31Q1/ZhsVqUb9ZE7hGiZ2JUtbys9fVJ5V/Hka9f1hNl4ftSDQ1IgdPM/db WEeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f2h6jFQK; 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 t22-20020a05622a01d600b0031f2a4b508esi7173944qtw.128.2022.07.27.08.58.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jul 2022 08:58:52 -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=f2h6jFQK; 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]:51164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGjQy-0002As-7n for patch@linaro.org; Wed, 27 Jul 2022 11:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGjPC-00025Y-7C for qemu-devel@nongnu.org; Wed, 27 Jul 2022 11:57:02 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGjPA-0001sU-JB for qemu-devel@nongnu.org; Wed, 27 Jul 2022 11:57:01 -0400 Received: by mail-wr1-x436.google.com with SMTP id v13so17284291wru.12 for ; Wed, 27 Jul 2022 08:57:00 -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=9mEcK4sO4rPCFZLLkHp1PXNwdldjaLtha6aYBrlBQcI=; b=f2h6jFQKRucQhcBji1PCOcCqWcHeYIW1dgWiY9O6sUkdqjZ6tRKf2yPGearSXbewwD JnkmHJMizh2OT47mRwa7k7AGEGRNFnWw11qZylSYPIAedg8CFCAjQqDro9kQeeVQCSRk Ie42fcCDpk4J8rKEJ1FrzuIqBtmeIOmYCX46Ky3zkRuadmOjuIgzzBdSFce8iIM/y/5b TKZpKBujdZiPKTKayo0MIFfsQAj0G8VSwYIjmTTeLtedOxlubXQU7IY3UBKrBOV4XQqu dnWKTRxcj7O/URqpbTNAz/5Zv28vhYs9j9u7SAZxG+Z4QNft25aLUoXqdv0vA25xcjfU WKwA== 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=9mEcK4sO4rPCFZLLkHp1PXNwdldjaLtha6aYBrlBQcI=; b=QdY9GySnF33+9RtUo+WvJgiqtB7RatSrVPQav6ztrqVlkUd66kqivPPZRJID2sgf7e F4MxA28qP/Vxg39ApkPYW3VhwZANgFo1kB5Bsz/7BENncGfPqOlP3zFblMJVxn0ZFGL8 p9aJPtuezFgDEqtF8gFdGRpVeJxsDPQ7DkXr//hLddJ1VFrck2g3qJNbmVRtoTXF8kcA v10j9egpumAX//Arthrx/N1XVAzhDD2S1ALfPFyTPJ/JHQ7EzMpXZl60qUZZChQ2Z9sP TLDofLq6e94+0k5Z+PlAXxS/dCX+SHuwPw1FJ+zdH47ehWqYlGbL8TKOYh+wRFYR1z3R iT6Q== X-Gm-Message-State: AJIora96n+SRmb+rZJVkNSVkUs/Jxac1u4NCiG3KsKxZS5vOdwmJxtGc qINqV09HI/+NX4M377e7qydfsw== X-Received: by 2002:adf:f646:0:b0:21d:7000:95b1 with SMTP id x6-20020adff646000000b0021d700095b1mr14574245wrp.486.1658937418222; Wed, 27 Jul 2022 08:56:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o17-20020adfead1000000b0021e4536a948sm17704256wrn.79.2022.07.27.08.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 08:56:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 766191FFB8; Wed, 27 Jul 2022 16:56:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: mst@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Coiby Xu , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PATCH v1 1/5] block/vhost-user-blk-server: don't expose VHOST_USER_F_PROTOCOL_FEATURES Date: Wed, 27 Jul 2022 16:56:49 +0100 Message-Id: <20220727155653.3974426-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220727155653.3974426-1-alex.bennee@linaro.org> References: <20220727155653.3974426-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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=unavailable 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 Message-Id: <20220726192150.2435175-6-alex.bennee@linaro.org> --- 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;