From patchwork Fri Apr 19 14:24:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 238009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 64C8B2C01B8 for ; Sat, 20 Apr 2013 00:49:07 +1000 (EST) Received: from localhost ([::1]:49649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCIL-0006IX-Iq for incoming@patchwork.ozlabs.org; Fri, 19 Apr 2013 10:28:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCF2-0000rP-Vv for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTCEz-0003QN-Pg for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:44 -0400 Received: from mail-ea0-x229.google.com ([2a00:1450:4013:c01::229]:40132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCEz-0003Nq-Aa for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:41 -0400 Received: by mail-ea0-f169.google.com with SMTP id n15so1851080ead.0 for ; Fri, 19 Apr 2013 07:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=j0Y1OuKI21UkF6/G6dGtXAgdqUgNNfSiTF4dFOsI8dY=; b=GulVLrgW2HSlLlCt9JoAFZNv925NzYqSCZvhx0oTeVqteqqsb/pu9bz6dVTJRZhnlr Be4s0OQfrtTXeWNUvlgLNPbwGGJ+EZ09vg85uIVztFGHUWVuTh5u4HWCog2X2fdWguw5 Im1mxuqEpP5wpACrOnFx36J6c3Q+c/IpC4UtiJxo+2xWi2wtyiPGu2bZ9QrKSWqV+0wv XOEF/SWs2Of7DPD3BPS7VcF8sUaC+BBJK4mO1y9nYxIMns9tLkpQvQlOxfV2F72hCFW5 kPH1OdbJbxdFMenlWraeGdzajzYaiHhXquCWGudZ93dEqllwSzHjKo1ssEZUQo2vzNJk KkBw== X-Received: by 10.14.177.197 with SMTP id d45mr21413736eem.9.1366381480534; Fri, 19 Apr 2013 07:24:40 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id cb50sm23384359eeb.14.2013.04.19.07.24.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 19 Apr 2013 07:24:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Apr 2013 16:24:18 +0200 Message-Id: <1366381460-6041-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> References: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::229 Cc: asias@redhat.com, nab@linux-iscsi.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 7/9] vhost-scsi-pci: new device supporting the tcm_vhost Linux kernel module 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: Nicholas Bellinger Cc: Michael S. Tsirkin Signed-off-by: Nicholas Bellinger Signed-off-by: Asias He Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-pci.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio/virtio-pci.h | 18 +++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index b362cc8..c1e9a60 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1285,6 +1285,63 @@ static const TypeInfo virtio_scsi_pci_info = { .class_init = virtio_scsi_pci_class_init, }; +/* vhost-scsi-pci */ + +#ifdef CONFIG_VHOST_SCSI +static Property vhost_scsi_pci_properties[] = { + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, + DEV_NVECTORS_UNSPECIFIED), + DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), + DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSIPCI, vdev.parent_obj.conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static int vhost_scsi_pci_init_pci(VirtIOPCIProxy *vpci_dev) +{ + VHostSCSIPCI *dev = VHOST_SCSI_PCI(vpci_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); + + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { + vpci_dev->nvectors = vs->conf.num_queues + 3; + } + + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); + if (qdev_init(vdev) < 0) { + return -1; + } + return 0; +} + +static void vhost_scsi_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); + PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass); + k->init = vhost_scsi_pci_init_pci; + dc->props = vhost_scsi_pci_properties; + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI; + pcidev_k->revision = 0x00; + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI; +} + +static void vhost_scsi_pci_instance_init(Object *obj) +{ + VHostSCSIPCI *dev = VHOST_SCSI_PCI(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VHOST_SCSI); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); +} + +static const TypeInfo vhost_scsi_pci_info = { + .name = TYPE_VHOST_SCSI_PCI, + .parent = TYPE_VIRTIO_PCI, + .instance_size = sizeof(VHostSCSIPCI), + .instance_init = vhost_scsi_pci_instance_init, + .class_init = vhost_scsi_pci_class_init, +}; +#endif + /* virtio-balloon-pci */ static void balloon_pci_stats_get_all(Object *obj, struct Visitor *v, @@ -1541,6 +1598,9 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_balloon_pci_info); type_register_static(&virtio_serial_pci_info); type_register_static(&virtio_net_pci_info); +#ifdef CONFIG_VHOST_SCSI + type_register_static(&vhost_scsi_pci_info); +#endif } type_init(virtio_pci_register_types) diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index aa67561..1b66e46 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -24,6 +24,9 @@ #include "hw/virtio/virtio-balloon.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-9p.h" +#ifdef CONFIG_VHOST_SCSI +#include "hw/virtio/vhost-scsi.h" +#endif typedef struct VirtIOPCIProxy VirtIOPCIProxy; typedef struct VirtIOBlkPCI VirtIOBlkPCI; @@ -31,6 +34,7 @@ typedef struct VirtIOSCSIPCI VirtIOSCSIPCI; typedef struct VirtIOBalloonPCI VirtIOBalloonPCI; typedef struct VirtIOSerialPCI VirtIOSerialPCI; typedef struct VirtIONetPCI VirtIONetPCI; +typedef struct VHostSCSIPCI VHostSCSIPCI; /* virtio-pci-bus */ @@ -104,6 +108,20 @@ struct VirtIOSCSIPCI { VirtIOSCSI vdev; }; +#ifdef CONFIG_VHOST_SCSI +/* + * vhost-scsi-pci: This extends VirtioPCIProxy. + */ +#define TYPE_VHOST_SCSI_PCI "vhost-scsi-pci" +#define VHOST_SCSI_PCI(obj) \ + OBJECT_CHECK(VHostSCSIPCI, (obj), TYPE_VHOST_SCSI_PCI) + +struct VHostSCSIPCI { + VirtIOPCIProxy parent_obj; + VHostSCSI vdev; +}; +#endif + /* * virtio-blk-pci: This extends VirtioPCIProxy. */