migration: Fix operator type

[PATCH] migration: Fix operator type

Posted by Dr. David Alan Gilbert (git) 3 years, 10 months ago

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Clang spotted an & that should have been an &&; fix it.

Reported by: David Binderman / https://gitlab.com/dcb
Fixes: 65dacaa04fa ("migration: introduce save_normal_page()")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/963
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/ram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/ram.c b/migration/ram.c
index 3532f64ecb..0ef4bd63eb 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1289,7 +1289,7 @@ static int save_normal_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,
                                          offset | RAM_SAVE_FLAG_PAGE));
     if (async) {
         qemu_put_buffer_async(rs->f, buf, TARGET_PAGE_SIZE,
-                              migrate_release_ram() &
+                              migrate_release_ram() &&
                               migration_in_postcopy());
     } else {
         qemu_put_buffer(rs->f, buf, TARGET_PAGE_SIZE);
-- 
2.35.1

Re: [PATCH] migration: Fix operator type

Posted by Peter Xu 3 years, 10 months ago

On Wed, Apr 06, 2022 at 11:25:15AM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> Clang spotted an & that should have been an &&; fix it.
> 
> Reported by: David Binderman / https://gitlab.com/dcb
> Fixes: 65dacaa04fa ("migration: introduce save_normal_page()")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/963
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

Re: [PATCH] migration: Fix operator type

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

* Peter Xu (peterx@redhat.com) wrote:
> On Wed, Apr 06, 2022 at 11:25:15AM +0100, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> > 
> > Clang spotted an & that should have been an &&; fix it.
> > 
> > Reported by: David Binderman / https://gitlab.com/dcb
> > Fixes: 65dacaa04fa ("migration: introduce save_normal_page()")
> > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/963
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> Reviewed-by: Peter Xu <peterx@redhat.com>

Queued

> -- 
> Peter Xu
> 
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH] migration: Fix operator type

Posted by Peter Maydell 3 years, 10 months ago

On Wed, 6 Apr 2022 at 11:31, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> Clang spotted an & that should have been an &&; fix it.
>
> Reported by: David Binderman / https://gitlab.com/dcb
> Fixes: 65dacaa04fa ("migration: introduce save_normal_page()")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/963
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>  migration/ram.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 3532f64ecb..0ef4bd63eb 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1289,7 +1289,7 @@ static int save_normal_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,
>                                           offset | RAM_SAVE_FLAG_PAGE));
>      if (async) {
>          qemu_put_buffer_async(rs->f, buf, TARGET_PAGE_SIZE,
> -                              migrate_release_ram() &
> +                              migrate_release_ram() &&
>                                migration_in_postcopy());
>      } else {
>          qemu_put_buffer(rs->f, buf, TARGET_PAGE_SIZE);

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM