From patchwork Mon Feb 11 09:37:27 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: 219550 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 BC26E2C0299 for ; Mon, 11 Feb 2013 20:39:20 +1100 (EST) Received: from localhost ([::1]:33299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4pr5-00031v-03 for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2013 04:39:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4pqM-0002F5-Vd for qemu-devel@nongnu.org; Mon, 11 Feb 2013 04:38:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4pqL-0006U4-At for qemu-devel@nongnu.org; Mon, 11 Feb 2013 04:38:34 -0500 Received: from greensocs.com ([87.106.252.221]:48784 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4pqL-0006Tw-0M for qemu-devel@nongnu.org; Mon, 11 Feb 2013 04:38:33 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 7C0DE43EE34; Mon, 11 Feb 2013 09:38:32 +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 TNJOhDKzP94H; Mon, 11 Feb 2013 10:38:30 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 3245743EE39; Mon, 11 Feb 2013 10:38:30 +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 F302443EE34; Mon, 11 Feb 2013 10:38:28 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 11 Feb 2013 10:37:27 +0100 Message-Id: <1360575449-10445-8-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1360575449-10445-1-git-send-email-fred.konrad@greensocs.com> References: <1360575449-10445-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, agraf@suse.de, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH for-1.5 6/8] virtio-blk: cleanup: init and exit functions. 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 As all virtio-blk-* are switched to the new API, we can remove the separate init/exit for the old API. Signed-off-by: KONRAD Frederic --- hw/virtio-blk.c | 84 +++++++++++++++------------------------------------------ hw/virtio.h | 2 -- 2 files changed, 21 insertions(+), 65 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 6228cb1..2f4cf19 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -633,101 +633,59 @@ void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk) memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); } -static VirtIODevice *virtio_blk_common_init(DeviceState *dev, - VirtIOBlkConf *blk, VirtIOBlock **ps) +static int virtio_blk_device_init(VirtIODevice *vdev) { - VirtIOBlock *s = *ps; + DeviceState *qdev = DEVICE(vdev); + VirtIOBlock *s = VIRTIO_BLK(vdev); + VirtIOBlkConf *blk = &(s->blk); static int virtio_blk_id; if (!blk->conf.bs) { error_report("drive property not set"); - return NULL; + return -1; } if (!bdrv_is_inserted(blk->conf.bs)) { error_report("Device needs media, but drive is empty"); - return NULL; + return -1; } blkconf_serial(&blk->conf, &blk->serial); if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { - return NULL; + return -1; } - /* - * 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)); - } + virtio_init(vdev, "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; - s->vdev.get_features = virtio_blk_get_features; - s->vdev.set_status = virtio_blk_set_status; - s->vdev.reset = virtio_blk_reset; + vdev->get_config = virtio_blk_update_config; + vdev->set_config = virtio_blk_set_config; + vdev->get_features = virtio_blk_get_features; + vdev->set_status = virtio_blk_set_status; + vdev->reset = virtio_blk_reset; s->bs = blk->conf.bs; s->conf = &blk->conf; memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; - s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output); + s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE - if (!virtio_blk_data_plane_create(&s->vdev, blk, &s->dataplane)) { - virtio_cleanup(&s->vdev); - return NULL; + if (!virtio_blk_data_plane_create(vdev, blk, &s->dataplane)) { + virtio_cleanup(vdev); + return -1; } #endif qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s); - s->qdev = dev; - register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, + s->qdev = qdev; + register_savevm(qdev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, s); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); bdrv_set_buffer_alignment(s->bs, s->conf->logical_block_size); bdrv_iostatus_enable(s->bs); - add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); - - 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); - -#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_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; - } + add_boot_device_path(s->conf->bootindex, qdev, "/disk@0,0"); return 0; } diff --git a/hw/virtio.h b/hw/virtio.h index 1e206b8..c0b76a9 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -240,7 +240,6 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ typedef struct VirtIOBlkConf VirtIOBlkConf; -VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); struct virtio_net_conf; VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, struct virtio_net_conf *net, @@ -258,7 +257,6 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); void virtio_net_exit(VirtIODevice *vdev); -void virtio_blk_exit(VirtIODevice *vdev); void virtio_serial_exit(VirtIODevice *vdev); void virtio_balloon_exit(VirtIODevice *vdev); void virtio_scsi_exit(VirtIODevice *vdev);