[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v5 14/15] libxl: Change libxl__domain_suspend_device_model() to be async.
This create an extra step for the two call sites of the function. Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx> --- libxl_domain_soft_reset() haven't been tested, as it doesn't appear to possible to call the function from xl. --- tools/libxl/libxl_create.c | 30 ++++++++++++++++++++++-------- tools/libxl/libxl_dom_suspend.c | 8 ++++++-- tools/libxl/libxl_internal.h | 4 +++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 60676304e9..4d42c2057a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1761,6 +1761,9 @@ error: domcreate_complete(egc, &cdcs->dcs, rc); } +static void soft_reset_dm_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dsps, + int rc); static int do_domain_soft_reset(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t domid_soft_reset, @@ -1843,30 +1846,41 @@ static int do_domain_soft_reset(libxl_ctx *ctx, goto out; } - rc = libxl__domain_suspend_device_model(gc, &dss->dsps); + dss->dsps.ao = ao; + dss->dsps.callback_device_model_done = soft_reset_dm_suspended; + rc = libxl__domain_suspend_device_model(egc, &dss->dsps); if (rc) { LOGD(ERROR, domid_soft_reset, "failed to suspend device model."); goto out; } + return AO_INPROGRESS; + + out: + return AO_CREATE_FAIL(rc); +} + +static void soft_reset_dm_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dsps, + int rc) +{ + STATE_AO_GC(dsps->ao); + libxl__domain_soft_reset_state *srs = CONTAINER_OF(dsps, *srs, dss.dsps); + libxl__app_domain_create_state *cdcs = &srs->cdcs; + /* * Ask all backends to disconnect by removing the domain from * xenstore. On the creation path the domain will be introduced to * xenstore again with probably different store/console/... * channels. */ - xs_release_domain(ctx->xsh, cdcs->dcs.domid_soft_reset); + xs_release_domain(CTX->xsh, cdcs->dcs.domid_soft_reset); srs->dds.ao = ao; - srs->dds.domid = domid_soft_reset; + srs->dds.domid = cdcs->dcs.domid_soft_reset; srs->dds.callback = domain_soft_reset_cb; srs->dds.soft_reset = true; libxl__domain_destroy(egc, &srs->dds); - - return AO_INPROGRESS; - - out: - return AO_CREATE_FAIL(rc); } static void domain_create_cb(libxl__egc *egc, diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c index 1e904bae8a..51c432a00a 100644 --- a/tools/libxl/libxl_dom_suspend.c +++ b/tools/libxl/libxl_dom_suspend.c @@ -68,9 +68,10 @@ out: /*----- callbacks, called by xc_domain_save -----*/ -int libxl__domain_suspend_device_model(libxl__gc *gc, +int libxl__domain_suspend_device_model(libxl__egc *egc, libxl__domain_suspend_state *dsps) { + STATE_AO_GC(dsps->ao); int ret = 0; uint32_t const domid = dsps->domid; const char *const filename = dsps->dm_savefile; @@ -94,6 +95,7 @@ int libxl__domain_suspend_device_model(libxl__gc *gc, return ERROR_INVAL; } + dsps->callback_device_model_done(egc, dsps, ret); return ret; } @@ -378,13 +380,15 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__ev_time_deregister(gc, &dsps->guest_timeout); if (dsps->type == LIBXL_DOMAIN_TYPE_HVM) { - rc = libxl__domain_suspend_device_model(gc, dsps); + dsps->callback_device_model_done = domain_suspend_common_done; + rc = libxl__domain_suspend_device_model(egc, dsps); if (rc) { LOGD(ERROR, dsps->domid, "libxl__domain_suspend_device_model failed ret=%d", rc); domain_suspend_common_done(egc, dsps, rc); return; } + return; } domain_suspend_common_done(egc, dsps, 0); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0631ab1a03..7f0ad75160 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3407,6 +3407,8 @@ struct libxl__domain_suspend_state { libxl__ev_time guest_timeout; const char *dm_savefile; + void (*callback_device_model_done)(libxl__egc*, + struct libxl__domain_suspend_state*, int ok); void (*callback_common_done)(libxl__egc*, struct libxl__domain_suspend_state*, int ok); }; @@ -4024,7 +4026,7 @@ static inline bool libxl__save_helper_inuse(const libxl__save_helper_state *shs) } /* Each time the dm needs to be saved, we must call suspend and then save */ -_hidden int libxl__domain_suspend_device_model(libxl__gc *gc, +_hidden int libxl__domain_suspend_device_model(libxl__egc *egc, libxl__domain_suspend_state *dsps); _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); -- Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |