[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [qemu-xen staging-4.16] migration: Fix operator type
commit c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3 Author: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx> AuthorDate: Wed Apr 6 11:25:15 2022 +0100 Commit: Anthony PERARD <anthony.perard@xxxxxxxxxx> CommitDate: Mon Jul 17 12:09:08 2023 +0100 migration: Fix operator type 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@xxxxxxxxxx> Message-Id: <20220406102515.96320-1-dgilbert@xxxxxxxxxx> Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx> Reviewed-by: Peter Xu <peterx@xxxxxxxxxx> Signed-off-by: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx> (cherry picked from commit f912ec5b2d65644116ff496b58d7c9145c19e4c0) (cherry picked from commit b746458e1ce1bec85e58b458386f8b7a0bedfaa6) --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7a43bfd7af..541f6b6b41 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1155,7 +1155,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); -- generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.16
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |