From patchwork Mon Feb 18 14:15:43 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: 221391 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 EEB432C029C for ; Tue, 19 Feb 2013 01:16:48 +1100 (EST) Received: from localhost ([::1]:45668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7RWR-0002lx-0L for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 09:16:47 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7RW7-0002Qj-Q8 for qemu-devel@nongnu.org; Mon, 18 Feb 2013 09:16:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7RW1-0003Js-Hs for qemu-devel@nongnu.org; Mon, 18 Feb 2013 09:16:27 -0500 Received: from greensocs.com ([87.106.252.221]:46919 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7RW1-0003Jm-8Z for qemu-devel@nongnu.org; Mon, 18 Feb 2013 09:16:21 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id B2D0543EE3B; Mon, 18 Feb 2013 14:16:20 +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 KXDDbWY7bQNe; Mon, 18 Feb 2013 15:16:14 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id D102343EE32; Mon, 18 Feb 2013 15:16:13 +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 9D36D43EE2B; Mon, 18 Feb 2013 15:16:12 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 18 Feb 2013 15:15:43 +0100 Message-Id: <1361196949-4888-3-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1361196949-4888-1-git-send-email-fred.konrad@greensocs.com> References: <1361196949-4888-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: Kevin Wolf , peter.maydell@linaro.org, mark.burton@greensocs.com, Stefan Hajnoczi , afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH V5 2/8] virtio-blk: add the virtio-blk 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-blk which extends virtio-device, so it can be connected on virtio-bus. Signed-off-by: KONRAD Frederic --- hw/virtio-blk.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- hw/virtio-blk.h | 28 +++++++++++++++++ hw/virtio-pci.c | 11 +------ 3 files changed, 121 insertions(+), 15 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index c2c150b..1426cc8 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -21,7 +21,11 @@ #ifdef __linux__ # include #endif +#include "virtio-bus.h" +/* + * Moving to QOM later in this series. + */ static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) { return (VirtIOBlock *)vdev; @@ -620,9 +624,16 @@ static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, }; -VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) +void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk) { - VirtIOBlock *s; + VirtIOBlock *s = VIRTIO_BLK(dev); + memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); +} + +static VirtIODevice *virtio_blk_common_init(DeviceState *dev, + VirtIOBlkConf *blk, VirtIOBlock **ps) +{ + VirtIOBlock *s = *ps; static int virtio_blk_id; if (!blk->conf.bs) { @@ -639,9 +650,20 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) return NULL; } - s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, - sizeof(struct virtio_blk_config), - sizeof(VirtIOBlock)); + /* + * We have two cases here: the old virtio-blk-pci device, and the + * refactored virtio-blk. + */ + if (s == NULL) { + /* virtio-blk-pci */ + s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, + sizeof(struct virtio_blk_config), + sizeof(VirtIOBlock)); + } else { + /* virtio-blk */ + virtio_init(VIRTIO_DEVICE(s), "virtio-blk", VIRTIO_ID_BLOCK, + sizeof(struct virtio_blk_config)); + } s->vdev.get_config = virtio_blk_update_config; s->vdev.set_config = virtio_blk_set_config; @@ -675,6 +697,12 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) return &s->vdev; } +VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) +{ + VirtIOBlock *s = NULL; + return virtio_blk_common_init(dev, blk, &s); +} + void virtio_blk_exit(VirtIODevice *vdev) { VirtIOBlock *s = to_virtio_blk(vdev); @@ -687,3 +715,62 @@ void virtio_blk_exit(VirtIODevice *vdev) blockdev_mark_auto_del(s->bs); virtio_cleanup(vdev); } + + +static int virtio_blk_device_init(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + VirtIOBlock *s = VIRTIO_BLK(vdev); + VirtIOBlkConf *blk = &(s->blk); + if (virtio_blk_common_init(qdev, blk, &s) == NULL) { + return -1; + } + return 0; +} + +static int virtio_blk_device_exit(DeviceState *dev) +{ + VirtIODevice *vdev = VIRTIO_DEVICE(dev); + VirtIOBlock *s = VIRTIO_BLK(dev); +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE + virtio_blk_data_plane_destroy(s->dataplane); + s->dataplane = NULL; +#endif + unregister_savevm(s->qdev, "virtio-blk", s); + blockdev_mark_auto_del(s->bs); + virtio_common_cleanup(vdev); + return 0; +} + +static Property virtio_blk_properties[] = { + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlock, blk) + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_blk_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); + dc->exit = virtio_blk_device_exit; + dc->props = virtio_blk_properties; + vdc->init = virtio_blk_device_init; + vdc->get_config = virtio_blk_update_config; + vdc->set_config = virtio_blk_set_config; + vdc->get_features = virtio_blk_get_features; + vdc->set_status = virtio_blk_set_status; + vdc->reset = virtio_blk_reset; +} + +static const TypeInfo virtio_device_info = { + .name = TYPE_VIRTIO_BLK, + .parent = TYPE_VIRTIO_DEVICE, + .instance_size = sizeof(VirtIOBlock), + .class_init = virtio_blk_class_init, +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_device_info); +} + +type_init(virtio_register_types) diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 9b018fb..4f86597 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -20,6 +20,10 @@ #include "hw/dataplane/virtio-blk.h" #endif +#define TYPE_VIRTIO_BLK "virtio-blk" +#define VIRTIO_BLK(obj) \ + OBJECT_CHECK(VirtIOBlock, (obj), TYPE_VIRTIO_BLK) + /* from Linux's linux/virtio_blk.h */ /* The ID for virtio_block */ @@ -129,4 +133,28 @@ typedef struct VirtIOBlock { #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \ DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE +#define DEFINE_DATA_PLANE_PROPERTIES(_state, _field) \ + DEFINE_PROP_BIT("x-data-plane", _state, _field.data_plane, 0, false), +#else +#define DEFINE_DATA_PLANE_PROPERTIES(_state, _field) +#endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */ + +#ifdef __linux__ +#define DEFINE_VIRTIO_BLK_SCSI_PROPERTY(_state, _field) \ + DEFINE_PROP_BIT("scsi", _state, _field.scsi, 0, true), +#else +#define DEFINE_VIRTIO_BLK_SCSI_PROPERTY(_state, _field) +#endif /* __linux__ */ + +#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _field) \ + DEFINE_BLOCK_PROPERTIES(_state, _field.conf), \ + DEFINE_BLOCK_CHS_PROPERTIES(_state, _field.conf), \ + DEFINE_PROP_STRING("serial", _state, _field.serial), \ + DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true), \ + DEFINE_VIRTIO_BLK_SCSI_PROPERTY(_state, _field) \ + DEFINE_DATA_PLANE_PROPERTIES(_state, _field) + +void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); + #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index a869f53..d01fa43 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -1081,19 +1081,10 @@ static void virtio_rng_exit_pci(PCIDevice *pci_dev) static Property virtio_blk_properties[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), - DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, blk.conf), - DEFINE_BLOCK_CHS_PROPERTIES(VirtIOPCIProxy, blk.conf), - DEFINE_PROP_STRING("serial", VirtIOPCIProxy, blk.serial), -#ifdef __linux__ - DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true), -#endif - DEFINE_PROP_BIT("config-wce", VirtIOPCIProxy, blk.config_wce, 0, true), DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE - DEFINE_PROP_BIT("x-data-plane", VirtIOPCIProxy, blk.data_plane, 0, false), -#endif DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOPCIProxy, blk) DEFINE_PROP_END_OF_LIST(), };