[v8] migration: Postcopy Preemption

[PATCH v8 01/15] fixup! migration: remove the QEMUFileOps 'get_buffer' callback

Posted by Peter Xu 3 years, 7 months ago

This fixes a bug with the cleanup patch.  Should be squashed into the patch
in subject.

Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/qemu-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 3a380a6072..1e80d496b7 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -375,7 +375,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
                 qio_channel_wait(f->ioc, G_IO_IN);
             }
         } else if (len < 0) {
-            len = EIO;
+            len = -EIO;
         }
     } while (len == QIO_CHANNEL_ERR_BLOCK);
 
-- 
2.32.0

Re: [PATCH v8 01/15] fixup! migration: remove the QEMUFileOps 'get_buffer' callback

Posted by Dr. David Alan Gilbert 3 years, 7 months ago

* Peter Xu (peterx@redhat.com) wrote:
> This fixes a bug with the cleanup patch.  Should be squashed into the patch
> in subject.

Yep, that one is already in; thanks.

Dave

> Cc: Daniel P. Berrange <berrange@redhat.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  migration/qemu-file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 3a380a6072..1e80d496b7 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -375,7 +375,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
>                  qio_channel_wait(f->ioc, G_IO_IN);
>              }
>          } else if (len < 0) {
> -            len = EIO;
> +            len = -EIO;
>          }
>      } while (len == QIO_CHANNEL_ERR_BLOCK);
>  
> -- 
> 2.32.0
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK