Skip to content

Commit f972c2d

Browse files
authored
Merge pull request #33 from eric-ch/s9-oxt-1622
S9: OXT-1622: surfman: xc_domain_getinfo usage.
2 parents 6cb6c9a + 69f6146 commit f972c2d

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

libsurfman/src/xc.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,21 @@ void xc_init (void)
3737
}
3838
}
3939

40-
int xc_domid_exists (int domid)
40+
int xc_domid_getinfo(int domid, xc_dominfo_t *info)
4141
{
42-
xc_dominfo_t info;
4342
int rc;
4443

45-
rc = xc_domain_getinfo (xch, domid, 1, &info);
46-
return rc >= 0 ? info.domid == (domid_t)domid : 0;
44+
rc = xc_domain_getinfo (xch, domid, 1, info);
45+
if (rc == 1)
46+
return info->domid == (domid_t)domid ? 1 : -ENOENT;
47+
return rc;
4748
}
4849

49-
int xc_domid_getinfo(int domid, xc_dominfo_t *info)
50+
int xc_domid_exists(int domid)
5051
{
51-
return xc_domain_getinfo (xch, domid, 1, info);
52+
xc_dominfo_t info = { 0 };
53+
54+
return !!xc_domid_getinfo(domid, &info);
5255
}
5356

5457
void *xc_mmap_foreign(void *addr, size_t length, int prot,

surfman/src/domain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ domain_dying (struct domain *d)
3535
{
3636
xc_dominfo_t info;
3737

38-
if (!xc_domid_getinfo (d->domid, &info))
38+
if (xc_domid_getinfo (d->domid, &info) != 1)
3939
return 0;
4040
return info.dying;
4141
}

0 commit comments

Comments
 (0)