Mailing List Archive

This new function connects to QEMU, sends the command and disconnects.

Backport of xen-unstable patch:
: HG changeset patch
: User Anthony PERARD <anthony.perard@citrix.com>
: Date 1349693134 -3600
: Node ID f3890916496445c97d6778d6c986b0270ff707f2
: Parent be5d014f91dfbd67afacc3385c265243794a246f
---
tools/libxl/libxl_qmp.c | 77 +++++++++++++---------------------------------
1 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index 605e8f3..b09bf13 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -798,6 +798,23 @@ out:
return rc;
}

+static int qmp_run_command(libxl__gc *gc, int domid,
+ const char *cmd, libxl__json_object *args,
+ qmp_callback_t callback, void *opaque)
+{
+ libxl__qmp_handler *qmp = NULL;
+ int rc = 0;
+
+ qmp = libxl__qmp_initialize(gc, domid);
+ if (!qmp)
+ return ERROR_FAIL;
+
+ rc = qmp_synchronous_send(qmp, cmd, args, callback, opaque, qmp->timeout);
+
+ libxl__qmp_close(qmp);
+ return rc;
+}
+
int libxl__qmp_pci_add(libxl__gc *gc, int domid, libxl_device_pci *pcidev)
{
libxl__qmp_handler *qmp = NULL;
@@ -836,21 +853,10 @@ int libxl__qmp_pci_add(libxl__gc *gc, int domid, libxl_device_pci *pcidev)

static int qmp_device_del(libxl__gc *gc, int domid, char *id)
{
- libxl__qmp_handler *qmp = NULL;
libxl__json_object *args = NULL;
- int rc = 0;
-
- qmp = libxl__qmp_initialize(gc, domid);
- if (!qmp)
- return ERROR_FAIL;

qmp_parameters_add_string(gc, &args, "id", id);
-
- rc = qmp_synchronous_send(qmp, "device_del", args,
- NULL, NULL, qmp->timeout);
-
- libxl__qmp_close(qmp);
- return rc;
+ return qmp_run_command(gc, domid, "device_del", args, NULL, NULL);
}

int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev)
@@ -865,27 +871,10 @@ int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev)

int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename)
{
- libxl__qmp_handler *qmp = NULL;
libxl__json_object *args = NULL;
- int rc = 0;
-
- qmp = libxl__qmp_initialize(gc, domid);
- if (!qmp)
- return ERROR_FAIL;
-
- qmp_parameters_add_string(gc, &args, "filename", (char *)filename);
- if (!args) {
- rc = ERROR_NOMEM;
- goto out;
- }
-
- rc = qmp_synchronous_send(qmp, "xen-save-devices-state", args,
- NULL, NULL, qmp->timeout);
-
-out:
- libxl__qmp_close(qmp);
- return rc;

+ return qmp_run_command(gc, domid, "xen-save-devices-state", args,
+ NULL, NULL);
}

static int qmp_change(libxl__gc *gc, libxl__qmp_handler *qmp,
@@ -908,34 +897,12 @@ static int qmp_change(libxl__gc *gc, libxl__qmp_handler *qmp,

int libxl__qmp_stop(libxl__gc *gc, int domid)
{
- libxl__qmp_handler *qmp = NULL;
- int rc = 0;
-
- qmp = libxl__qmp_initialize(gc, domid);
- if (!qmp)
- return ERROR_FAIL;
-
- rc = qmp_synchronous_send(qmp, "stop", NULL,
- NULL, NULL, qmp->timeout);
-
- libxl__qmp_close(qmp);
- return rc;
+ return qmp_run_command(gc, domid, "stop", NULL, NULL, NULL);
}

int libxl__qmp_resume(libxl__gc *gc, int domid)
{
- libxl__qmp_handler *qmp = NULL;
- int rc = 0;
-
- qmp = libxl__qmp_initialize(gc, domid);
- if (!qmp)
- return ERROR_FAIL;
-
- rc = qmp_synchronous_send(qmp, "cont", NULL,
- NULL, NULL, qmp->timeout);
-
- libxl__qmp_close(qmp);
- return rc;
+ return qmp_run_command(gc, domid, "cont", NULL, NULL, NULL);
}

int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid,
--
1.7.4.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel