[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/10] migration: Don't play games with the reque
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v2 07/10] migration: Don't play games with the requested cache size |
Date: |
Wed, 18 Oct 2017 12:36:30 +0200 |
Now that we check that the value passed is a power of 2, we don't need
to play games when comparing what is the size that is going to take
the cache.
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 47501460c8..c84f22d759 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -135,12 +135,14 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error
**errp)
return -1;
}
+ if (new_size == migrate_xbzrle_cache_size()) {
+ /* nothing to do */
+ return new_size;
+ }
+
XBZRLE_cache_lock();
if (XBZRLE.cache != NULL) {
- if (pow2floor(new_size) == migrate_xbzrle_cache_size()) {
- goto out_new_size;
- }
new_cache = cache_init(new_size, TARGET_PAGE_SIZE, errp);
if (!new_cache) {
ret = -1;
@@ -151,8 +153,7 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp)
XBZRLE.cache = new_cache;
}
-out_new_size:
- ret = pow2floor(new_size);
+ ret = new_size;
out:
XBZRLE_cache_unlock();
return ret;
--
2.13.6
- [Qemu-devel] [PATCH v2 00/10] Make xbzrle_cache_size a migration parameter, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 01/10] migration: Fix migrate_test_apply for multifd parameters, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 03/10] migration: Make cache size elements use the right types, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 02/10] migratiom: Remove max_item_age parameter, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 04/10] migration: Move xbzrle cache resize error handling to xbzrle_cache_resize, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 06/10] migration: Make sure that we pass the right cache size, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 05/10] migration: Make cache_init() take an error parameter, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 07/10] migration: Don't play games with the requested cache size,
Juan Quintela <=
- [Qemu-devel] [PATCH v2 08/10] migration: No need to return the size of the cache, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 09/10] migration: Make xbzrle_cache_size a migration parameter, Juan Quintela, 2017/10/18
- [Qemu-devel] [PATCH v2 10/10] migration: [RFC] Use proper types in json, Juan Quintela, 2017/10/18