From: Ian Campbell Date: Thu, 23 Aug 2012 18:00:09 +0000 (+0100) Subject: libxl: make domain resume API asynchronous X-Git-Tag: 4.2.0-rc4~46 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7eaccb3cc3fabdde1fe7ef55300941f5520ca785;p=people%2Fdwmw2%2Fxen.git libxl: make domain resume API asynchronous Although the current implementation has no asynchromous parts I can envisage it needing to do bits of create/destroy like functionality which may need async support in the future. To do this make the meat into an internal libxl__domain_resume function in order to satisfy the no-internal-callers rule for the async function. Since I needed to touch the logging to s/ctx/CTX/ anyway switch to the LOG* helper macros. Signed-off-by: Ian Campbell Acked-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 8ea34788bf..0857c48aee 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -396,15 +396,12 @@ int libxl_domain_rename(libxl_ctx *ctx, uint32_t domid, return rc; } -int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel) +int libxl__domain_resume(libxl__gc *gc, uint32_t domid, int suspend_cancel) { - GC_INIT(ctx); int rc = 0; - if (xc_domain_resume(ctx->xch, domid, suspend_cancel)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "xc_domain_resume failed for domain %u", - domid); + if (xc_domain_resume(CTX->xch, domid, suspend_cancel)) { + LOGE(ERROR, "xc_domain_resume failed for domain %u", domid); rc = ERROR_FAIL; goto out; } @@ -418,24 +415,29 @@ int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel) if (type == LIBXL_DOMAIN_TYPE_HVM) { rc = libxl__domain_resume_device_model(gc, domid); if (rc) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to resume device model for domain %u:%d", - domid, rc); + LOG(ERROR, "failed to resume device model for domain %u:%d", + domid, rc); goto out; } } - if (!xs_resume_domain(ctx->xsh, domid)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "xs_resume_domain failed for domain %u", - domid); + if (!xs_resume_domain(CTX->xsh, domid)) { + LOGE(ERROR, "xs_resume_domain failed for domain %u", domid); rc = ERROR_FAIL; } out: - GC_FREE; return rc; } +int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc = libxl__domain_resume(gc, domid, suspend_cancel); + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + /* * Preserves a domain but rewrites xenstore etc to make it unique so * that the domain can be restarted. diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c614d6fdb9..599c7f10d0 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -529,7 +529,9 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, * If this parameter is true, use co-operative resume. The guest * must support this. */ -int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel); +int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, uint32_t domid, int send_fd, int recv_fd, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 06d5e4f249..e1de83283d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1121,7 +1121,7 @@ static int libxl__remus_domain_resume_callback(void *data) STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ - if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) + if (libxl__domain_resume(gc, dss->domid, /* Fast Suspend */1)) return 0; /* REMUS TODO: Deal with disk. Start a new network output buffer */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7c3b179738..b6f54bad17 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -899,6 +899,9 @@ _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); +_hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, + int suspend_cancel); + /* returns 0 or 1, or a libxl error code */ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index cef89542fa..bca74476a8 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2854,7 +2854,7 @@ static int save_domain(const char *p, const char *filename, int checkpoint, close(fd); if (checkpoint) - libxl_domain_resume(ctx, domid, 1); + libxl_domain_resume(ctx, domid, 1, 0); else libxl_domain_destroy(ctx, domid, 0); @@ -3105,7 +3105,7 @@ static void migrate_domain(const char *domain_spec, const char *rune, if (common_domname) { libxl_domain_rename(ctx, domid, away_domname, common_domname); } - rc = libxl_domain_resume(ctx, domid, 0); + rc = libxl_domain_resume(ctx, domid, 0, 0); if (!rc) fprintf(stderr, "migration sender: Resumed OK.\n"); fprintf(stderr, "Migration failed due to problems at target.\n"); @@ -3127,7 +3127,7 @@ static void migrate_domain(const char *domain_spec, const char *rune, close(send_fd); migration_child_report(recv_fd); fprintf(stderr, "Migration failed, resuming at sender.\n"); - libxl_domain_resume(ctx, domid, 0); + libxl_domain_resume(ctx, domid, 0, 0); exit(-ERROR_FAIL); failed_badly: @@ -6646,7 +6646,7 @@ int main_remus(int argc, char **argv) fprintf(stderr, "Failed to suspend domain at primary.\n"); else { fprintf(stderr, "Remus: Backup failed? resuming domain at primary.\n"); - libxl_domain_resume(ctx, domid, 1); + libxl_domain_resume(ctx, domid, 1, 0); } close(send_fd);