ia64/xen-unstable

changeset 14008:3b7bdb7bd130

Fix ACM build after recent grant-table code changes.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author kfraser@localhost.localdomain
date Mon Feb 19 15:52:51 2007 +0000 (2007-02-19)
parents ac570a3c79a2
children 184db7a674d9
files xen/acm/acm_simple_type_enforcement_hooks.c
line diff
     1.1 --- a/xen/acm/acm_simple_type_enforcement_hooks.c	Mon Feb 19 15:51:46 2007 +0000
     1.2 +++ b/xen/acm/acm_simple_type_enforcement_hooks.c	Mon Feb 19 15:52:51 2007 +0000
     1.3 @@ -177,7 +177,7 @@ ste_init_state(struct acm_ste_policy_buf
     1.4      ssidref_t ste_ssidref, ste_rssidref;
     1.5      struct domain **pd, *rdom;
     1.6      domid_t rdomid;
     1.7 -    grant_entry_t sha_copy;
     1.8 +    struct grant_entry *sha_copy;
     1.9      int port, i;
    1.10  
    1.11      read_lock(&domlist_lock); /* go by domain? or directly by global? event/grant list */
    1.12 @@ -238,13 +238,13 @@ ste_init_state(struct acm_ste_policy_buf
    1.13              printkd("%s: Grant ... sharing for domain %x not setup!\n", __func__, (*pd)->domain_id);
    1.14              continue;
    1.15          }
    1.16 -        for ( i = 0; i < NR_GRANT_ENTRIES; i++ ) {
    1.17 +        for ( i = 0; i < nr_grant_frames((*pd)->grant_table); i++ ) {
    1.18              sha_copy =  (*pd)->grant_table->shared[i];
    1.19 -            if ( sha_copy.flags ) {
    1.20 +            if ( sha_copy->flags ) {
    1.21                  printkd("%s: grant dom (%hu) SHARED (%d) flags:(%hx) dom:(%hu) frame:(%lx)\n",
    1.22                          __func__, (*pd)->domain_id, i, sha_copy.flags, sha_copy.domid, 
    1.23                          (unsigned long)sha_copy.frame);
    1.24 -                rdomid = sha_copy.domid;
    1.25 +                rdomid = sha_copy->domid;
    1.26                  if ((rdom = get_domain_by_id(rdomid)) == NULL) {
    1.27                      printkd("%s: domain not found ERROR!\n", __func__);
    1.28                      goto out;