aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2023-10-19 13:07:19 +0200
committerJuan Quintela <quintela@redhat.com>2023-10-30 17:41:55 +0100
commit250b1d7ef62b26fde8dc0f8dacad406807d82f1a (patch)
tree74e139f1a228bc483260f5c34e46c33677bb9a94 /migration
parentb6e19b6de82987606b0cfe5c120dc1952ec582a5 (diff)
migration: Move busy++ to migrate_with_multithread
And now we can simplify save_compress_page(). Reviewed-by: Lukas Straub <lukasstraub2@web.de> Reviewed-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Juan Quintela <quintela@redhat.com> Message-ID: <20231019110724.15324-7-quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/ram-compress.c1
-rw-r--r--migration/ram.c8
2 files changed, 3 insertions, 6 deletions
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a991b15b7a..f56e1f8e69 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -291,6 +291,7 @@ bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
}
if (!wait) {
qemu_mutex_unlock(&comp_done_lock);
+ compression_counters.busy++;
return false;
}
/*
diff --git a/migration/ram.c b/migration/ram.c
index 63a575ae90..46209388ec 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2067,12 +2067,8 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
return false;
}
- if (compress_page_with_multi_thread(pss->block, offset, send_queued_data)) {
- return true;
- }
-
- compression_counters.busy++;
- return false;
+ return compress_page_with_multi_thread(pss->block, offset,
+ send_queued_data);
}
/**