* src/xm_internal.c: add minimum domain memory size check for Xen

  patch by Shigeki Sakamoto
* AUTHORS: add Shigeki Sakamoto
Daniel

diff --git a/AUTHORS b/AUTHORS
index 8cfa4312490f761e7e499340aa660ac89b654532..6ca98f0ab7eae7438937405b30d29694452d55f1 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -53,6 +53,7 @@ Patches have also been contributed by:
   James Morris         <jmorris@namei.org>
   Chris Wrigh          <chrisw@redhat.com>
   Ben Guthro           <bguthro@virtualiron.com>
+  Shigeki Sakamoto     <fj0588di@aa.jp.fujitsu.com>
 
 
   [....send patches to get your name here....]

diff --git a/ChangeLog b/ChangeLog
index f2075507a4d480c55fd69f4399c1cef78aeeb7c3..d2b778cf028911f39bfd40b68ca532c749f78e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 31 14:04:52 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * 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 <veillard@redhat.com>
 
        * python/Makefile.am python/generator.py python/libvir.c

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 12b78526c2d788be743ebf5f109452001214d22d..9562c9a23d5f770d94576119eeea4a2dabfa5f6e 100644 (file)
--- 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);