ia64/xen-unstable

changeset 18843:abada55aec43

xm: Relax the sanity check on guest configuration with XSM-ACM addlabel

The attached patch relaxes the sanity check on guest configuration
when assigning a acm label to the guest. This patch makes a guest
configuration accept a bootloader parameter. This is common for
paravirtualized guests to boot them by using pygrub.

Signed-off-by: INAKOSHI Hiroya <inakoshi.hiroya@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Nov 28 13:04:30 2008 +0000 (2008-11-28)
parents 9be2fe3de567
children 8dbf23c89cc6
files tools/python/xen/xm/addlabel.py
line diff
     1.1 --- a/tools/python/xen/xm/addlabel.py	Fri Nov 28 12:02:43 2008 +0000
     1.2 +++ b/tools/python/xen/xm/addlabel.py	Fri Nov 28 13:04:30 2008 +0000
     1.3 @@ -64,12 +64,13 @@ def validate_config_file(configfile):
     1.4          return 0
     1.5  
     1.6      # sanity check on the data from the file
     1.7 +    # requiring 'memory,' 'name,' and ether 'kernel' or 'bootloader'
     1.8      count = 0
     1.9 -    required = ['kernel', 'memory', 'name']
    1.10 +    required = ['kernel', 'bootloader', 'memory', 'name']
    1.11      for (k, v) in locs.items():
    1.12          if k in required:
    1.13              count += 1
    1.14 -    if count != 3:
    1.15 +    if count < len(required) - 1:
    1.16          print "Invalid configuration file."
    1.17          return 0
    1.18      else: