From ba2dff372cadfe2a098358645fd389df2d213fde Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 31 Oct 2008 13:06:17 +0000 Subject: [PATCH] * src/xm_internal.c: add minimum domain memory size check for Xen patch by Shigeki Sakamoto * AUTHORS: add Shigeki Sakamoto Daniel --- AUTHORS | 1 + ChangeLog | 6 ++++++ src/xm_internal.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/AUTHORS b/AUTHORS index 8cfa431249..6ca98f0ab7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -53,6 +53,7 @@ Patches have also been contributed by: James Morris Chris Wrigh Ben Guthro + Shigeki Sakamoto [....send patches to get your name here....] diff --git a/ChangeLog b/ChangeLog index f2075507a4..d2b778cf02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 31 14:04:52 CET 2008 Daniel Veillard + + * src/xm_internal.c: add minimum domain memory size check for Xen + patch by Shigeki Sakamoto + * AUTHORS: add Shigeki Sakamoto + Fri Oct 31 11:11:30 CET 2008 Daniel Veillard * python/Makefile.am python/generator.py python/libvir.c diff --git a/src/xm_internal.c b/src/xm_internal.c index 12b78526c2..9562c9a23d 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1273,6 +1273,8 @@ int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory) { return (-1); if (domain->id != -1) return (-1); + if (memory < 1024 * MIN_XEN_GUEST_SIZE) + return (-1); if (!(filename = virHashLookup(nameConfigMap, domain->name))) return (-1);