[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] migration: Make sure that we pass the right cach
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 1/9] migration: Make sure that we pass the right cache size |
Date: |
Sun, 29 Oct 2017 14:09:26 +0100 |
Instead of passing silently round down the number of pages, make it an
error that the cache size is not a power of 2.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/page_cache.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 9a9d13d6a2..96268c3aea 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -58,6 +58,13 @@ PageCache *cache_init(int64_t new_size, size_t page_size,
Error **errp)
return NULL;
}
+ /* round down to the nearest power of 2 */
+ if (!is_power_of_2(num_pages)) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "is not a power of two number of pages");
+ return NULL;
+ }
+
/* We prefer not to abort if there is no memory */
cache = g_try_malloc(sizeof(*cache));
if (!cache) {
@@ -65,11 +72,6 @@ PageCache *cache_init(int64_t new_size, size_t page_size,
Error **errp)
"Failed to allocate cache");
return NULL;
}
- /* round down to the nearest power of 2 */
- if (!is_power_of_2(num_pages)) {
- num_pages = pow2floor(num_pages);
- DPRINTF("rounding down to %" PRId64 "\n", num_pages);
- }
cache->page_size = page_size;
cache->num_items = 0;
cache->max_num_items = num_pages;
--
2.13.6
- [Qemu-devel] [PULL 0/9] Migration pull request, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 3/9] migration: No need to return the size of the cache, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 2/9] migration: Don't play games with the requested cache size, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 1/9] migration: Make sure that we pass the right cache size,
Juan Quintela <=
- [Qemu-devel] [PULL 5/9] tests: rename postcopy-test to migration-test, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 4/9] migration: Make xbzrle_cache_size a migration parameter, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 6/9] tests: Refactor setting of parameters/capabilities, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 7/9] tests: Factorize out migrate_test_start/end, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 8/9] tests: Don't abuse global_qtest, Juan Quintela, 2017/10/29
- [Qemu-devel] [PULL 9/9] tests: check that migration parameters are really assigned, Juan Quintela, 2017/10/29
- Re: [Qemu-devel] [PULL 0/9] Migration pull request, Peter Maydell, 2017/10/30