ia64/xen-unstable

changeset 17681:2757cf34d1ea

Merge with ia64
author Keir Fraser <keir.fraser@citrix.com>
date Tue May 20 09:55:50 2008 +0100 (2008-05-20)
parents 4269ab4b37ee 7c8e2a2c006e
children fd5b2ed9574a
files
line diff
     1.1 --- a/tools/ioemu/hw/xenfb.c	Tue May 20 11:33:15 2008 +0900
     1.2 +++ b/tools/ioemu/hw/xenfb.c	Tue May 20 09:55:50 2008 +0100
     1.3 @@ -498,7 +498,7 @@ static int xenfb_configure_fb(struct xen
     1.4  			fb_len_lim, fb_len_max);
     1.5  		fb_len_lim = fb_len_max;
     1.6  	}
     1.7 -	if (fb_len > fb_len_lim) {
     1.8 +	if (fb_len_lim && fb_len > fb_len_lim) {
     1.9  		fprintf(stderr,
    1.10  			"FB: frontend fb size %zu limited to %zu\n",
    1.11  			fb_len, fb_len_lim);
     2.1 --- a/tools/python/xen/xend/XendDomain.py	Tue May 20 11:33:15 2008 +0900
     2.2 +++ b/tools/python/xen/xend/XendDomain.py	Tue May 20 09:55:50 2008 +0100
     2.3 @@ -1282,6 +1282,10 @@ class XendDomain:
     2.4  
     2.5          if dominfo.getDomid() == DOM0_ID:
     2.6              raise XendError("Cannot migrate privileged domain %s" % domid)
     2.7 +        if dominfo._stateGet() != DOM_STATE_RUNNING:
     2.8 +            raise VMBadState("Domain is not running",
     2.9 +                             POWER_STATE_NAMES[DOM_STATE_RUNNING],
    2.10 +                             POWER_STATE_NAMES[dominfo._stateGet()])
    2.11  
    2.12          """ The following call may raise a XendError exception """
    2.13          dominfo.testMigrateDevices(True, dst)