[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/21] migration: Make cache_init() take an error par
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 05/21] migration: Make cache_init() take an error parameter |
Date: |
Mon, 23 Oct 2017 18:07:44 +0200 |
Once there, take a total size instead of the size of the pages. We
move the check that the new_size is bigger than one page from
xbzrle_cache_resize().
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
--
Fix typo spotted by Peter Xu
---
migration/page_cache.c | 17 +++++++++++------
migration/page_cache.h | 7 +++----
migration/ram.c | 18 +++++-------------
3 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 6b2dd77cf0..9a9d13d6a2 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -14,6 +14,8 @@
#include "qemu/osdep.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "migration/page_cache.h"
@@ -44,21 +46,23 @@ struct PageCache {
size_t num_items;
};
-PageCache *cache_init(size_t num_pages, size_t page_size)
+PageCache *cache_init(int64_t new_size, size_t page_size, Error **errp)
{
int64_t i;
-
+ size_t num_pages = new_size / page_size;
PageCache *cache;
- if (num_pages <= 0) {
- DPRINTF("invalid number of pages\n");
+ if (new_size < page_size) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "is smaller than one target page size");
return NULL;
}
/* We prefer not to abort if there is no memory */
cache = g_try_malloc(sizeof(*cache));
if (!cache) {
- DPRINTF("Failed to allocate cache\n");
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "Failed to allocate cache");
return NULL;
}
/* round down to the nearest power of 2 */
@@ -76,7 +80,8 @@ PageCache *cache_init(size_t num_pages, size_t page_size)
cache->page_cache = g_try_malloc((cache->max_num_items) *
sizeof(*cache->page_cache));
if (!cache->page_cache) {
- DPRINTF("Failed to allocate cache->page_cache\n");
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "Failed to allocate page cache");
g_free(cache);
return NULL;
}
diff --git a/migration/page_cache.h b/migration/page_cache.h
index 931868b857..0cb94498a0 100644
--- a/migration/page_cache.h
+++ b/migration/page_cache.h
@@ -24,12 +24,11 @@ typedef struct PageCache PageCache;
*
* Returns new allocated cache or NULL on error
*
- * @cache pointer to the PageCache struct
- * @num_pages: cache maximal number of cached pages
+ * @cache_size: cache size in bytes
* @page_size: cache page size
+ * @errp: set *errp if the check failed, with reason
*/
-PageCache *cache_init(size_t num_pages, size_t page_size);
-
+PageCache *cache_init(int64_t cache_size, size_t page_size, Error **errp);
/**
* cache_fini: free all cache resources
* @cache pointer to the PageCache struct
diff --git a/migration/ram.c b/migration/ram.c
index 7c3acad029..47501460c8 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -135,22 +135,14 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error
**errp)
return -1;
}
- if (new_size < TARGET_PAGE_SIZE) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "is smaller than one target page size");
- return -1;
- }
-
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,
- TARGET_PAGE_SIZE);
+ new_cache = cache_init(new_size, TARGET_PAGE_SIZE, errp);
if (!new_cache) {
- error_setg(errp, "Error creating cache");
ret = -1;
goto out;
}
@@ -2028,6 +2020,7 @@ err:
static int ram_state_init(RAMState **rsp)
{
*rsp = g_new0(RAMState, 1);
+ Error *local_err = NULL;
qemu_mutex_init(&(*rsp)->bitmap_mutex);
qemu_mutex_init(&(*rsp)->src_page_req_mutex);
@@ -2036,12 +2029,11 @@ static int ram_state_init(RAMState **rsp)
if (migrate_use_xbzrle()) {
XBZRLE_cache_lock();
XBZRLE.zero_target_page = g_malloc0(TARGET_PAGE_SIZE);
- XBZRLE.cache = cache_init(migrate_xbzrle_cache_size() /
- TARGET_PAGE_SIZE,
- TARGET_PAGE_SIZE);
+ XBZRLE.cache = cache_init(migrate_xbzrle_cache_size(),
+ TARGET_PAGE_SIZE, &local_err);
if (!XBZRLE.cache) {
XBZRLE_cache_unlock();
- error_report("Error creating cache");
+ error_report_err(local_err);
g_free(*rsp);
*rsp = NULL;
return -1;
--
2.13.6
- [Qemu-devel] [PULL 00/21] Migration pull request, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 01/21] migration: Fix migrate_test_apply for multifd parameters, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 03/21] migration: Make cache size elements use the right types, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 04/21] migration: Move xbzrle cache resize error handling to xbzrle_cache_resize, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 02/21] migratiom: Remove max_item_age parameter, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 05/21] migration: Make cache_init() take an error parameter,
Juan Quintela <=
- [Qemu-devel] [PULL 06/21] migration: Add 'pause-before-switchover' capability, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 08/21] migration: Wait for semaphore before completing migration, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 09/21] migration: migrate-continue, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 10/21] migrate: HMP migate_continue, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 07/21] migration: Add 'pre-switchover' and 'device' statuses, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 11/21] migration: allow cancel to unpause, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 12/21] migration: pause-before-switchover for postcopy, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 13/21] migration: provide ram_state_init(), Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 14/21] migration: provide ram_state_cleanup, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 15/21] migration: clean up xbzrle cache init/destroy, Juan Quintela, 2017/10/23