[Qemu-devel] [PATCH] migration: madvise error_report fixup!

Pavel Butsykin posted 1 patch 164 weeks ago
Failed in applying to current master (apply log)
migration/qemu-file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH] migration: madvise error_report fixup!

Posted by Pavel Butsykin 164 weeks ago
Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 migration/qemu-file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 82dbef3c86..195fa94fcf 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -156,13 +156,13 @@ static void qemu_iovec_release_ram(QEMUFile *f)
             continue;
         }
         if (qemu_madvise(iov.iov_base, iov.iov_len, QEMU_MADV_DONTNEED) < 0) {
-            error_report("migrate: madvise DONTNEED failed %p %ld: %s",
+            error_report("migrate: madvise DONTNEED failed %p %zd: %s",
                          iov.iov_base, iov.iov_len, strerror(errno));
         }
         iov = f->iov[idx];
     }
     if (qemu_madvise(iov.iov_base, iov.iov_len, QEMU_MADV_DONTNEED) < 0) {
-            error_report("migrate: madvise DONTNEED failed %p %ld: %s",
+            error_report("migrate: madvise DONTNEED failed %p %zd: %s",
                          iov.iov_base, iov.iov_len, strerror(errno));
     }
     memset(f->may_free, 0, sizeof(f->may_free));
-- 
2.11.0


Re: [Qemu-devel] [PATCH] migration: madvise error_report fixup!

Posted by Dr. David Alan Gilbert 164 weeks ago
* Pavel Butsykin (pbutsykin@virtuozzo.com) wrote:
> Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>

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

I'll merge it in with the others when I queue it.

Dave

> ---
>  migration/qemu-file.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 82dbef3c86..195fa94fcf 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -156,13 +156,13 @@ static void qemu_iovec_release_ram(QEMUFile *f)
>              continue;
>          }
>          if (qemu_madvise(iov.iov_base, iov.iov_len, QEMU_MADV_DONTNEED) < 0) {
> -            error_report("migrate: madvise DONTNEED failed %p %ld: %s",
> +            error_report("migrate: madvise DONTNEED failed %p %zd: %s",
>                           iov.iov_base, iov.iov_len, strerror(errno));
>          }
>          iov = f->iov[idx];
>      }
>      if (qemu_madvise(iov.iov_base, iov.iov_len, QEMU_MADV_DONTNEED) < 0) {
> -            error_report("migrate: madvise DONTNEED failed %p %ld: %s",
> +            error_report("migrate: madvise DONTNEED failed %p %zd: %s",
>                           iov.iov_base, iov.iov_len, strerror(errno));
>      }
>      memset(f->may_free, 0, sizeof(f->may_free));
> -- 
> 2.11.0
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK