From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1tkk-0007ap-Kh for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:49:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1tke-0006Aw-Sz for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:49:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1tke-0006Ao-Jr for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:49:20 -0400 From: Stefan Hajnoczi Date: Tue, 1 Jul 2014 10:48:40 +0200 Message-Id: <1404204537-5082-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1404204537-5082-1-git-send-email-stefanha@redhat.com> References: <1404204537-5082-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.1 07/24] 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 , Stefan Hajnoczi This function is no longer used since parent objects now use child aliases to set the VirtIOBlkConf directly. Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Crosthwaite --- 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 e59ebc9..f1a667c 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -677,12 +677,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 1d80bcc..52e5add 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -178,8 +178,6 @@ typedef struct VirtIOBlockReq { DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true), \ DEFINE_PROP_IOTHREAD("x-iothread", _state, _field.iothread) -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); - int virtio_blk_handle_scsi_req(VirtIOBlock *blk, VirtQueueElement *elem); -- 1.9.3