diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-18 17:58:34 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-07-01 09:15:02 +0200 |
| commit | f7fedda84a8eb316c99a9de647c4844b862a7b38 (patch) | |
| tree | c1f36072d1894da0d5f152b46bfe964010504605 | |
| parent | caffdac363801cd2cf2bf01ad013a8c1e1e43800 (diff) | |
| download | focaccia-qemu-f7fedda84a8eb316c99a9de647c4844b862a7b38.tar.gz focaccia-qemu-f7fedda84a8eb316c99a9de647c4844b862a7b38.zip | |
virtio-blk: drop virtio_blk_set_conf()
This function is no longer used since parent objects now use child aliases to set the VirtIOBlkConf directly. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
| -rw-r--r-- | hw/block/virtio-blk.c | 6 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-blk.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e59ebc962d..f1a667c672 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 1d80bcc0dc..52e5add925 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); |