From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQIk9-0000TR-Fu for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQIk3-0001Py-DI for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQIk3-0001Po-5j for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:19 -0400 From: Stefan Hajnoczi Date: Wed, 19 Mar 2014 16:48:57 +0100 Message-Id: <1395244138-8834-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1395244138-8834-1-git-send-email-stefanha@redhat.com> References: <1395244138-8834-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [RFC 4/5] virtio-blk: drop virtio_blk_set_conf() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Andreas Faerber , Stefan Hajnoczi , fred.konrad@greensocs.com This function is no longer used since parent objects now use qdev child alias properties to set the VirtIOBlkConf directly. Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 6 ------ include/hw/virtio/virtio-blk.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 8a568e5..4781351 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -642,12 +642,6 @@ static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, }; -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk) -{ - VirtIOBlock *s = VIRTIO_BLK(dev); - memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); -} - #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE /* Disable dataplane thread during live migration since it does not * update the dirty memory bitmap yet. diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 5095ff4..a7d9910 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -170,6 +170,4 @@ typedef struct VirtIOBlock { DEFINE_PROP_CHILD_ALIAS("x-iothread", _state, _field) #endif /* __linux__ */ -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); - #endif -- 1.8.5.3