[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/10] migration: Move xbzrle cache resize error
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v2 04/10] migration: Move xbzrle cache resize error handling to xbzrle_cache_resize |
Date: |
Wed, 18 Oct 2017 12:36:27 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/migration.c | 18 +-----------------
migration/ram.c | 22 ++++++++++++++++++++--
migration/ram.h | 2 +-
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index fb62a639d8..3feffb5e26 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1373,24 +1373,8 @@ void qmp_migrate_set_cache_size(int64_t value, Error
**errp)
MigrationState *s = migrate_get_current();
int64_t new_size;
- /* Check for truncation */
- if (value != (size_t)value) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "exceeding address space");
- return;
- }
-
- /* Cache should not be larger than guest ram size */
- if (value > ram_bytes_total()) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "exceeds guest ram size ");
- return;
- }
-
- new_size = xbzrle_cache_resize(value);
+ new_size = xbzrle_cache_resize(value, errp);
if (new_size < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "is smaller than page size");
return;
}
diff --git a/migration/ram.c b/migration/ram.c
index b83f8977c5..7c3acad029 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -42,6 +42,7 @@
#include "postcopy-ram.h"
#include "migration/page_cache.h"
#include "qemu/error-report.h"
+#include "qapi/qmp/qerror.h"
#include "trace.h"
#include "exec/ram_addr.h"
#include "qemu/rcu_queue.h"
@@ -113,13 +114,30 @@ static void XBZRLE_cache_unlock(void)
* Returns the new_size or negative in case of error.
*
* @new_size: new cache size
+ * @errp: set *errp if the check failed, with reason
*/
-int64_t xbzrle_cache_resize(int64_t new_size)
+int64_t xbzrle_cache_resize(int64_t new_size, Error **errp)
{
PageCache *new_cache;
int64_t ret;
+ /* Check for truncation */
+ if (new_size != (size_t)new_size) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "exceeding address space");
+ return -1;
+ }
+
+ /* Cache should not be larger than guest ram size */
+ if (new_size > ram_bytes_total()) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "exceeds guest ram size");
+ 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;
}
@@ -132,7 +150,7 @@ int64_t xbzrle_cache_resize(int64_t new_size)
new_cache = cache_init(new_size / TARGET_PAGE_SIZE,
TARGET_PAGE_SIZE);
if (!new_cache) {
- error_report("Error creating cache");
+ error_setg(errp, "Error creating cache");
ret = -1;
goto out;
}
diff --git a/migration/ram.h b/migration/ram.h
index 4a72d66503..511b3dc582 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -35,7 +35,7 @@
extern MigrationStats ram_counters;
extern XBZRLECacheStats xbzrle_counters;
-int64_t xbzrle_cache_resize(int64_t new_size);
+int64_t xbzrle_cache_resize(int64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void);
--
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 <=
- [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, 2017/10/18
- [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