diff mbox

s390x/flic: fix compilation of kvm flic

Message ID 20170125121710.13561-1-cornelia.huck@de.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cornelia Huck Jan. 25, 2017, 12:17 p.m. UTC 
2c21ee7 ("migration: extend VMStateInfo") missed a void -> int
return conversion for kvm_flic_save().

Fixes: 2c21ee7 ("migration: extend VMStateInfo")
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 hw/intc/s390_flic_kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dr. David Alan Gilbert Jan. 25, 2017, 2:45 p.m. UTC | #1 
* Cornelia Huck (cornelia.huck@de.ibm.com) wrote:
> 2c21ee7 ("migration: extend VMStateInfo") missed a void -> int
> return conversion for kvm_flic_save().
> 
> Fixes: 2c21ee7 ("migration: extend VMStateInfo")
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>  hw/intc/s390_flic_kvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index da8e4dfab6..e86a84e49a 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -303,7 +303,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size,
>           * migration state */
>          error_report("flic: couldn't allocate memory");
>          qemu_put_be64(f, FLIC_FAILED);
> -        return;
> +        return 0;
>      }
>  
>      count = __get_all_irqs(flic, &buf, len);
> -- 
> 2.11.0

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

as discussed, sort out an error return value later.

Dave

--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Cornelia Huck Jan. 26, 2017, 10:56 a.m. UTC | #2 
On Wed, 25 Jan 2017 13:17:10 +0100
Cornelia Huck <cornelia.huck@de.ibm.com> wrote:

> 2c21ee7 ("migration: extend VMStateInfo") missed a void -> int
> return conversion for kvm_flic_save().
> 
> Fixes: 2c21ee7 ("migration: extend VMStateInfo")
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>  hw/intc/s390_flic_kvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index da8e4dfab6..e86a84e49a 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -303,7 +303,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size,
>           * migration state */
>          error_report("flic: couldn't allocate memory");
>          qemu_put_be64(f, FLIC_FAILED);
> -        return;
> +        return 0;
>      }
> 
>      count = __get_all_irqs(flic, &buf, len);

Added to my s390-next branch.
diff mbox

Patch

diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index da8e4dfab6..e86a84e49a 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -303,7 +303,7 @@  static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size,
          * migration state */
         error_report("flic: couldn't allocate memory");
         qemu_put_be64(f, FLIC_FAILED);
-        return;
+        return 0;
     }
 
     count = __get_all_irqs(flic, &buf, len);