dds->stubdom.ao = ao;
dds->stubdom.domid = stubdomid;
dds->stubdom.callback = stubdom_destroy_callback;
+ dds->stubdom.soft_reset = false;
libxl__destroy_domid(egc, &dds->stubdom);
} else {
dds->stubdom_finished = 1;
dds->domain.ao = ao;
dds->domain.domid = dds->domid;
dds->domain.callback = domain_destroy_callback;
+ dds->domain.soft_reset = dds->soft_reset;
libxl__destroy_domid(egc, &dds->domain);
}
/* Clean up qemu-save and qemu-resume files. They are
* intermediate files created by libxc. Unfortunately they
- * don't fit in existing userdata scheme very well.
+ * don't fit in existing userdata scheme very well. In soft reset
+ * case we need to keep the file.
*/
- rc = libxl__remove_file(gc, libxl__device_model_savefile(gc, domid));
- if (rc < 0) goto out;
+ if (!dis->soft_reset) {
+ rc = libxl__remove_file(gc,
+ libxl__device_model_savefile(gc, domid));
+ if (rc < 0) goto out;
+ }
rc = libxl__remove_file(gc,
GCSPRINTF(LIBXL_DEVICE_MODEL_RESTORE_FILE".%u", domid));
if (rc < 0) goto out;
ctx->xch = xc_interface_open(ctx->lg,0,0);
if (!ctx->xch) goto badchild;
- rc = xc_domain_destroy(ctx->xch, domid);
+ if (!dis->soft_reset) {
+ rc = xc_domain_destroy(ctx->xch, domid);
+ } else {
+ rc = xc_domain_pause(ctx->xch, domid);
+ if (rc < 0) goto badchild;
+ rc = xc_domain_soft_reset(ctx->xch, domid);
+ if (rc < 0) goto badchild;
+ rc = xc_domain_unpause(ctx->xch, domid);
+ }
if (rc < 0) goto badchild;
_exit(0);
/* convenience aliases */
libxl_domain_create_info *info = &d_config->c_info;
- assert(!libxl_domid_valid_guest(*domid));
-
uuid_string = libxl__uuid2string(gc, info->uuid);
if (!uuid_string) {
rc = ERROR_NOMEM;
}
flags |= XEN_DOMCTL_CDF_hap;
}
- *domid = -1;
/* Ultimately, handle is an array of 16 uint8_t, same as uuid */
libxl_uuid_copy(ctx, (libxl_uuid *)handle, &info->uuid);
goto out;
}
- ret = xc_domain_create_config(ctx->xch, info->ssidref,
- handle, flags, domid,
- xc_config);
- if (ret < 0) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "domain creation fail");
- rc = ERROR_FAIL;
- goto out;
+ /* Valid domid here means we're soft resetting. */
+ if (!libxl_domid_valid_guest(*domid)) {
+ ret = xc_domain_create_config(ctx->xch, info->ssidref,
+ handle, flags, domid,
+ xc_config);
+ if (ret < 0) {
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
+ "domain creation fail");
+ rc = ERROR_FAIL;
+ goto out;
+ }
}
rc = libxl__arch_domain_save_config(gc, d_config, xc_config);
libxl_domain_config *const d_config = dcs->guest_config;
libxl__domain_build_state *const state = &dcs->build_state;
const int restore_fd = dcs->restore_fd;
- memset(&dcs->build_state, 0, sizeof(dcs->build_state));
- domid = 0;
+ domid = dcs->domid_soft_reset;
if (d_config->c_info.ssid_label) {
char *s = d_config->c_info.ssid_label;
d_config->nics[i].devid = ++last_devid;
}
- if (restore_fd >= 0) {
+ if (restore_fd >= 0 || dcs->domid_soft_reset != INVALID_DOMID) {
LOG(DEBUG, "restoring, not running bootloader");
domcreate_bootloader_done(egc, &dcs->bl, 0);
} else {
dcs->dmss.dm.callback = domcreate_devmodel_started;
dcs->dmss.callback = domcreate_devmodel_started;
- if ( restore_fd < 0 ) {
+ if (restore_fd < 0 && dcs->domid_soft_reset == INVALID_DOMID) {
rc = libxl__domain_build(gc, d_config, domid, state);
domcreate_rebuild_done(egc, dcs, rc);
return;
dcs->srs.completion_callback = domcreate_stream_done;
dcs->srs.checkpoint_callback = remus_checkpoint_stream_done;
- libxl__stream_read_start(egc, &dcs->srs);
- return;
+ if (restore_fd >= 0) {
+ libxl__stream_read_start(egc, &dcs->srs);
+ return;
+ }
out:
domcreate_stream_done(egc, &dcs->srs, rc);
libxl__file_reference_unmap(&state->pv_ramdisk);
}
- esave = errno;
- libxl_fd_set_nonblock(ctx, fd, 0);
- errno = esave;
+ /* fd == -1 here means we're doing soft reset. */
+ if (fd != -1) {
+ esave = errno;
+ libxl_fd_set_nonblock(ctx, fd, 0);
+ errno = esave;
+ }
domcreate_rebuild_done(egc, dcs, ret);
}
uint32_t *domid_out;
} libxl__app_domain_create_state;
+typedef struct {
+ libxl__app_domain_create_state cdcs;
+ libxl__domain_destroy_state dds;
+ libxl__domain_suspend_state dss;
+ char *toolstack_buf;
+ uint32_t toolstack_len;
+} libxl__domain_soft_reset_state;
+
static void domain_create_cb(libxl__egc *egc,
libxl__domain_create_state *dcs,
int rc, uint32_t domid);
if (rc < 0) goto out_err;
}
cdcs->dcs.callback = domain_create_cb;
+ cdcs->dcs.domid_soft_reset = INVALID_DOMID;
libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how);
cdcs->domid_out = domid;
}
+static void domain_soft_reset_cb(libxl__egc *egc,
+ libxl__domain_destroy_state *dds,
+ int rc)
+{
+ STATE_AO_GC(dds->ao);
+ libxl__domain_soft_reset_state *srs = CONTAINER_OF(dds, *srs, dds);
+ libxl__app_domain_create_state *cdcs = &srs->cdcs;
+ char *savefile, *restorefile;
+
+ if (rc) {
+ LOG(ERROR, "destruction of domain %u failed.", dds->domid);
+ goto error;
+ }
+
+ cdcs->dcs.guest_domid = dds->domid;
+ rc = libxl__restore_emulator_xenstore_data(&cdcs->dcs, srs->toolstack_buf,
+ srs->toolstack_len);
+ if (rc) {
+ LOG(ERROR, "failed to restore toolstack record.");
+ goto error;
+ }
+
+ savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d", dds->domid);
+ restorefile = GCSPRINTF(LIBXL_DEVICE_MODEL_RESTORE_FILE".%d", dds->domid);
+ rc = rename(savefile, restorefile);
+ if (rc) {
+ LOG(ERROR, "failed to rename dm save file.");
+ goto error;
+ }
+
+ initiate_domain_create(egc, &cdcs->dcs);
+ return;
+
+error:
+ domcreate_complete(egc, &cdcs->dcs, rc);
+}
+
+static int do_domain_soft_reset(libxl_ctx *ctx,
+ libxl_domain_config *d_config,
+ uint32_t domid_soft_reset,
+ const libxl_asyncop_how *ao_how,
+ const libxl_asyncprogress_how
+ *aop_console_how)
+{
+ AO_CREATE(ctx, 0, ao_how);
+ libxl__domain_soft_reset_state *srs;
+ libxl__app_domain_create_state *cdcs;
+ libxl__domain_create_state *dcs;
+ libxl__domain_build_state *state;
+ libxl__domain_suspend_state *dss;
+ char *dom_path, *xs_store_mfn, *xs_console_mfn;
+ uint32_t domid_out;
+ int rc;
+
+ GCNEW(srs);
+ cdcs = &srs->cdcs;
+ dcs = &cdcs->dcs;
+ state = &dcs->build_state;
+ dss = &srs->dss;
+
+ srs->cdcs.dcs.ao = ao;
+ srs->cdcs.dcs.guest_config = d_config;
+ libxl_domain_config_init(&srs->cdcs.dcs.guest_config_saved);
+ libxl_domain_config_copy(ctx, &srs->cdcs.dcs.guest_config_saved,
+ d_config);
+ cdcs->dcs.restore_fd = -1;
+ cdcs->dcs.domid_soft_reset = domid_soft_reset;
+ cdcs->dcs.callback = domain_create_cb;
+ libxl__ao_progress_gethow(&srs->cdcs.dcs.aop_console_how,
+ aop_console_how);
+ cdcs->domid_out = &domid_out;
+
+ dom_path = libxl__xs_get_dompath(gc, domid_soft_reset);
+ if (!dom_path) {
+ LOG(ERROR, "failed to read domain path");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ xs_store_mfn = xs_read(ctx->xsh, XBT_NULL,
+ GCSPRINTF("%s/store/ring-ref", dom_path),
+ NULL);
+ state->store_mfn = xs_store_mfn ? atol(xs_store_mfn): 0;
+ free(xs_store_mfn);
+
+ xs_console_mfn = xs_read(ctx->xsh, XBT_NULL,
+ GCSPRINTF("%s/console/ring-ref", dom_path),
+ NULL);
+ state->console_mfn = xs_console_mfn ? atol(xs_console_mfn): 0;
+ free(xs_console_mfn);
+
+ dss->ao = ao;
+ dss->domid = domid_soft_reset;
+ dss->dm_savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d",
+ domid_soft_reset);
+
+ rc = libxl__save_emulator_xenstore_data(dss, &srs->toolstack_buf,
+ &srs->toolstack_len);
+ if (rc) {
+ LOG(ERROR, "failed to save toolstack record.");
+ goto out;
+ }
+
+ rc = libxl__domain_suspend_device_model(gc, dss);
+ if (rc) {
+ LOG(ERROR, "failed to suspend device model.");
+ goto out;
+ }
+
+ /*
+ * 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);
+
+ srs->dds.ao = ao;
+ srs->dds.domid = 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,
libxl__domain_create_state *dcs,
int rc, uint32_t domid)
ao_how, aop_console_how);
}
+int libxl_domain_soft_reset(libxl_ctx *ctx,
+ libxl_domain_config *d_config,
+ uint32_t domid,
+ const libxl_asyncop_how *ao_how,
+ const libxl_asyncprogress_how
+ *aop_console_how)
+{
+ libxl_domain_build_info *const info = &d_config->b_info;
+
+ if (info->type != LIBXL_DOMAIN_TYPE_HVM) return ERROR_INVAL;
+
+ return do_domain_soft_reset(ctx, d_config, domid, ao_how,
+ aop_console_how);
+}
+
/*
* Local variables:
* mode: C
[LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY] = "coredump-destroy",
[LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_RESTART] = "coredump-restart",
+
+ [LIBXL_ACTION_ON_SHUTDOWN_SOFT_RESET] = "soft-reset",
};
/* Optional data, in order:
}
if (xlu_cfg_get_string (config, "on_soft_reset", &buf, 0))
- buf = "restart";
+ buf = "soft-reset";
if (!parse_action_on_shutdown(buf, &d_config->on_soft_reset)) {
fprintf(stderr, "Unknown on_soft_reset action \"%s\" specified\n", buf);
exit(1);
*r_domid = INVALID_DOMID;
break;
+ case LIBXL_ACTION_ON_SHUTDOWN_SOFT_RESET:
+ reload_domain_config(*r_domid, d_config);
+ restart = DOMAIN_RESTART_SOFT_RESET;
+ break;
+
case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY:
case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_RESTART:
/* Already handled these above. */
int restore_fd_to_close = -1;
const libxl_asyncprogress_how *autoconnect_console_how;
struct save_file_header hdr;
+ uint32_t domid_soft_reset = INVALID_DOMID;
int restoring = (restore_file || (migrate_fd >= 0));
* restore/migrate-receive it again.
*/
restoring = 0;
- }else{
+ } else if (domid_soft_reset != INVALID_DOMID) {
+ /* Do soft reset. */
+ ret = libxl_domain_soft_reset(ctx, &d_config, domid_soft_reset,
+ 0, autoconnect_console_how);
+ domid = domid_soft_reset;
+ domid_soft_reset = INVALID_DOMID;
+ } else {
ret = libxl_domain_create_new(ctx, &d_config, &domid,
0, autoconnect_console_how);
}
event->u.domain_shutdown.shutdown_reason,
event->u.domain_shutdown.shutdown_reason);
switch (handle_domain_death(&domid, event, &d_config)) {
+ case DOMAIN_RESTART_SOFT_RESET:
+ domid_soft_reset = domid;
+ domid = INVALID_DOMID;
+ /* fall through */
case DOMAIN_RESTART_RENAME:
- if (!preserve_domain(&domid, event, &d_config)) {
+ if (domid_soft_reset == INVALID_DOMID &&
+ !preserve_domain(&domid, event, &d_config)) {
/* If we fail then exit leaving the old domain in place. */
ret = -1;
goto out;
projects / people / julieng / xen-unstable.git / commitdiff