From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlGLj-00059O-K6 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlGLh-0001nY-CP for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:03 -0500 Received: from greensocs.com ([87.106.252.221]:54857 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlGLh-0001nN-55 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:01 -0500 From: fred.konrad@greensocs.com Date: Wed, 19 Dec 2012 10:53:38 +0100 Message-Id: <1355910821-21302-13-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1355910821-21302-1-git-send-email-fred.konrad@greensocs.com> References: <1355910821-21302-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [RFC PATCH V8 12/15] virtio-blk : cleanup : remove qdev field. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, agraf@suse.de, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic The qdev field is not needed, just drop it. Signed-off-by: KONRAD Frederic --- hw/virtio-blk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 93b9746..65932fd 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -33,7 +33,6 @@ typedef struct VirtIOBlock BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; - DeviceState *qdev; } VirtIOBlock; typedef struct VirtIOBlockReq @@ -643,7 +642,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev) s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output); qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s); - 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); @@ -658,7 +656,7 @@ static int virtio_blk_device_exit(DeviceState *dev) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOBlock *s = VIRTIO_BLK(dev); - unregister_savevm(s->qdev, "virtio-blk", s); + unregister_savevm(dev, "virtio-blk", s); blockdev_mark_auto_del(s->bs); virtio_common_cleanup(vdev); return 0; -- 1.7.11.7