[Xen-changelog] [xen-unstable] Merge with ia64

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1211273750 -3600
# Node ID 2757cf34d1ea6c29047121e8c25aaa6cf0a642b2
# Parent  4269ab4b37eecae7cc026b4366acd92b9e6c39e9
# Parent  7c8e2a2c006ef5953ef9c50e1b5918c342ac8890
Merge with ia64
---
 tools/ioemu/hw/xenfb.c              |    2 +-
 tools/python/xen/xend/XendDomain.py |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff -r 4269ab4b37ee -r 2757cf34d1ea tools/ioemu/hw/xenfb.c
--- a/tools/ioemu/hw/xenfb.c    Tue May 20 11:33:15 2008 +0900
+++ b/tools/ioemu/hw/xenfb.c    Tue May 20 09:55:50 2008 +0100
@@ -498,7 +498,7 @@ static int xenfb_configure_fb(struct xen
                        fb_len_lim, fb_len_max);
                fb_len_lim = fb_len_max;
        }
-       if (fb_len > fb_len_lim) {
+       if (fb_len_lim && fb_len > fb_len_lim) {
                fprintf(stderr,
                        "FB: frontend fb size %zu limited to %zu\n",
                        fb_len, fb_len_lim);
diff -r 4269ab4b37ee -r 2757cf34d1ea tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Tue May 20 11:33:15 2008 +0900
+++ b/tools/python/xen/xend/XendDomain.py       Tue May 20 09:55:50 2008 +0100
@@ -1282,6 +1282,10 @@ class XendDomain:
 
         if dominfo.getDomid() == DOM0_ID:
             raise XendError("Cannot migrate privileged domain %s" % domid)
+        if dominfo._stateGet() != DOM_STATE_RUNNING:
+            raise VMBadState("Domain is not running",
+                             POWER_STATE_NAMES[DOM_STATE_RUNNING],
+                             POWER_STATE_NAMES[dominfo._stateGet()])
 
         """ The following call may raise a XendError exception """
         dominfo.testMigrateDevices(True, dst)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog