From: rshriram@cs.ubc.ca
To: xen-devel@lists.xensource.com
Cc: anthony.perard@citrix.com, brendan@cs.ubc.ca,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH 4 of 6] libxl: support suspend_cancel in domain_resume
Date: Mon, 30 Jan 2012 17:05:09 -0800 [thread overview]
Message-ID: <efe92d80c47487485056.1327971909@athos.nss.cs.ubc.ca> (raw)
In-Reply-To: <patchbomb.1327971905@athos.nss.cs.ubc.ca>
# HG changeset patch
# User Shriram Rajagopalan <rshriram@cs.ubc.ca>
# Date 1327971527 28800
# Node ID efe92d80c47487485056266a1404a8d2817b7f09
# Parent cd3d43d88c0568142dd061e744c34479e1a440f4
libxl: support suspend_cancel in domain_resume
Add an extra parameter to libxl_domain_resume indicating
if the caller wishes to use the SUSPEND_CANCEL style
resume instead of the normal resume.
Signed-off-by: Shriram Rajagopalan <rshriram@cs.ubc.ca>
diff -r cd3d43d88c05 -r efe92d80c474 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Mon Jan 30 16:58:31 2012 -0800
+++ b/tools/libxl/libxl.c Mon Jan 30 16:58:47 2012 -0800
@@ -229,24 +229,29 @@ int libxl_domain_rename(libxl_ctx *ctx,
return rc;
}
-int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid)
+int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int fast)
{
GC_INIT(ctx);
int rc = 0;
- if (LIBXL__DOMAIN_IS_TYPE(gc, domid, HVM)) {
- LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Called domain_resume on "
- "non-cooperative hvm domain %u", domid);
- rc = ERROR_NI;
- goto out;
- }
- if (xc_domain_resume(ctx->xch, domid, 0)) {
+ if (xc_domain_resume(ctx->xch, domid, fast)) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
"xc_domain_resume failed for domain %u",
domid);
rc = ERROR_FAIL;
goto out;
}
+
+ if (LIBXL__DOMAIN_IS_TYPE(gc, domid, 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);
+ goto out;
+ }
+ }
+
if (!xs_resume_domain(ctx->xsh, domid)) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
"xs_resume_domain failed for domain %u",
diff -r cd3d43d88c05 -r efe92d80c474 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Mon Jan 30 16:58:31 2012 -0800
+++ b/tools/libxl/libxl.h Mon Jan 30 16:58:47 2012 -0800
@@ -268,7 +268,7 @@ int libxl_domain_create_restore(libxl_ct
void libxl_domain_config_dispose(libxl_domain_config *d_config);
int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info,
uint32_t domid, int fd);
-int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid);
+int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int fast);
int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid);
int libxl_domain_reboot(libxl_ctx *ctx, uint32_t domid);
int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid);
diff -r cd3d43d88c05 -r efe92d80c474 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Mon Jan 30 16:58:31 2012 -0800
+++ b/tools/libxl/xl_cmdimpl.c Mon Jan 30 16:58:47 2012 -0800
@@ -2751,7 +2751,7 @@ static void migrate_domain(const char *d
if (common_domname) {
libxl_domain_rename(ctx, domid, away_domname, common_domname);
}
- rc = libxl_domain_resume(ctx, domid);
+ rc = libxl_domain_resume(ctx, domid, 1);
if (!rc) fprintf(stderr, "migration sender: Resumed OK.\n");
fprintf(stderr, "Migration failed due to problems at target.\n");
@@ -2773,7 +2773,7 @@ static void migrate_domain(const char *d
close(send_fd);
migration_child_report(child, recv_fd);
fprintf(stderr, "Migration failed, resuming at sender.\n");
- libxl_domain_resume(ctx, domid);
+ libxl_domain_resume(ctx, domid, 1);
exit(-ERROR_FAIL);
failed_badly:
next prev parent reply other threads:[~2012-01-31 1:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 1:05 [PATCH 0 of 6] libxl: refactor suspend/resume code rshriram
2012-01-31 1:05 ` [PATCH 1 of 6] libxl: helper function to send commands to traditional qemu rshriram
2012-01-31 9:46 ` Ian Campbell
2012-01-31 17:30 ` Shriram Rajagopalan
2012-02-09 18:08 ` Ian Jackson
2012-01-31 1:05 ` [PATCH 2 of 6] libxl: bugfix: create_domain() return to caller if !daemonize rshriram
2012-01-31 9:47 ` Ian Campbell
2012-02-09 18:06 ` Ian Jackson
2012-01-31 1:05 ` [PATCH 3 of 6] libxl: QMP stop/resume & refactor QEMU suspend/resume/save rshriram
2012-01-31 9:54 ` Ian Campbell
2012-01-31 17:32 ` Shriram Rajagopalan
2012-01-31 23:53 ` Shriram Rajagopalan
2012-02-01 10:46 ` Ian Campbell
2012-01-31 1:05 ` rshriram [this message]
2012-01-31 10:00 ` [PATCH 4 of 6] libxl: support suspend_cancel in domain_resume Ian Campbell
2012-01-31 10:04 ` Ian Campbell
2012-01-31 17:52 ` Shriram Rajagopalan
2012-02-01 10:47 ` Ian Campbell
2012-02-01 10:53 ` Ian Campbell
2012-02-01 15:48 ` Pasi Kärkkäinen
2012-02-01 16:02 ` Ian Campbell
2012-02-01 19:30 ` Shriram Rajagopalan
2012-02-02 7:04 ` Shriram Rajagopalan
2012-02-02 7:59 ` Ian Campbell
2012-02-02 7:58 ` Ian Campbell
2012-01-31 1:05 ` [PATCH 5 of 6] libxl: refactor migrate_domain and generalize migrate_receive rshriram
2012-01-31 10:19 ` Ian Campbell
2012-01-31 1:05 ` [PATCH 6 of 6] libxl: resume instead of unpause on xl save -c rshriram
2012-01-31 10:21 ` Ian Campbell
2012-01-31 17:55 ` Shriram Rajagopalan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=efe92d80c47487485056.1327971909@athos.nss.cs.ubc.ca \
--to=rshriram@cs.ubc.ca \
--cc=anthony.perard@citrix.com \
--cc=brendan@cs.ubc.ca \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).