[Xen-changelog] [xen-unstable] Revert 15975:96f46954c7f1.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191216940 -3600
# Node ID db075ecf29b2c7bd677a9b61b6d4ef136f686aef
# Parent  f34cc7d1f2f62a046e8690b1b20d8d284bd5930c
Revert 15975:96f46954c7f1.
---
 xen/include/xsm/acm/acm_hooks.h |    5 +++++
 1 files changed, 5 insertions(+)

diff -r f34cc7d1f2f6 -r db075ecf29b2 xen/include/xsm/acm/acm_hooks.h
--- a/xen/include/xsm/acm/acm_hooks.h   Mon Oct 01 06:34:40 2007 +0100
+++ b/xen/include/xsm/acm/acm_hooks.h   Mon Oct 01 06:35:40 2007 +0100
@@ -284,12 +284,17 @@ static inline int acm_domain_create(stru
     } else if ((acm_secondary_ops->domain_create != NULL) &&
                 acm_secondary_ops->domain_create(subject_ssid, ssidref,
                                                  domid)) {
+        /* roll-back primary */
+        if (acm_primary_ops->domain_destroy != NULL)
+            acm_primary_ops->domain_destroy(d->ssid, d);
         rc = ACM_ACCESS_DENIED;
     }
 
     if ( rc == ACM_OK )
     {
         acm_domain_ssid_onto_list(d->ssid);
+    } else {
+        acm_free_domain_ssid(d->ssid);
     }
 
 error_out:

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