[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/39] migration: Move busy++ to migrate_with_multithread
From: |
Juan Quintela |
Subject: |
[PULL 12/39] migration: Move busy++ to migrate_with_multithread |
Date: |
Tue, 24 Oct 2023 15:12:38 +0200 |
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>
---
migration/ram-compress.c | 1 +
migration/ram.c | 8 ++------
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);
}
/**
--
2.41.0
- [PULL 00/39] Migration 20231024 patches, Juan Quintela, 2023/10/24
- [PULL 01/39] migration/doc: Add contents, Juan Quintela, 2023/10/24
- [PULL 02/39] migration/doc: Add documentation for backwards compatiblity, Juan Quintela, 2023/10/24
- [PULL 03/39] migration/doc: How to migrate when hosts have different features, Juan Quintela, 2023/10/24
- [PULL 05/39] migration: Receiving a zero page non zero is an error, Juan Quintela, 2023/10/24
- [PULL 04/39] migration/doc: We broke backwards compatibility, Juan Quintela, 2023/10/24
- [PULL 06/39] migration: Rename ram_handle_compressed() to ram_handle_zero(), Juan Quintela, 2023/10/24
- [PULL 08/39] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/10/24
- [PULL 09/39] migration: Remove save_page_use_compression(), Juan Quintela, 2023/10/24
- [PULL 12/39] migration: Move busy++ to migrate_with_multithread,
Juan Quintela <=
- [PULL 10/39] migration: Make compress_data_with_multithreads return bool, Juan Quintela, 2023/10/24
- [PULL 13/39] migration: Create compress_update_rates(), Juan Quintela, 2023/10/24
- [PULL 14/39] migration: Export send_queued_data(), Juan Quintela, 2023/10/24
- [PULL 11/39] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/24
- [PULL 16/39] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/24
- [PULL 15/39] migration: Move ram_flush_compressed_data() to ram-compress.c, Juan Quintela, 2023/10/24
- [PULL 19/39] hw/s390x/s390-skeys: Don't call register_savevm_live() during instance_init(), Juan Quintela, 2023/10/24
- [PULL 18/39] hw/ipmi: Don't call vmstate_register() from instance_init() functions, Juan Quintela, 2023/10/24
- [PULL 20/39] hw/s390x/s390-stattrib: Simplify handling of the "migration-enabled" property, Juan Quintela, 2023/10/24