Patchwork [1/3] s390-virtio: Fix compile error for virtio-block init

login
register
mail settings
Submitter Amit Shah
Date Feb. 25, 2010, 1:45 p.m.
Message ID <1267105520-25457-2-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/46238/
State New
Headers show

Comments

Amit Shah - Feb. 25, 2010, 1:45 p.m.
Commit 428c149b0be790b440e1cbee185b152cdb22feec modified the argument
that virtio_blk_init takes. Update the s390 bus code that calls this
function.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
CC: Christoph Hellwig <hch@lst.de>
---
 hw/s390-virtio-bus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Aurelien Jarno - March 6, 2010, 9:55 p.m.
On Thu, Feb 25, 2010 at 07:15:18PM +0530, Amit Shah wrote:
> Commit 428c149b0be790b440e1cbee185b152cdb22feec modified the argument
> that virtio_blk_init takes. Update the s390 bus code that calls this
> function.
> 
> Signed-off-by: Amit Shah <amit.shah@redhat.com>
> CC: Christoph Hellwig <hch@lst.de>

Thanks, applied.

> ---
>  hw/s390-virtio-bus.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
> index fa0a74f..9fc01e9 100644
> --- a/hw/s390-virtio-bus.c
> +++ b/hw/s390-virtio-bus.c
> @@ -123,7 +123,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *dev)
>  {
>      VirtIODevice *vdev;
>  
> -    vdev = virtio_blk_init((DeviceState *)dev, dev->block.dinfo);
> +    vdev = virtio_blk_init((DeviceState *)dev, &dev->block);
>      if (!vdev) {
>          return -1;
>      }
> -- 
> 1.6.2.5
> 
> 
> 
>

Patch

diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index fa0a74f..9fc01e9 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -123,7 +123,7 @@  static int s390_virtio_blk_init(VirtIOS390Device *dev)
 {
     VirtIODevice *vdev;
 
-    vdev = virtio_blk_init((DeviceState *)dev, dev->block.dinfo);
+    vdev = virtio_blk_init((DeviceState *)dev, &dev->block);
     if (!vdev) {
         return -1;
     }