aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-02-27 20:22:36 +0000
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-02-27 20:22:36 +0000
commite76c2ace2455add743881bbf7142b59ba3324189 (patch)
treeede8026188bf1c4a9977f593c7f60f520b4ff2c7
parenta2d9dd33747660fbe41c3ddc8c18b354a8a70751 (diff)
downloadxen-e76c2ace2455add743881bbf7142b59ba3324189.tar.gz
xen-e76c2ace2455add743881bbf7142b59ba3324189.tar.bz2
xen-e76c2ace2455add743881bbf7142b59ba3324189.zip
[XEN] [ACM] Simplify the event channel scanning
This patch simplifies the scanning of a domain's event channels considering that an 'ECS_UNBOUND' event channel is not connected and can be skipped. Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
-rw-r--r--xen/acm/acm_simple_type_enforcement_hooks.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/xen/acm/acm_simple_type_enforcement_hooks.c b/xen/acm/acm_simple_type_enforcement_hooks.c
index 04c2d7f0f1..a899a9c00b 100644
--- a/xen/acm/acm_simple_type_enforcement_hooks.c
+++ b/xen/acm/acm_simple_type_enforcement_hooks.c
@@ -193,28 +193,14 @@ ste_init_state(struct acm_ste_policy_buffer *ste_buf, domaintype_t *ssidrefs)
/* a) check for event channel conflicts */
for (port=0; port < NR_EVTCHN_BUCKETS; port++) {
spin_lock(&d->evtchn_lock);
- if (d->evtchn[port] == NULL) {
+ if (d->evtchn[port] == NULL ||
+ d->evtchn[port]->state == ECS_UNBOUND) {
spin_unlock(&d->evtchn_lock);
continue;
}
if (d->evtchn[port]->state == ECS_INTERDOMAIN) {
rdom = d->evtchn[port]->u.interdomain.remote_dom;
rdomid = rdom->domain_id;
- /* rdom now has remote domain */
- ste_rssid = GET_SSIDP(ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY,
- (struct acm_ssid_domain *)(rdom->ssid));
- ste_rssidref = ste_rssid->ste_ssidref;
- } else if (d->evtchn[port]->state == ECS_UNBOUND) {
- rdomid = d->evtchn[port]->u.unbound.remote_domid;
- if ((rdom = get_domain_by_id(rdomid)) == NULL) {
- printk("%s: Error finding domain to id %x!\n", __func__, rdomid);
- goto out;
- }
- /* rdom now has remote domain */
- ste_rssid = GET_SSIDP(ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY,
- (struct acm_ssid_domain *)(rdom->ssid));
- ste_rssidref = ste_rssid->ste_ssidref;
- put_domain(rdom);
} else {
spin_unlock(&d->evtchn_lock);
continue; /* port unused */