From nobody Wed Nov 5 10:12:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153375992204720.204179795698906; Wed, 8 Aug 2018 13:25:22 -0700 (PDT) Received: from localhost ([::1]:45342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnV1F-0006bt-0G for importer@patchew.org; Wed, 08 Aug 2018 16:25:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnUzo-0005hi-LI for qemu-devel@nongnu.org; Wed, 08 Aug 2018 16:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnUzk-0001Ri-0s for qemu-devel@nongnu.org; Wed, 08 Aug 2018 16:23:52 -0400 Received: from legacy.ddn.com ([64.47.133.206]:26371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnUzj-0001Qh-RC for qemu-devel@nongnu.org; Wed, 08 Aug 2018 16:23:47 -0400 Received: from LAX-EX-CAHT3.datadirect.datadirectnet.com (10.8.103.85) by LAX-EX-CAHT3.datadirect.datadirectnet.com (10.8.103.85) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 8 Aug 2018 12:53:42 -0700 Received: from LAX-EX-CAHT1.datadirect.datadirectnet.com (10.8.103.81) by LAX-EX-CAHT3.datadirect.datadirectnet.com (10.8.103.85) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Wed, 8 Aug 2018 12:53:42 -0700 Received: from psuche.datadirect.datadirectnet.com (10.48.114.46) by LAX-EX-CAHT1.datadirect.datadirectnet.com (10.8.103.81) with Microsoft SMTP Server (TLS) id 14.3.389.1; Wed, 8 Aug 2018 12:53:41 -0700 From: Greg Edwards To: Date: Wed, 8 Aug 2018 13:52:34 -0600 Message-ID: <20180808195235.5843-3-gedwards@ddn.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180808195235.5843-1-gedwards@ddn.com> References: <20180808195235.5843-1-gedwards@ddn.com> MIME-Version: 1.0 X-Originating-IP: [10.48.114.46] X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 64.47.133.206 Subject: [Qemu-devel] [PATCH 2/3] vhost-scsi: unify vhost-scsi get_features implementations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , "Michael S. Tsirkin" , Greg Edwards , "Nicholas A. Bellinger" , Felipe Franciosi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the enablement of preset host features into the common vhost_scsi_common_get_features() function. This is in preparation for having vhost-scsi also make use of host_features. Signed-off-by: Greg Edwards Reviewed-by: Felipe Franciosi --- hw/scsi/vhost-scsi-common.c | 3 +++ hw/scsi/vhost-user-scsi.c | 14 +------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index e2a5828af137..b7fbab65dd17 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -96,6 +96,9 @@ uint64_t vhost_scsi_common_get_features(VirtIODevice *vde= v, uint64_t features, { VHostSCSICommon *vsc =3D VHOST_SCSI_COMMON(vdev); =20 + /* Turn on predefined features supported by this device */ + features |=3D vsc->host_features; + return vhost_get_features(&vsc->dev, vsc->feature_bits, features); } =20 diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 694cb801209a..26491daaa0bf 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -137,18 +137,6 @@ static void vhost_user_scsi_unrealize(DeviceState *dev= , Error **errp) } } =20 -static uint64_t vhost_user_scsi_get_features(VirtIODevice *vdev, - uint64_t features, Error **er= rp) -{ - VHostUserSCSI *s =3D VHOST_USER_SCSI(vdev); - VHostSCSICommon *vsc =3D VHOST_SCSI_COMMON(s); - - /* Turn on predefined features supported by this device */ - features |=3D vsc->host_features; - - return vhost_scsi_common_get_features(vdev, features, errp); -} - static Property vhost_user_scsi_properties[] =3D { DEFINE_PROP_CHR("chardev", VirtIOSCSICommon, conf.chardev), DEFINE_PROP_UINT32("boot_tpgt", VirtIOSCSICommon, conf.boot_tpgt, 0), @@ -188,7 +176,7 @@ static void vhost_user_scsi_class_init(ObjectClass *kla= ss, void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); vdc->realize =3D vhost_user_scsi_realize; vdc->unrealize =3D vhost_user_scsi_unrealize; - vdc->get_features =3D vhost_user_scsi_get_features; + vdc->get_features =3D vhost_scsi_common_get_features; vdc->set_config =3D vhost_scsi_common_set_config; vdc->set_status =3D vhost_user_scsi_set_status; fwc->get_dev_path =3D vhost_scsi_common_get_fw_dev_path; --=20 2.17.1