From patchwork Mon Apr 20 08:20:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 462738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 675CF1401F0 for ; Mon, 20 Apr 2015 18:22:43 +1000 (AEST) Received: from localhost ([::1]:52296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk6yX-0002R9-2l for incoming@patchwork.ozlabs.org; Mon, 20 Apr 2015 04:22:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk6wh-0008Ku-1B for qemu-devel@nongnu.org; Mon, 20 Apr 2015 04:20:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yk6wc-0004Jq-Az for qemu-devel@nongnu.org; Mon, 20 Apr 2015 04:20:46 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:35586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk6wc-0004Jd-0M for qemu-devel@nongnu.org; Mon, 20 Apr 2015 04:20:42 -0400 Received: by pdbqd1 with SMTP id qd1so200845245pdb.2 for ; Mon, 20 Apr 2015 01:20:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eee3likLh23cubD+OpJDpq5WZyAkH17h8tAqubma0x8=; b=eeBVI+UwDeUZj9IvELuhljd7ows5uGlP0r+CLFWvGm/ZXcXynBAKWtAWfGNl8F4abn IFUiOEI1aMJmnZLTgn1KhLEPO4oXHDtGynAu3wYd27LPMTfwPyH//lMRcKzLH/Ujd0xt d4dkncMC3BKFa4LNRIRB7P2TAQDyX7IZWPbsunyGfrejZ/fvU+XgKC5hkITQVIyz4CvR Qo5iJtDJFZt5NCPf4soYpiJ3IreByGviyFj1yi64NGO2fhN7VCz5s7CC7X/SFd81QnhS fbRD+cU1LUSUWPRBW7752NIKE3/IPlV1/xtuqdOVzdSk+QyrEw0upAr46rcU14Cfgzsd R+lQ== X-Gm-Message-State: ALoCoQneIeNNAOvjN9cZNBXNMVWmPFzqu0Rjr29YrIQM5yqYFD0lLziRSy5yKEQF/sCObC0yIjEn X-Received: by 10.68.201.138 with SMTP id ka10mr26463689pbc.6.1429518041348; Mon, 20 Apr 2015 01:20:41 -0700 (PDT) Received: from localhost ([107.181.77.18]) by mx.google.com with ESMTPSA id f12sm17430424pat.43.2015.04.20.01.20.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 20 Apr 2015 01:20:40 -0700 (PDT) From: shannon.zhao@linaro.org To: qemu-devel@nongnu.org, peter.maydell@linaro.org, cornelia.huck@de.ibm.com, mst@redhat.com, pbonzini@redhat.com, christoffer.dall@linaro.org Date: Mon, 20 Apr 2015 16:20:01 +0800 Message-Id: <1429518001-1040-3-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429518001-1040-1-git-send-email-shannon.zhao@linaro.org> References: <1429518001-1040-1-git-send-email-shannon.zhao@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.179 Cc: hangaohuai@huawei.com, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v2 2/2] virtio-scsi: Move DEFINE_VIRTIO_SCSI_FEATURES to virtio-scsi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Shannon Zhao Move DEFINE_VIRTIO_SCSI_FEATURES to the backend virtio-scsi. The transports just sync the host features from backend. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/s390x/s390-virtio-bus.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/scsi/virtio-scsi.c | 5 +++++ hw/virtio/virtio-pci.c | 1 - include/hw/virtio/virtio-scsi.h | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 1987873..72c205e 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -623,7 +623,6 @@ static const TypeInfo virtio_s390_device_info = { static Property s390_virtio_scsi_properties[] = { DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features), - DEFINE_VIRTIO_SCSI_FEATURES(VirtIOS390Device, host_features), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index d9dc80c..754ce18 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1503,7 +1503,6 @@ static const TypeInfo virtio_ccw_balloon = { static Property virtio_ccw_scsi_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), - DEFINE_VIRTIO_SCSI_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index da0cff8..719740e 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -627,6 +627,10 @@ static void virtio_scsi_set_config(VirtIODevice *vdev, static uint32_t virtio_scsi_get_features(VirtIODevice *vdev, uint32_t requested_features) { + VirtIOSCSI *s = VIRTIO_SCSI(vdev); + + /* First sync all virtio-scsi possible supported features */ + requested_features |= s->host_features; return requested_features; } @@ -941,6 +945,7 @@ static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp) static Property virtio_scsi_properties[] = { DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSI, parent_obj.conf), + DEFINE_VIRTIO_SCSI_FEATURES(VirtIOSCSI, host_features), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 772244e..7e2ac9e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1078,7 +1078,6 @@ static Property virtio_scsi_pci_properties[] = { VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, DEV_NVECTORS_UNSPECIFIED), - DEFINE_VIRTIO_SCSI_FEATURES(VirtIOPCIProxy, host_features), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index f93b57d..b42e7f1 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -98,6 +98,7 @@ typedef struct VirtIOSCSI { bool dataplane_fenced; Error *blocker; Notifier migration_state_notifier; + uint32_t host_features; } VirtIOSCSI; typedef struct VirtIOSCSIReq {