|
@@ -58,6 +58,13 @@ PageCache *cache_init(int64_t new_size, size_t page_size, Error **errp)
|
|
return NULL;
|
|
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 */
|
|
/* We prefer not to abort if there is no memory */
|
|
cache = g_try_malloc(sizeof(*cache));
|
|
cache = g_try_malloc(sizeof(*cache));
|
|
if (!cache) {
|
|
if (!cache) {
|
|
@@ -65,11 +72,6 @@ PageCache *cache_init(int64_t new_size, size_t page_size, Error **errp)
|
|
"Failed to allocate cache");
|
|
"Failed to allocate cache");
|
|
return NULL;
|
|
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->page_size = page_size;
|
|
cache->num_items = 0;
|
|
cache->num_items = 0;
|
|
cache->max_num_items = num_pages;
|
|
cache->max_num_items = num_pages;
|