@samitouri / QOSamiQemu / commits / 9489a40184

ram: Remove colo special-casing

We only enter colo state after the precopy migration is finished so this if is always taken. Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Lukas Straub <lukasstraub2@web.de> Link: https://lore.kernel.org/qemu-devel/20260302-colo_unit_test_multifd-v11-6-d653fb3b1d80@web.de Signed-off-by: Fabiano Rosas <farosas@suse.de>

Lukas Straub committed Mar 2, 2026 at 12:43 UTC 9489a40184c510fcda8cc222bbf4363c7368d01b
1 file changed +5 -5
migration/ram.c
+5 -5
@@ -3116,12 +3116,12 @@ static int ram_save_setup(QEMUFile *f, void *opaque, Error **errp)
3116 RAMBlock *block;
3117 int ret, max_hg_page_size;
3118
3119 - /* migration has already setup the bitmap, reuse it. */
3120 - if (!migration_in_colo_state()) {
3121 - if (ram_init_all(rsp, errp) != 0) {
3122 - return -1;
3123 - }
3119 + assert(!migration_in_colo_state());
3120 +
3121 + if (ram_init_all(rsp, errp) != 0) {
3122 + return -1;
3123 }
3124 +
3125 (*rsp)->pss[RAM_CHANNEL_PRECOPY].pss_channel = f;
3126
3127 /*