From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSm-0003Ps-7D for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4iSf-0006I4-Vj for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60980 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSf-0006Hn-N1 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:17:53 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 1 Aug 2013 04:17:29 +0200 Message-Id: <1375323463-32747-9-git-send-email-afaerber@suse.de> In-Reply-To: <1375323463-32747-1-git-send-email-afaerber@suse.de> References: <1375323463-32747-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-next v2 08/22] virtio-blk: QOM realize preparations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Rename variable qdev -> dev since that's what realize's argument is calle= d by convention. Signed-off-by: Andreas F=C3=A4rber --- hw/block/virtio-blk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 5fb006d..9efc8b7 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -664,8 +664,8 @@ static void virtio_blk_migration_state_changed(Notifi= er *notifier, void *data) =20 static int virtio_blk_device_init(VirtIODevice *vdev) { - DeviceState *qdev =3D DEVICE(vdev); - VirtIOBlock *s =3D VIRTIO_BLK(vdev); + DeviceState *dev =3D DEVICE(vdev); + VirtIOBlock *s =3D VIRTIO_BLK(dev); VirtIOBlkConf *blk =3D &(s->blk); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE Error *err =3D NULL; @@ -709,14 +709,14 @@ static int virtio_blk_device_init(VirtIODevice *vde= v) #endif =20 s->change =3D qemu_add_vm_change_state_handler(virtio_blk_dma_restar= t_cb, s); - register_savevm(qdev, "virtio-blk", virtio_blk_id++, 2, + register_savevm(dev, "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); =20 bdrv_iostatus_enable(s->bs); =20 - add_boot_device_path(s->conf->bootindex, qdev, "/disk@0,0"); + add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); return 0; } =20 --=20 1.8.1.4