Re: [Qemu-devel] [PATCH v2 5/7] virtio-blk: drop virtio_blk_set_conf()

2014-05-29 Thread Peter Crosthwaite
On Fri, May 23, 2014 at 1:40 AM, Stefan Hajnoczi stefa...@redhat.com wrote:
 This function is no longer used since parent objects now use child
 aliases to set the VirtIOBlkConf directly.

 Signed-off-by: Stefan Hajnoczi stefa...@redhat.com

Reviewed-by: Peter Crosthwaite peter.crosthwa...@xilinx.com

 ---
  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 78e7f81..f8d4ac1 100644
 --- a/include/hw/virtio/virtio-blk.h
 +++ b/include/hw/virtio/virtio-blk.h
 @@ -159,6 +159,4 @@ typedef struct VirtIOBlock {
  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);
 -
  #endif
 --
 1.9.0





[Qemu-devel] [PATCH v2 5/7] virtio-blk: drop virtio_blk_set_conf()

2014-05-22 Thread 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 stefa...@redhat.com
---
 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 78e7f81..f8d4ac1 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -159,6 +159,4 @@ typedef struct VirtIOBlock {
 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);
-
 #endif
-- 
1.9.0