From: Keir Fraser Date: Fri, 13 Jun 2008 12:55:50 +0000 (+0100) Subject: [ACM] Pass uuid to created policy X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~68 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b53284ae782507050de2a10280b52122677b2d9;p=xen.git [ACM] Pass uuid to created policy A UUID needs to be passed to the created policy. Signed-off-by: stefan Berger --- diff --git a/tools/python/xen/util/acmpolicy.py b/tools/python/xen/util/acmpolicy.py index 5d4711c52d..64978a68dc 100644 --- a/tools/python/xen/util/acmpolicy.py +++ b/tools/python/xen/util/acmpolicy.py @@ -507,7 +507,7 @@ class ACMPolicy(XSPolicy): rc = self.compile() return rc, errors - def force_default_policy(klass): + def force_default_policy(klass, policy_ref): """ Force the installation of the DEFAULT policy if for example no XML of the current policy is available and @@ -518,7 +518,7 @@ class ACMPolicy(XSPolicy): """ errors = "" - acmpol_new = ACMPolicy(xml = get_DEFAULT_policy()) + acmpol_new = ACMPolicy(xml = get_DEFAULT_policy(), ref=policy_ref) from xen.lowlevel import acm dom0_ssidref = acm.getssid(0) diff --git a/tools/python/xen/xend/XendXSPolicyAdmin.py b/tools/python/xen/xend/XendXSPolicyAdmin.py index 4075d5b125..e9e5efe77b 100644 --- a/tools/python/xen/xend/XendXSPolicyAdmin.py +++ b/tools/python/xen/xend/XendXSPolicyAdmin.py @@ -63,7 +63,7 @@ class XSPolicyAdmin: except Exception, e: log.error("Could not find XML representation of policy '%s': " "%s" % (act_pol_name,e)) - rc, errors, acmpol_def = ACMPolicy.force_default_policy() + rc, errors, acmpol_def = ACMPolicy.force_default_policy(ref) if rc == xsconstants.XSERR_SUCCESS: self.xsobjs[ref] = acmpol_def self.policies[ref] = (acmpol_def.get_name(),