If we fail to give the access, the domain will unlikely work correctly.
So we should bail out at the first error.
Signed-off-by: Julien Grall <julien.gr...@linaro.org>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
Cc: Ian Campbell <ian.campb...@citrix.com>
Cc: Wei Liu <wei.l...@citrix.com>
---
This patch is candidate for a backport for at least Xen 4.4 and Xen 4.5.
Changes in v2:
- Also bail out when libxl fails to give access to iomem
---
tools/libxl/libxl_create.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 1198225..6f87d1c 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1167,6 +1167,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__multidev *multidev,
"failed give dom%d access to ioports %"PRIx32"-%"PRIx32,
domid, io->first, io->first + io->number - 1);
ret = ERROR_FAIL;
+ goto error_out;
}
}
@@ -1182,6 +1183,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__multidev *multidev,
if (ret < 0) {
LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq);
ret = ERROR_FAIL;
+ goto error_out;
}
}
@@ -1198,7 +1200,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__multidev *multidev,
"failed give dom%d access to iomem range %"PRIx64"-%"PRIx64,
domid, io->start, io->start + io->number - 1);
ret = ERROR_FAIL;
- continue;
+ goto error_out;
}
ret = xc_domain_memory_mapping(CTX->xch, domid,
io->gfn, io->start,
@@ -1209,6 +1211,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__multidev *multidev,
" to guest address %"PRIx64,
domid, io->start, io->start + io->number - 1, io->gfn);
ret = ERROR_FAIL;
+ goto error_out;
}
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
