[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/6] Add check for cache size smaller than page s
From: |
Orit Wasserman |
Subject: |
[Qemu-devel] [PATCH v2 2/6] Add check for cache size smaller than page size |
Date: |
Thu, 30 Jan 2014 20:08:34 +0200 |
Signed-off-by: Orit Wasserman <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
arch_init.c | 4 ++++
migration.c | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch_init.c b/arch_init.c
index 66f5e82..8edeabe 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -178,6 +178,10 @@ static struct {
int64_t xbzrle_cache_resize(int64_t new_size)
{
+ if (new_size < TARGET_PAGE_SIZE) {
+ return -1;
+ }
+
if (XBZRLE.cache != NULL) {
return cache_resize(XBZRLE.cache, new_size / TARGET_PAGE_SIZE) *
TARGET_PAGE_SIZE;
diff --git a/migration.c b/migration.c
index 7235c23..84587e9 100644
--- a/migration.c
+++ b/migration.c
@@ -469,6 +469,7 @@ void qmp_migrate_cancel(Error **errp)
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) {
@@ -477,7 +478,14 @@ void qmp_migrate_set_cache_size(int64_t value, Error
**errp)
return;
}
- s->xbzrle_cache_size = xbzrle_cache_resize(value);
+ new_size = xbzrle_cache_resize(value);
+ if (new_size < 0) {
+ error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
+ "is smaller than page size");
+ return;
+ }
+
+ s->xbzrle_cache_size = new_size;
}
int64_t qmp_query_migrate_cache_size(Error **errp)
--
1.8.3.1
[Qemu-devel] [PATCH v2 3/6] migration:fix free XBZRLE decoded_buf wrong, Orit Wasserman, 2014/01/30
[Qemu-devel] [PATCH v2 5/6] Don't abort on out of memory when creating page cache, Orit Wasserman, 2014/01/30
[Qemu-devel] [PATCH v2 6/6] Don't abort on memory allocation error, Orit Wasserman, 2014/01/30