From patchwork Wed Apr 25 05:54:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 154807 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 C8804B6FAA for ; Wed, 25 Apr 2012 16:21:07 +1000 (EST) Received: from localhost ([::1]:45186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvCL-0004ne-1c for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 01:55:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBW-0002rk-4F for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMvBT-0006ju-Ug for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:37 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:32309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBT-0006iy-Oy for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:35 -0400 Received: from euspt2 (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0M300067GTQRBC@mailout2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:28 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.9.191]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M300064STQJKX@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:31 +0100 (BST) Date: Wed, 25 Apr 2012 09:54:16 +0400 From: Evgeny Voevodin In-reply-to: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335333257-5128-9-git-send-email-e.voevodin@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.5.4 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.12 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, i.mitsyanko@samsung.com, Evgeny Voevodin , kyungmin.park@samsung.com, d.solodkiy@samsung.com, m.kozlov@samsung.com Subject: [Qemu-devel] [RFC 8/9] hw/virtio-blk.c: Add 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 Signed-off-by: Evgeny Voevodin --- hw/virtio-blk.c | 42 ++++++++++++++++++++++++++++++++++++++++++ hw/virtio-blk.h | 11 +++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 49990f8..b6c5ff5 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -15,6 +15,7 @@ #include "qemu-error.h" #include "trace.h" #include "blockdev.h" +#include "virtio-transport.h" #include "virtio-blk.h" #include "scsi-defs.h" #ifdef __linux__ @@ -628,3 +629,44 @@ void virtio_blk_exit(VirtIODevice *vdev) unregister_savevm(s->qdev, "virtio-blk", s); virtio_cleanup(vdev); } + +/******************** VirtIOBlk Device **********************/ + +static int virtio_blkdev_init(DeviceState *dev) +{ + VirtIODevice *vdev; + VirtIOBlockState *proxy = VIRTIO_BLK_FROM_QDEV(dev); + vdev = virtio_blk_init(dev, &proxy->block, &proxy->block_serial); + if (!vdev) { + return -1; + } + return virtio_init_transport(dev, vdev); +} + +static Property virtio_blkdev_properties[] = { + DEFINE_BLOCK_PROPERTIES(VirtIOBlockState, block), + DEFINE_PROP_STRING("serial", VirtIOBlockState, block_serial), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_blkdev_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + dc->init = virtio_blkdev_init; + dc->props = virtio_blkdev_properties; + dc->bus_info = &virtio_transport_bus_info; +} + +static TypeInfo virtio_blkdev_info = { + .name = "virtio-blk", + .parent = TYPE_DEVICE, + .instance_size = sizeof(VirtIOBlockState), + .class_init = virtio_blkdev_class_init, +}; + +static void virtio_blk_register_types(void) +{ + type_register_static(&virtio_blkdev_info); +} + +type_init(virtio_blk_register_types) diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 244dce4..34ae7ce 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -14,6 +14,7 @@ #ifndef _QEMU_VIRTIO_BLK_H #define _QEMU_VIRTIO_BLK_H +#include "sysbus.h" #include "virtio.h" #include "block.h" @@ -105,4 +106,14 @@ struct virtio_scsi_inhdr #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \ DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) #endif + +typedef struct { + DeviceState qdev; + /* virtio-blk */ + BlockConf block; + char *block_serial; +} VirtIOBlockState; + +#define VIRTIO_BLK_FROM_QDEV(dev) DO_UPCAST(VirtIOBlockState, qdev, dev) + #endif