[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] Add check for cache size smaller than page size
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 4/8] Add check for cache size smaller than page size |
Date: |
Tue, 4 Feb 2014 16:55:30 +0100 |
From: Orit Wasserman <address@hidden>
Signed-off-by: Orit Wasserman <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-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.5.3
- [Qemu-devel] [PULL v2 0/8] migration queue, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 7/8] Don't abort on out of memory when creating page cache, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 6/8] XBZRLE cache size should not be larger than guest memory size, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 3/8] Set xbzrle buffers to NULL after freeing them to avoid double free errors, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 5/8] migration:fix free XBZRLE decoded_buf wrong, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 1/8] vmstate: Make VMSTATE_STRUCT_POINTER take type, not ptr-to-type, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 2/8] exec: fix ram_list dirty map optimization, Juan Quintela, 2014/02/04
- [Qemu-devel] [PATCH 4/8] Add check for cache size smaller than page size,
Juan Quintela <=
- [Qemu-devel] [PATCH 8/8] Don't abort on memory allocation error, Juan Quintela, 2014/02/04
- Re: [Qemu-devel] [PULL v2 0/8] migration queue, Peter Maydell, 2014/02/08