From nobody Thu Dec 18 08:07:43 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665425572; cv=none; d=zohomail.com; s=zohoarc; b=URBWtHoAWgliw3ksjX9FgbH/QVHER6ZlEE3Ox+irttuhwNWtanNTab+iP0ZTwXqYlMIHkmr8B6OZK76cuLWRCp1vgQa4Ni6AQCihanUhY0oPpMR8TnbvF3TjvdieMS6ZlGbJ2ZZoPEkMW9XkhrW8tFp/9cVMFlclUPKX8udyMVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665425572; h=Content-Type: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=nwQqJJKVMasq8hTvkgVk+GPfDm74v8D53BZJ0ZT5e8E=; b=VhPnjptpwOWguowjud+2EW5rPlrTZi1BclDb48hgehklTlxxLR8TKreisEtkv1Z3wczmM6Nq8gxEK++mUeie4e/Eu+wAo+mc4QJrWKR0UYojMJ9dQw9+eJuNAJSDFRBhfZIT+gJu4GwzQKEtncnczT9fEMIZsOq00JU0svpOJnA= 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 1665425572418526.0812268597904; Mon, 10 Oct 2022 11:12:52 -0700 (PDT) Received: from localhost ([::1]:49474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohxGk-0007Ja-4d for importer@patchew.org; Mon, 10 Oct 2022 14:12:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohwbj-0002Mo-LL for qemu-devel@nongnu.org; Mon, 10 Oct 2022 13:30:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohwbf-0006xJ-6R for qemu-devel@nongnu.org; Mon, 10 Oct 2022 13:30:27 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-488-KZDAiW3jOUWsrk6VhxQDFw-1; Mon, 10 Oct 2022 13:30:21 -0400 Received: by mail-wm1-f70.google.com with SMTP id l1-20020a7bc341000000b003bfe1273d6cso3261638wmj.4 for ; Mon, 10 Oct 2022 10:30:21 -0700 (PDT) Received: from redhat.com ([2.55.183.131]) by smtp.gmail.com with ESMTPSA id w9-20020a1cf609000000b003b332a7b898sm10474980wmc.45.2022.10.10.10.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 10:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665423022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nwQqJJKVMasq8hTvkgVk+GPfDm74v8D53BZJ0ZT5e8E=; b=eCjqeRVd67qxiCgkZd0Mrp2lX+yKbMjHwEKMbQcGMXLFJI4SXUM6if/JJQlpEbdPvsX5h+ ltNoLM0HznO25iigc1Vde854ExM/Jez64itShXuUHDkLJA4P7OrhdwhrMwmpzEKfW7FHS4 Y21Jiq/9N+CANYlsluJj7pwwdDdkl30= X-MC-Unique: KZDAiW3jOUWsrk6VhxQDFw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nwQqJJKVMasq8hTvkgVk+GPfDm74v8D53BZJ0ZT5e8E=; b=wRG70aVul1f2FakGZd+VB7/eS9jhVbz6uDZ6+Rrqqj66k2NaevGoisfgjhHPmenSxI USjWnKzgP+9nz3vf/X6J8fdBmhM4eqVAJGNdl4tHmc2bkM4mYL3RYgT6WPWXWSOVQ+m9 erJRbph6kTR1oJWiNKHh2FDSPLzF/DQbapl16IOlBUgy/IZtR7QSLrK06OsfrJ2pv+SO 87N3NlXA51cclNlMx04nKyS4m+lY58LBtadQ8iKx5RHrnFfs38A/BJKNqAZUUZRneva7 /ahrFsrbk78DeMMpsp24LyYhdO5nReLyTd3QOuDhqxm+GtarV5jKVeoZ0mb7vmSqGpwX jPkg== X-Gm-Message-State: ACrzQf1dZgSe039J+84SajoLgLLm6pjpjJi3HnPUZW4HeFfFrht7oWg/ k9kb3QSw1W6YdrgwyjQVFdPEx0g8xD84tNIQzFzMoYdVt0zFbrsjnpplfcvLI0245E/FsVMjedJ kPP02dZKZ9VX1Ei/cUeZYjeSugPOgIsu8ysFIZsmod8W64S1ngxHP78lYAZNX X-Received: by 2002:a05:6000:5ca:b0:22e:5477:1296 with SMTP id bh10-20020a05600005ca00b0022e54771296mr12578569wrb.377.1665423019806; Mon, 10 Oct 2022 10:30:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5SK3e3T9Zo2LqcB5MLF9e+7vHQWcVKl8ALLPvt139uI/AmpZ4CHrtuTHvVPGK+Mb1DVB0kPQ== X-Received: by 2002:a05:6000:5ca:b0:22e:5477:1296 with SMTP id bh10-20020a05600005ca00b0022e54771296mr12578553wrb.377.1665423019575; Mon, 10 Oct 2022 10:30:19 -0700 (PDT) Date: Mon, 10 Oct 2022 13:30:15 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Daniil Tatianin , Raphael Norwitz , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Subject: [PULL 22/55] vhost-user-blk: make it possible to disable write-zeroes/discard Message-ID: <20221010172813.204597-23-mst@redhat.com> References: <20221010172813.204597-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221010172813.204597-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665425574673100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniil Tatianin It is useful to have the ability to disable these features for compatibility with older VMs that don't have these implemented. Signed-off-by: Daniil Tatianin Reviewed-by: Raphael Norwitz Message-Id: <20220906073111.353245-4-d-tatianin@yandex-team.ru> Reviewed-by: Raphael Norwitz Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/block/vhost-user-blk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 2bba42478d..92bfe56b45 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -259,8 +259,6 @@ static uint64_t vhost_user_blk_get_features(VirtIODevic= e *vdev, virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE); virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH); virtio_add_feature(&features, VIRTIO_BLK_F_RO); - virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD); - virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES); =20 if (s->config_wce) { virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE); @@ -598,6 +596,10 @@ static Property vhost_user_blk_properties[] =3D { VHOST_USER_BLK_AUTO_NUM_QUEUES), DEFINE_PROP_UINT32("queue-size", VHostUserBlk, queue_size, 128), DEFINE_PROP_BIT("config-wce", VHostUserBlk, config_wce, 0, true), + DEFINE_PROP_BIT64("discard", VHostUserBlk, parent_obj.host_features, + VIRTIO_BLK_F_DISCARD, true), + DEFINE_PROP_BIT64("write-zeroes", VHostUserBlk, parent_obj.host_featur= es, + VIRTIO_BLK_F_WRITE_ZEROES, true), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 MST