From a0fe46bdedff9b7175cdedad1ee29451d4105d35 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 26 Oct 2012 16:42:10 +0100 Subject: [PATCH] xl: resume the domain on suspend failure The MUST macro calls exit(3) on failure but we need to cleanup and resume. Signed-off-by: Bastian Blank Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 25942:16ee1d300cfd Backport-requested-by: Ian Campbell Committed-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5b59dd0847..c997015383 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2997,15 +2997,18 @@ static int save_domain(const char *p, const char *filename, int checkpoint, save_domain_core_writeconfig(fd, filename, config_data, config_len); - MUST(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); + int rc = libxl_domain_suspend(ctx, domid, fd, 0, NULL); close(fd); - if (checkpoint) + if (rc < 0) + fprintf(stderr, "Failed to save domain, resuming domain\n"); + + if (checkpoint || rc < 0) libxl_domain_resume(ctx, domid, 1, 0); else libxl_domain_destroy(ctx, domid, 0); - exit(0); + exit(rc < 0 ? 1 : 0); } static pid_t create_migration_child(const char *rune, int *send_fd,