[Xen-changelog] [xen master] libxl: fix cleanup bug in initiate_domain_create()

[patchbot@xxxxxxx]

commit d094e95fb7c61c5f46d8e446b4bdc028438dea1c
Author:     PaweÅ? Marczewski <pawel@xxxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Fri Mar 13 11:25:10 2020 +0000
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Fri Mar 13 11:33:40 2020 +0000

    libxl: fix cleanup bug in initiate_domain_create()
    
    In case of errors, we immediately call domcreate_complete()
    which cleans up the console_xswait object. Make sure it is initialized
    before we start cleanup.
    
    Signed-off-by: PaweÅ? Marczewski <pawel@xxxxxxxxxxxxxxxxxxxxxx>
    Reviewed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/libxl_create.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 7891fae426..772344c648 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1168,6 +1168,8 @@ static void initiate_domain_create(libxl__egc *egc,
     libxl_domain_config *const d_config = dcs->guest_config;
     const int restore_fd = dcs->restore_fd;
 
+    libxl__xswait_init(&dcs->console_xswait);
+
     domid = dcs->domid;
     libxl__domain_build_state_init(&dcs->build_state);
 
@@ -1219,8 +1221,6 @@ static void initiate_domain_create(libxl__egc *egc,
     if (ret)
         goto error_out;
 
-    libxl__xswait_init(&dcs->console_xswait);
-
     if (restore_fd >= 0 || dcs->soft_reset) {
         LOGD(DEBUG, domid, "restoring, not running bootloader");
         domcreate_bootloader_done(egc, &dcs->bl, 0);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog