]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
migration: Fix operator type qemu-xen-4.17.0 qemu-xen-4.17.0-rc4 qemu-xen-4.17.1
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Wed, 6 Apr 2022 10:25:15 +0000 (11:25 +0100)
committerAnthony PERARD <anthony.perard@gmail.com>
Thu, 16 Jun 2022 10:58:37 +0000 (11:58 +0100)
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>
Message-Id: <20220406102515.96320-1-dgilbert@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
(cherry picked from commit f912ec5b2d65644116ff496b58d7c9145c19e4c0)

migration/ram.c

index 3532f64ecb98cbc835ccefbce85d9b001ed4908d..0ef4bd63ebd50f7cb64f41bed4ba4db542a62615 100644 (file)
@@ -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);