diff options
-rw-r--r-- | tools/libxc/xc_domain.c | 10 | ||||
-rw-r--r-- | tools/libxc/xenctrl.h | 12 | ||||
-rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 11 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 9 | ||||
-rw-r--r-- | xen/common/domctl.c | 17 | ||||
-rw-r--r-- | xen/include/public/domctl.h | 1 |
6 files changed, 60 insertions, 0 deletions
diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 9a156ebba4..98e909d0a3 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -89,6 +89,16 @@ int xc_domain_shutdown(int xc_handle, } +int xc_domain_resume(int xc_handle, + uint32_t domid) +{ + DECLARE_DOMCTL; + domctl.cmd = XEN_DOMCTL_resumedomain; + domctl.domain = (domid_t)domid; + return do_domctl(xc_handle, &domctl); +} + + int xc_vcpu_setaffinity(int xc_handle, uint32_t domid, int vcpu, diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index a5df681e3e..715764ac6e 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -236,6 +236,18 @@ int xc_domain_unpause(int xc_handle, int xc_domain_destroy(int xc_handle, uint32_t domid); + +/** + * This function resumes a suspended domain. The domain should have + * been previously suspended. + * + * @parm xc_handle a handle to an open hypervisor interface + * @parm domid the domain id to resume + * return 0 on success, -1 on failure + */ +int xc_domain_resume(int xc_handle, + uint32_t domid); + /** * This function will shutdown a domain. This is intended for use in * fully-virtualized domains where this operation is analogous to the diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index fb6ee675d9..a95b7d9bf8 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -174,6 +174,10 @@ static PyObject *pyxc_domain_shutdown(XcObject *self, PyObject *args) return zero; } +static PyObject *pyxc_domain_resume(XcObject *self, PyObject *args) +{ + return dom_op(self, args, xc_domain_resume); +} static PyObject *pyxc_vcpu_setaffinity(XcObject *self, PyObject *args, @@ -1042,6 +1046,13 @@ static PyMethodDef pyxc_methods[] = { "Destroy a domain.\n" " dom [int]: Identifier of domain to be destroyed.\n\n" "Returns: [int] 0 on success; -1 on error.\n" }, + + { "domain_resume", + (PyCFunction)pyxc_domain_resume, + METH_VARARGS, "\n" + "Resume execution of a suspended domain.\n" + " dom [int]: Identifier of domain to be resumed.\n\n" + "Returns: [int] 0 on success; -1 on error.\n" }, { "domain_shutdown", (PyCFunction)pyxc_domain_shutdown, diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 27cba0049c..087ff0e5aa 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1539,6 +1539,15 @@ class XendDomainInfo: self.cleanupDomain() + def resumeDomain(self): + log.debug("XendDomainInfo.resumeDomain(%s)", str(self.domid)) + + try: + if self.domid is not None: + xc.domain_resume(self.domid) + except: + log.exception("XendDomainInfo.resume: xc.domain_resume failed on domain %s." % (str(self.domid))) + # # Channels for xenstore and console # diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 230d204912..a374b1ca32 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -286,6 +286,23 @@ ret_t do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_resumedomain: + { + struct domain *d = find_domain_by_id(op->domain); + struct vcpu *v; + + ret = -ESRCH; + if ( d != NULL ) + { + ret = 0; + if ( test_and_clear_bit(_DOMF_shutdown, &d->domain_flags) ) + for_each_vcpu ( d, v ) + vcpu_wake(v); + put_domain(d); + } + } + break; + case XEN_DOMCTL_createdomain: { struct domain *d; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0a75ef7a20..fcf4fa0211 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -63,6 +63,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t); #define XEN_DOMCTL_destroydomain 2 #define XEN_DOMCTL_pausedomain 3 #define XEN_DOMCTL_unpausedomain 4 +#define XEN_DOMCTL_resumedomain 27 #define XEN_DOMCTL_getdomaininfo 5 struct xen_domctl_getdomaininfo { |