[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [RFC Patch 11/25] Update libxl__domain_unpause() to support qemu-xen
Currently, libxl__domain_unpause() only supports qemu-xen-traditional. Update it to support qemu-xen. Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx> --- tools/libxl/libxl.c | 13 +++++-------- tools/libxl/libxl_dom.c | 25 +++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 2 ++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 86958fe..3fd31ed 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -977,8 +977,6 @@ out: int libxl__domain_unpause(libxl__gc *gc, uint32_t domid) { - char *path; - char *state; int ret, rc = 0; libxl_domain_type type = libxl__domain_type(gc, domid); @@ -988,12 +986,11 @@ int libxl__domain_unpause(libxl__gc *gc, uint32_t domid) } if (type == LIBXL_DOMAIN_TYPE_HVM) { - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); - state = libxl__xs_read(gc, XBT_NULL, path); - if (state != NULL && !strcmp(state, "paused")) { - libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model_deprecated(gc, domid, "running", - NULL, NULL, NULL); + rc = libxl__domain_unpause_device_model(gc, domid); + if (rc < 0) { + LOG(ERROR, "failed to unpause device model for domain %u:%d", + domid, rc); + goto out; } } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 32db79f..d4bf8b3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1942,6 +1942,31 @@ static void libxl__remus_teardown_done(libxl__egc *egc, dss->callback(egc, dss, rc); } +int libxl__domain_unpause_device_model(libxl__gc *gc, uint32_t domid) +{ + char *path; + char *state; + + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); + state = libxl__xs_read(gc, XBT_NULL, path); + if (state != NULL && !strcmp(state, "paused")) { + libxl__qemu_traditional_cmd(gc, domid, "continue"); + libxl__wait_for_device_model_deprecated(gc, domid, "running", + NULL, NULL, NULL); + } + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + if (libxl__qmp_resume(gc, domid)) + return ERROR_FAIL; + break; + default: + return ERROR_FAIL; + } + + return 0; +} + /*==================== Miscellaneous ====================*/ char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bfc9513..67c73a2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -997,6 +997,8 @@ _hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid, int read_savefile); +_hidden int libxl__domain_unpause_device_model(libxl__gc *gc, + uint32_t domid); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); -- 1.9.3 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |