From patchwork Mon Nov 21 15:50:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1707452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Lt3grhdm; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NGBj30bKDz23lT for ; Tue, 22 Nov 2022 02:52:07 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ox94a-0000ql-Kk; Mon, 21 Nov 2022 10:51:04 -0500 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 1ox94C-0000OY-ED for qemu-ppc@nongnu.org; Mon, 21 Nov 2022 10:50:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox94A-0002YE-Te for qemu-ppc@nongnu.org; Mon, 21 Nov 2022 10:50:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669045838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=11mQA/05+pSppc252k7+Qv9UxlTrd3BcJ4pTHErcORk=; b=Lt3grhdmFhB7vbCWWIDfanY+N5xS0vwtBZp3Vn51W9hYlHRUJw9KSdpindE9kwQ4BhvQRi YBdiY/e2IlGVAPeqA1204fzXBpu1bKHf46GF2sL06WNY6vvdL3axuGSrNb+yUCavXPAGBC WOGxUxjDXZDUJZCay5xBYAvXFfZhxGs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-jm0FEVSGMHuqajhBof-XWA-1; Mon, 21 Nov 2022 10:50:35 -0500 X-MC-Unique: jm0FEVSGMHuqajhBof-XWA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8789F1991C58; Mon, 21 Nov 2022 15:50:34 +0000 (UTC) Received: from localhost (unknown [10.39.195.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA47740C83BB; Mon, 21 Nov 2022 15:50:33 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Laurent Vivier , =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Gibson , Hanna Reitz , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Stefan Hajnoczi , Fam Zheng , Paolo Bonzini , Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Jason Wang , Amit Shah , Kevin Wolf , David Hildenbrand , Cornelia Huck Subject: [PATCH RESEND v3 2/2] virtio: remove unnecessary host_features in ->get_features() Date: Mon, 21 Nov 2022 10:50:20 -0500 Message-Id: <20221121155020.1915166-3-stefanha@redhat.com> In-Reply-To: <20221121155020.1915166-1-stefanha@redhat.com> References: <20221121155020.1915166-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Since at least commit 6b8f1020540c27246277377aa2c3331ad2bfb160 ("virtio: move host_features") the ->get_features() function has been called with host_features as an argument. Some devices manually add host_features in ->get_features() although the features argument already contains host_features. Make all devices consistent by dropping the unnecessary code. Cc: Cornelia Huck Signed-off-by: Stefan Hajnoczi Reviewed-by: Cornelia Huck --- hw/block/virtio-blk.c | 3 --- hw/char/virtio-serial-bus.c | 1 - hw/net/virtio-net.c | 3 --- hw/scsi/vhost-scsi-common.c | 3 --- hw/scsi/virtio-scsi.c | 4 ---- hw/virtio/virtio-balloon.c | 2 -- 6 files changed, 16 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f717550fdc..a744012fec 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -983,9 +983,6 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, { VirtIOBlock *s = VIRTIO_BLK(vdev); - /* Firstly sync all virtio-blk possible supported features */ - features |= s->host_features; - virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX); virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY); virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY); diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 7d4601cb5d..1414fb85ae 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -557,7 +557,6 @@ static uint64_t get_features(VirtIODevice *vdev, uint64_t features, vser = VIRTIO_SERIAL(vdev); - features |= vser->host_features; if (vser->bus.max_nr_ports > 1) { virtio_add_feature(&features, VIRTIO_CONSOLE_F_MULTIPORT); } diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index aba12759d5..35b45eb6e3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -777,9 +777,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, VirtIONet *n = VIRTIO_NET(vdev); NetClientState *nc = qemu_get_queue(n->nic); - /* Firstly sync all virtio-net possible supported features */ - features |= n->host_features; - virtio_add_feature(&features, VIRTIO_NET_F_MAC); if (!peer_has_vnet_hdr(n)) { diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index 767f827e55..8b26f90aa1 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -124,9 +124,6 @@ uint64_t vhost_scsi_common_get_features(VirtIODevice *vdev, uint64_t features, { VHostSCSICommon *vsc = VHOST_SCSI_COMMON(vdev); - /* Turn on predefined features supported by this device */ - features |= vsc->host_features; - return vhost_get_features(&vsc->dev, vsc->feature_bits, features); } diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 6f6e2e32ba..40e10322fb 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -817,10 +817,6 @@ static uint64_t virtio_scsi_get_features(VirtIODevice *vdev, uint64_t requested_features, Error **errp) { - VirtIOSCSI *s = VIRTIO_SCSI(vdev); - - /* Firstly sync all virtio-scsi possible supported features */ - requested_features |= s->host_features; return requested_features; } diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 73ac5eb675..0e9ca71b15 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -796,8 +796,6 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f, Error **errp) { - VirtIOBalloon *dev = VIRTIO_BALLOON(vdev); - f |= dev->host_features; virtio_add_feature(&f, VIRTIO_BALLOON_F_STATS_VQ); return f;