[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen master] libxl: Initialize domain build info before calling libxl__domain_make
From: patchbot () xen ! org
Date: 2016-09-29 22:26:55
Message-ID: E1bpjn5-0004wL-AK () xenbits ! xenproject ! org
[Download RAW message or body]
commit f14e5cda422f2413d7e739dc0caf5d5cb6a061be
Author: Boris Ostrovsky <boris.ostrovsky@oracle.com>
AuthorDate: Wed Sep 28 09:22:04 2016 -0400
Commit: Wei Liu <wei.liu2@citrix.com>
CommitDate: Wed Sep 28 14:32:05 2016 +0100
libxl: Initialize domain build info before calling libxl__domain_make
libxl__domain_make() may want to use b_info so we should set defaults
a little earlier.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_create.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 04f8ae9..07b2b4b 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -899,17 +899,6 @@ static void initiate_domain_create(libxl__egc *egc,
goto error_out;
}
- ret = libxl__domain_make(gc, d_config, &domid, &state->config);
- if (ret) {
- LOG(ERROR, "cannot make domain: %d", ret);
- dcs->guest_domid = domid;
- ret = ERROR_FAIL;
- goto error_out;
- }
-
- dcs->guest_domid = domid;
- dcs->sdss.dm.guest_domid = 0; /* means we haven't spawned */
-
ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info);
if (ret) {
LOG(ERROR, "Unable to set domain build info defaults");
@@ -923,6 +912,17 @@ static void initiate_domain_create(libxl__egc *egc,
goto error_out;
}
+ ret = libxl__domain_make(gc, d_config, &domid, &state->config);
+ if (ret) {
+ LOG(ERROR, "cannot make domain: %d", ret);
+ dcs->guest_domid = domid;
+ ret = ERROR_FAIL;
+ goto error_out;
+ }
+
+ dcs->guest_domid = domid;
+ dcs->sdss.dm.guest_domid = 0; /* means we haven't spawned */
+
/*
* Set the dm version quite early so that libxl doesn't have to pass the
* build info around just to know if the domain has a device model or not.
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
https://lists.xenproject.org/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic