From 2fdd853ff51eff7c29255ad1fe64783cf262c26c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 28 Nov 2008 13:04:30 +0000 Subject: [PATCH] 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 --- tools/python/xen/xm/addlabel.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/addlabel.py b/tools/python/xen/xm/addlabel.py index 961787a76e..b4130cc2f2 100644 --- a/tools/python/xen/xm/addlabel.py +++ b/tools/python/xen/xm/addlabel.py @@ -64,12 +64,13 @@ def validate_config_file(configfile): return 0 # sanity check on the data from the file + # requiring 'memory,' 'name,' and ether 'kernel' or 'bootloader' count = 0 - required = ['kernel', 'memory', 'name'] + required = ['kernel', 'bootloader', 'memory', 'name'] for (k, v) in locs.items(): if k in required: count += 1 - if count != 3: + if count < len(required) - 1: print "Invalid configuration file." return 0 else: -- 2.30.2