@@ -32,8 +32,8 @@ libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid)
xc_domaininfo_t info;
int ret;
- ret = xc_domain_getinfolist(ctx->xch, domid, 1, &info);
- if (ret != 1 || info.domain != domid) {
+ ret = xc_domain_getinfo_single(ctx->xch, domid, &info);
+ if (ret < 0) {
LOG(ERROR, "unable to get domain type for domid=%"PRIu32, domid);
return LIBXL_DOMAIN_TYPE_INVALID;
}
@@ -70,15 +70,10 @@ int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid)
xc_domaininfo_t info;
int ret;
- ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info);
- if (ret != 1)
+ ret = xc_domain_getinfo_single(CTX->xch, domid, &info);
+ if (ret < 0)
{
- LOGE(ERROR, "getinfolist failed %d", ret);
- return ERROR_FAIL;
- }
- if (info.domain != domid)
- {
- LOGE(ERROR, "got info for dom%d, wanted dom%d\n", info.domain, domid);
+ LOGED(ERROR, domid, "get domaininfo failed: %d", ret);
return ERROR_FAIL;
}
return info.cpupool;
@@ -332,13 +332,8 @@ static void suspend_common_wait_guest_check(libxl__egc *egc,
/* Convenience aliases */
const uint32_t domid = dsps->domid;
- ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info);
+ ret = xc_domain_getinfo_single(CTX->xch, domid, &info);
if (ret < 0) {
- LOGED(ERROR, domid, "unable to check for status of guest");
- goto err;
- }
-
- if (!(ret == 1 && info.domain == domid)) {
LOGED(ERROR, domid, "guest we were suspending has been destroyed");
goto err;
}
@@ -349,16 +349,12 @@ int libxl_domain_info(libxl_ctx *ctx, libxl_dominfo *info_r,
int ret;
GC_INIT(ctx);
- ret = xc_domain_getinfolist(ctx->xch, domid, 1, &xcinfo);
+ ret = xc_domain_getinfo_single(ctx->xch, domid, &xcinfo);
if (ret<0) {
- LOGED(ERROR, domid, "Getting domain info list");
+ LOGED(ERROR, domid, "Getting domain info: %d", ret);
GC_FREE;
return ERROR_FAIL;
}
- if (ret==0 || xcinfo.domain != domid) {
- GC_FREE;
- return ERROR_DOMAIN_NOTFOUND;
- }
if (info_r)
libxl__xcinfo2xlinfo(ctx, &xcinfo, info_r);
@@ -1657,14 +1653,15 @@ int libxl__resolve_domid(libxl__gc *gc, const char *name, uint32_t *domid)
libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid,
int *nr_vcpus_out, int *nr_cpus_out)
{
+ int rc;
GC_INIT(ctx);
libxl_vcpuinfo *ptr, *ret;
xc_domaininfo_t domaininfo;
xc_vcpuinfo_t vcpuinfo;
unsigned int nr_vcpus;
- if (xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo) != 1) {
- LOGED(ERROR, domid, "Getting infolist");
+ if ((rc = xc_domain_getinfo_single(ctx->xch, domid, &domaininfo)) < 0) {
+ LOGED(ERROR, domid, "Getting dominfo: %d", rc);
GC_FREE;
return NULL;
}
@@ -323,8 +323,8 @@ retry_transaction:
libxl__xs_printf(gc, t, GCSPRINTF("%s/memory/target", dompath),
"%"PRIu64, new_target_memkb);
- r = xc_domain_getinfolist(ctx->xch, domid, 1, &info);
- if (r != 1 || info.domain != domid) {
+ r = xc_domain_getinfo_single(ctx->xch, domid, &info);
+ if (r < 0) {
abort_transaction = 1;
rc = ERROR_FAIL;
goto out;
@@ -219,13 +219,11 @@ static int sched_credit_domain_set(libxl__gc *gc, uint32_t domid,
xc_domaininfo_t domaininfo;
int rc;
- rc = xc_domain_getinfolist(CTX->xch, domid, 1, &domaininfo);
+ rc = xc_domain_getinfo_single(CTX->xch, domid, &domaininfo);
if (rc < 0) {
- LOGED(ERROR, domid, "Getting domain info list");
+ LOGED(ERROR, domid, "Getting domain info: %d", rc);
return ERROR_FAIL;
}
- if (rc != 1 || domaininfo.domain != domid)
- return ERROR_INVAL;
rc = xc_sched_credit_domain_get(CTX->xch, domid, &sdom);
if (rc != 0) {
@@ -426,13 +424,11 @@ static int sched_credit2_domain_set(libxl__gc *gc, uint32_t domid,
xc_domaininfo_t info;
int rc;
- rc = xc_domain_getinfolist(CTX->xch, domid, 1, &info);
+ rc = xc_domain_getinfo_single(CTX->xch, domid, &info);
if (rc < 0) {
- LOGED(ERROR, domid, "Getting domain info");
+ LOGED(ERROR, domid, "Getting domain info: %d", rc);
return ERROR_FAIL;
}
- if (rc != 1 || info.domain != domid)
- return ERROR_INVAL;
rc = xc_sched_credit2_domain_get(CTX->xch, domid, &sdom);
if (rc != 0) {
@@ -169,8 +169,8 @@ static int xenpaging_get_tot_pages(struct xenpaging *paging)
xc_domaininfo_t domain_info;
int rc;
- rc = xc_domain_getinfolist(xch, paging->vm_event.domain_id, 1, &domain_info);
- if ( rc != 1 )
+ rc = xc_domain_getinfo_single(xch, paging->vm_event.domain_id, &domain_info);
+ if ( rc < 0 )
{
PERROR("Error getting domain info");
return -1;
@@ -424,9 +424,9 @@ static struct xenpaging *xenpaging_init(int argc, char *argv[])
/* Get max_pages from guest if not provided via cmdline */
if ( !paging->max_pages )
{
- rc = xc_domain_getinfolist(xch, paging->vm_event.domain_id, 1,
- &domain_info);
- if ( rc != 1 )
+ rc = xc_domain_getinfo_single(xch, paging->vm_event.domain_id,
+ &domain_info);
+ if ( rc < 0 )
{
PERROR("Error getting domain info");
goto err;
xc_domain_getinfolist() internally relies on a sysctl that performs a linear search for the domids. Many callers of xc_domain_getinfolist() who require information about a precise domid are much better off calling xc_domain_getinfo_single() instead, that will use the getdomaininfo domctl instead and ensure the returned domid matches the requested one. The domtctl will find the domid faster too, because that uses hashed lists. Signed-off-by: Alejandro Vallejo <alejandro.vallejo@cloud.com> --- Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Wei Liu <wl@xen.org> Cc: Anthony PERARD <anthony.perard@citrix.com> Cc: Juergen Gross <jgross@suse.com> --- tools/libs/light/libxl_dom.c | 15 +++++---------- tools/libs/light/libxl_dom_suspend.c | 7 +------ tools/libs/light/libxl_domain.c | 13 +++++-------- tools/libs/light/libxl_mem.c | 4 ++-- tools/libs/light/libxl_sched.c | 12 ++++-------- tools/xenpaging/xenpaging.c | 10 +++++----- 6 files changed, 22 insertions(+), 39 deletions(-)