* [PATCH v5 1/2] libxl: Add "cpu-add" QMP command.
2013-06-26 15:54 [PATCH v5 0/2] CPU hotplug for qemu-xen Anthony PERARD
@ 2013-06-26 15:54 ` Anthony PERARD
2013-06-26 16:48 ` Ian Campbell
2013-06-26 15:54 ` [PATCH v5 2/2] libxl: Use QMP cpu-add to hotplug CPU with qemu-xen Anthony PERARD
2013-06-26 17:15 ` [PATCH v5 0/2] CPU hotplug for qemu-xen Ian Campbell
2 siblings, 1 reply; 6+ messages in thread
From: Anthony PERARD @ 2013-06-26 15:54 UTC (permalink / raw)
To: Xen Devel; +Cc: Anthony PERARD, Ian Campbell
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
---
tools/libxl/libxl_internal.h | 2 ++
tools/libxl/libxl_qmp.c | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 3ba3a21..3e45b94 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1412,6 +1412,8 @@ _hidden int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename);
/* Set dirty bitmap logging status */
_hidden int libxl__qmp_set_global_dirty_log(libxl__gc *gc, int domid, bool enable);
_hidden int libxl__qmp_insert_cdrom(libxl__gc *gc, int domid, const libxl_device_disk *disk);
+/* Add a virtual CPU */
+_hidden int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index);
/* close and free the QMP handler */
_hidden void libxl__qmp_close(libxl__qmp_handler *qmp);
/* remove the socket file, if the file has already been removed,
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index 644d2c0..3d6dec6 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -668,6 +668,18 @@ static void qmp_parameters_add_bool(libxl__gc *gc,
qmp_parameters_common_add(gc, param, name, obj);
}
+static void qmp_parameters_add_integer(libxl__gc *gc,
+ libxl__json_object **param,
+ const char *name, const int i)
+{
+ libxl__json_object *obj;
+
+ obj = libxl__json_object_alloc(gc, JSON_INTEGER);
+ obj->u.i = i;
+
+ qmp_parameters_common_add(gc, param, name, obj);
+}
+
#define QMP_PARAMETERS_SPRINTF(args, name, format, ...) \
qmp_parameters_add_string(gc, args, name, \
libxl__sprintf(gc, format, __VA_ARGS__))
@@ -929,6 +941,15 @@ int libxl__qmp_insert_cdrom(libxl__gc *gc, int domid,
}
}
+int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index)
+{
+ libxl__json_object *args = NULL;
+
+ qmp_parameters_add_integer(gc, &args, "id", index);
+
+ return qmp_run_command(gc, domid, "cpu-add", args, NULL, NULL);
+}
+
int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid,
const libxl_domain_config *guest_config)
{
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 1/2] libxl: Add "cpu-add" QMP command.
2013-06-26 15:54 ` [PATCH v5 1/2] libxl: Add "cpu-add" QMP command Anthony PERARD
@ 2013-06-26 16:48 ` Ian Campbell
2013-06-26 16:52 ` Anthony PERARD
0 siblings, 1 reply; 6+ messages in thread
From: Ian Campbell @ 2013-06-26 16:48 UTC (permalink / raw)
To: Anthony PERARD; +Cc: Xen Devel
On Wed, 2013-06-26 at 16:54 +0100, Anthony PERARD wrote:
> +int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index)
libxl_qmp.c: In function ‘libxl__qmp_cpu_add’:
libxl_qmp.c:944:54: error: declaration of ‘index’ shadows a global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
index() is a function in <strings.h>
I'll s/index/idx/ as I apply.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 1/2] libxl: Add "cpu-add" QMP command.
2013-06-26 16:48 ` Ian Campbell
@ 2013-06-26 16:52 ` Anthony PERARD
0 siblings, 0 replies; 6+ messages in thread
From: Anthony PERARD @ 2013-06-26 16:52 UTC (permalink / raw)
To: Ian Campbell; +Cc: Xen Devel
On 26/06/13 17:48, Ian Campbell wrote:
> On Wed, 2013-06-26 at 16:54 +0100, Anthony PERARD wrote:
>> +int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index)
>
> libxl_qmp.c: In function ‘libxl__qmp_cpu_add’:
> libxl_qmp.c:944:54: error: declaration of ‘index’ shadows a global declaration [-Werror=shadow]
> cc1: all warnings being treated as errors
>
> index() is a function in <strings.h>
>
> I'll s/index/idx/ as I apply.
Thanks,
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 2/2] libxl: Use QMP cpu-add to hotplug CPU with qemu-xen.
2013-06-26 15:54 [PATCH v5 0/2] CPU hotplug for qemu-xen Anthony PERARD
2013-06-26 15:54 ` [PATCH v5 1/2] libxl: Add "cpu-add" QMP command Anthony PERARD
@ 2013-06-26 15:54 ` Anthony PERARD
2013-06-26 17:15 ` [PATCH v5 0/2] CPU hotplug for qemu-xen Ian Campbell
2 siblings, 0 replies; 6+ messages in thread
From: Anthony PERARD @ 2013-06-26 15:54 UTC (permalink / raw)
To: Xen Devel; +Cc: Anthony PERARD, Ian Campbell
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: George Dunlap <george.dunlap@eu.citrix.com>
---
tools/libxl/libxl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ee1fa9c..185dfba 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -4237,33 +4237,73 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid,
return 0;
}
-int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap)
+static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid,
+ libxl_bitmap *cpumap)
{
- GC_INIT(ctx);
libxl_dominfo info;
char *dompath;
xs_transaction_t t;
int i, rc = ERROR_FAIL;
- if (libxl_domain_info(ctx, &info, domid) < 0) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list");
+ if (libxl_domain_info(CTX, &info, domid) < 0) {
+ LOGE(ERROR, "getting domain info list");
goto out;
}
if (!(dompath = libxl__xs_get_dompath(gc, domid)))
goto out;
retry_transaction:
- t = xs_transaction_start(ctx->xsh);
+ t = xs_transaction_start(CTX->xsh);
for (i = 0; i <= info.vcpu_max_id; i++)
libxl__xs_write(gc, t,
libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i),
"%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline");
- if (!xs_transaction_end(ctx->xsh, t, 0)) {
+ if (!xs_transaction_end(CTX->xsh, t, 0)) {
if (errno == EAGAIN)
goto retry_transaction;
} else
rc = 0;
out:
+ return rc;
+}
+
+static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid,
+ libxl_bitmap *cpumap)
+{
+ libxl_dominfo info;
+ int i;
+
+ if (libxl_domain_info(CTX, &info, domid) < 0) {
+ LOGE(ERROR, "getting domain info list");
+ return ERROR_FAIL;
+ }
+ for (i = 0; i <= info.vcpu_max_id; i++) {
+ if (libxl_bitmap_test(cpumap, i)) {
+ /* Return value is ignore because it does not tell anything useful
+ * on the completion of the command.
+ * (For instance, "CPU already plugged-in" give the same return
+ * value as "command not supported".)
+ */
+ libxl__qmp_cpu_add(gc, domid, i);
+ }
+ }
+ return 0;
+}
+
+int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap)
+{
+ GC_INIT(ctx);
+ int rc;
+ switch (libxl__device_model_version_running(gc, domid)) {
+ case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
+ rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap);
+ break;
+ case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
+ rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap);
+ break;
+ default:
+ rc = ERROR_INVAL;
+ }
GC_FREE;
return rc;
}
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 0/2] CPU hotplug for qemu-xen
2013-06-26 15:54 [PATCH v5 0/2] CPU hotplug for qemu-xen Anthony PERARD
2013-06-26 15:54 ` [PATCH v5 1/2] libxl: Add "cpu-add" QMP command Anthony PERARD
2013-06-26 15:54 ` [PATCH v5 2/2] libxl: Use QMP cpu-add to hotplug CPU with qemu-xen Anthony PERARD
@ 2013-06-26 17:15 ` Ian Campbell
2 siblings, 0 replies; 6+ messages in thread
From: Ian Campbell @ 2013-06-26 17:15 UTC (permalink / raw)
To: Anthony PERARD; +Cc: Xen Devel
On Wed, 2013-06-26 at 16:54 +0100, Anthony PERARD wrote:
> Hi all,
>
> This series implements the 'cpu-add' QMP command to hotplug CPU with qemu-xen.
Acked the second one + applied both, thanks.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread