From patchwork Thu Mar 21 14:15:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 229720 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 B8FB92C00C0 for ; Fri, 22 Mar 2013 01:51:14 +1100 (EST) Received: from localhost ([::1]:42638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgK2-0005vj-Tp for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2013 10:18:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgHn-00030t-7G for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIgHZ-0000fP-Q0 for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:16:01 -0400 Received: from greensocs.com ([87.106.252.221]:54611 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgHZ-0000ck-EZ for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:15:53 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 5CF2843EE31; Thu, 21 Mar 2013 14:15:44 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XneI5DLPDb2g; Thu, 21 Mar 2013 15:15:41 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 2041D43EE3C; Thu, 21 Mar 2013 15:15:36 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 3A28E43EE31; Thu, 21 Mar 2013 15:15:35 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Thu, 21 Mar 2013 15:15:14 +0100 Message-Id: <1363875320-7985-5-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1363875320-7985-1-git-send-email-fred.konrad@greensocs.com> References: <1363875320-7985-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, Paolo Bonzini , mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v5 04/10] virtio-scsi: add the virtio-scsi device. 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: KONRAD Frederic Create virtio-scsi which extends virtio-device, so it can be connected on virtio-bus. Signed-off-by: KONRAD Frederic --- hw/virtio-scsi.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- hw/virtio-scsi.h | 5 ++++ 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 08fcb80..56d1b27 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -17,6 +17,7 @@ #include "qemu/error-report.h" #include #include +#include "hw/virtio-bus.h" #define VIRTIO_SCSI_VQ_SIZE 128 #define VIRTIO_SCSI_CDB_SIZE 32 @@ -686,15 +687,30 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { .load_request = virtio_scsi_load_request, }; -VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) +static VirtIODevice *virtio_scsi_common_init(DeviceState *dev, + VirtIOSCSIConf *proxyconf, + VirtIOSCSI **ps) { - VirtIOSCSI *s; + VirtIOSCSI *s = *ps; static int virtio_scsi_id; int i; - s = (VirtIOSCSI *)virtio_common_init("virtio-scsi", VIRTIO_ID_SCSI, - sizeof(VirtIOSCSIConfig), - sizeof(VirtIOSCSI)); + /* + * We have two cases here: the old virtio-scsi-pci device, and the + * refactored virtio-scsi. + */ + + if (s == NULL) { + /* virtio-scsi-pci */ + s = (VirtIOSCSI *)virtio_common_init("virtio-scsi", VIRTIO_ID_SCSI, + sizeof(VirtIOSCSIConfig), + sizeof(VirtIOSCSI)); + } else { + /* virtio-scsi */ + virtio_init(VIRTIO_DEVICE(s), "virtio-scsi", VIRTIO_ID_SCSI, + sizeof(VirtIOSCSIConfig)); + } + s->cmd_vqs = g_malloc0(proxyconf->num_queues * sizeof(VirtQueue *)); s->qdev = dev; @@ -726,6 +742,12 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) return &s->vdev; } +VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) +{ + VirtIOSCSI *s = NULL; + return virtio_scsi_common_init(dev, proxyconf, &s); +} + void virtio_scsi_exit(VirtIODevice *vdev) { VirtIOSCSI *s = (VirtIOSCSI *)vdev; @@ -733,3 +755,56 @@ void virtio_scsi_exit(VirtIODevice *vdev) g_free(s->cmd_vqs); virtio_cleanup(vdev); } + +static int virtio_scsi_device_init(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + VirtIOSCSI *s = VIRTIO_SCSI(vdev); + if (virtio_scsi_common_init(qdev, &(s->conf), &s) == NULL) { + return -1; + } + return 0; +} + +static int virtio_scsi_device_exit(DeviceState *qdev) +{ + VirtIOSCSI *s = VIRTIO_SCSI(qdev); + VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + + unregister_savevm(qdev, "virtio-scsi", s); + g_free(s->cmd_vqs); + virtio_common_cleanup(vdev); + return 0; +} + +static Property virtio_scsi_properties[] = { + DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSI, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_scsi_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); + dc->exit = virtio_scsi_device_exit; + dc->props = virtio_scsi_properties; + vdc->init = virtio_scsi_device_init; + vdc->get_config = virtio_scsi_get_config; + vdc->set_config = virtio_scsi_set_config; + vdc->get_features = virtio_scsi_get_features; + vdc->reset = virtio_scsi_reset; +} + +static const TypeInfo virtio_scsi_info = { + .name = TYPE_VIRTIO_SCSI, + .parent = TYPE_VIRTIO_DEVICE, + .instance_size = sizeof(VirtIOSCSI), + .class_init = virtio_scsi_class_init, +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_scsi_info); +} + +type_init(virtio_register_types) diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h index da02f08..758c29b 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h @@ -18,6 +18,11 @@ #include "hw/pci/pci.h" #include "hw/scsi.h" +#define TYPE_VIRTIO_SCSI "virtio-scsi" +#define VIRTIO_SCSI(obj) \ + OBJECT_CHECK(VirtIOSCSI, (obj), TYPE_VIRTIO_SCSI) + + /* The ID for virtio_scsi */ #define VIRTIO_ID_SCSI 8