From 4d1759b5153ce5b0903e56fefcfdca8a03b7c246 Mon Sep 17 00:00:00 2001 From: Ian Murray Date: Thu, 4 Jul 2013 00:58:27 +0100 Subject: xl: support for leaving domain paused after save New feature to allow xl save to leave a domain paused after its memory has been saved. This is to allow disk snapshots of domU to be taken that exactly correspond to the memory state at save time. Once the snapshot(s) have been taken or whatever, the domain can be unpaused in the usual manner. Usage: xl save -p Signed-off-by: Ian Murray Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 20 ++++++++++++++------ tools/libxl/xl_cmdtable.c | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'tools/libxl') diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d365f904c0..4a8feaf65d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3266,7 +3266,7 @@ static void save_domain_core_writeconfig(int fd, const char *source, } static int save_domain(uint32_t domid, const char *filename, int checkpoint, - const char *override_config_file) + int leavepaused, const char *override_config_file) { int fd; uint8_t *config_data; @@ -3290,11 +3290,15 @@ static int save_domain(uint32_t domid, const char *filename, int checkpoint, int rc = libxl_domain_suspend(ctx, domid, fd, 0, NULL); close(fd); - if (rc < 0) + if (rc < 0) { fprintf(stderr, "Failed to save domain, resuming domain\n"); - - if (checkpoint || rc < 0) libxl_domain_resume(ctx, domid, 1, 0); + } + else if (leavepaused || checkpoint) { + if (leavepaused) + libxl_domain_pause(ctx, domid); + libxl_domain_resume(ctx, domid, 1, 0); + } else libxl_domain_destroy(ctx, domid, 0); @@ -3838,12 +3842,16 @@ int main_save(int argc, char **argv) const char *filename; const char *config_filename = NULL; int checkpoint = 0; + int leavepaused = 0; int opt; - SWITCH_FOREACH_OPT(opt, "c", NULL, "save", 2) { + SWITCH_FOREACH_OPT(opt, "cp", NULL, "save", 2) { case 'c': checkpoint = 1; break; + case 'p': + leavepaused = 1; + break; } if (argc-optind > 3) { @@ -3856,7 +3864,7 @@ int main_save(int argc, char **argv) if ( argc - optind >= 3 ) config_filename = argv[optind + 2]; - save_domain(domid, filename, checkpoint, config_filename); + save_domain(domid, filename, checkpoint, leavepaused, config_filename); return 0; } diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 44b42b0311..326a6606e0 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -142,7 +142,8 @@ struct cmd_spec cmd_table[] = { "Save a domain state to restore later", "[options] []", "-h Print this help.\n" - "-c Leave domain running after creating the snapshot." + "-c Leave domain running after creating the snapshot.\n" + "-p Leave domain paused after creating the snapshot." }, { "migrate", &main_migrate, 0, 1, -- cgit v1.2.3