@@ -1432,8 +1432,8 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid,
}
static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid,
- libxl_bitmap *cpumap,
- const libxl_dominfo *info)
+ const libxl_bitmap *cpumap,
+ const libxl_dominfo *info)
{
char *dompath;
xs_transaction_t t;
@@ -1457,43 +1457,27 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid,
return rc;
}
-static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid,
- libxl_bitmap *cpumap,
- const libxl_dominfo *info)
-{
- int i, rc;
- libxl_bitmap current_map, final_map;
-
- libxl_bitmap_init(¤t_map);
- libxl_bitmap_init(&final_map);
-
- libxl_bitmap_alloc(CTX, ¤t_map, info->vcpu_max_id + 1);
- libxl_bitmap_set_none(¤t_map);
- rc = libxl__qmp_query_cpus(gc, domid, ¤t_map);
- if (rc) {
- LOGD(ERROR, domid, "Failed to query cpus");
- goto out;
- }
-
- libxl_bitmap_copy_alloc(CTX, &final_map, cpumap);
-
- libxl_for_each_set_bit(i, current_map)
- libxl_bitmap_reset(&final_map, i);
-
- libxl_for_each_set_bit(i, final_map) {
- rc = libxl__qmp_cpu_add(gc, domid, i);
- if (rc) {
- LOGD(ERROR, domid, "Failed to add cpu %d", i);
- goto out;
- }
- }
-
- rc = 0;
-out:
- libxl_bitmap_dispose(¤t_map);
- libxl_bitmap_dispose(&final_map);
- return rc;
-}
+typedef struct set_vcpuonline_state {
+ libxl__ev_qmp qmp;
+ libxl__ev_time timeout;
+ const libxl_bitmap *cpumap;
+ libxl_dominfo info;
+ libxl_bitmap final_map;
+ int index; /* for loop on final_map */
+} set_vcpuonline_state;
+
+static void set_vcpuonline_qmp_cpus_queried(libxl__egc *, libxl__ev_qmp *,
+ const libxl__json_object *,
+ int rc);
+static void set_vcpuonline_qmp_add_cpu(libxl__egc *, libxl__ev_qmp *,
+ const libxl__json_object *response,
+ int rc);
+static void set_vcpuonline_timeout(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs,
+ int rc);
+static void set_vcpuonline_done(libxl__egc *egc,
+ set_vcpuonline_state *svos,
+ int rc);
int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,
libxl_bitmap *cpumap,
@@ -1501,11 +1485,22 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,
{
AO_CREATE(ctx, domid, ao_how);
int rc, maxcpus;
- libxl_dominfo info;
+ set_vcpuonline_state *svos;
- libxl_dominfo_init(&info);
+ GCNEW(svos);
+ libxl__ev_qmp_init(&svos->qmp);
+ svos->qmp.ao = ao;
+ svos->qmp.domid = domid;
+ svos->qmp.payload_fd = -1;
+ libxl__ev_time_init(&svos->timeout);
+ libxl_dominfo_init(&svos->info);
+ libxl_bitmap_init(&svos->final_map);
- rc = libxl_domain_info(CTX, &info, domid);
+ /* Convenience aliases */
+ libxl_dominfo *info = &svos->info;
+ libxl__ev_qmp *qmp = &svos->qmp;
+
+ rc = libxl_domain_info(CTX, info, domid);
if (rc < 0) {
LOGED(ERROR, domid, "Getting domain info list");
goto out;
@@ -1518,10 +1513,10 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,
rc = ERROR_FAIL;
goto out;
}
- if (maxcpus > info.vcpu_max_id + 1)
+ if (maxcpus > info->vcpu_max_id + 1)
{
LOGED(ERROR, domid, "Requested %d VCPUs, however maxcpus is %d!",
- maxcpus, info.vcpu_max_id + 1);
+ maxcpus, info->vcpu_max_id + 1);
rc = ERROR_FAIL;
goto out;
}
@@ -1532,8 +1527,14 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
- rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info);
- break;
+ rc = libxl__ev_time_register_rel(ao, &svos->timeout,
+ set_vcpuonline_timeout,
+ LIBXL_QMP_CMD_TIMEOUT * 1000);
+ if (rc) goto out;
+ qmp->callback = set_vcpuonline_qmp_cpus_queried;
+ rc = libxl__ev_qmp_send(gc, qmp, "query-cpus", NULL);
+ if (rc) goto out;
+ return AO_INPROGRESS;
default:
rc = ERROR_INVAL;
}
@@ -1545,15 +1546,115 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,
rc = ERROR_INVAL;
}
- if (!rc)
- rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info);
+out:
+ set_vcpuonline_done(egc, svos, rc); /* must be last */
+ return AO_INPROGRESS;
+}
+
+static void set_vcpuonline_qmp_cpus_queried(libxl__egc *egc,
+ libxl__ev_qmp *qmp, const libxl__json_object *response, int rc)
+{
+ EGC_GC;
+ set_vcpuonline_state *svos = CONTAINER_OF(qmp, *svos, qmp);
+ const libxl__json_object *cpu;
+ int i;
+ libxl_bitmap current_map;
+
+ /* Convenience aliases */
+ libxl_bitmap *final_map = &svos->final_map;
+
+ libxl_bitmap_init(¤t_map);
+
+ if (rc) goto out;
+
+ libxl_bitmap_alloc(CTX, ¤t_map, svos->info.vcpu_max_id + 1);
+ libxl_bitmap_set_none(¤t_map);
+
+ for (i = 0; (cpu = libxl__json_array_get(response, i)); i++) {
+ unsigned int cpu_index;
+ const libxl__json_object *o;
+
+ o = libxl__json_map_get("CPU", cpu, JSON_INTEGER);
+ if (!o) {
+ LOGD(ERROR, qmp->domid, "Failed to retrieve CPU index.");
+ rc = ERROR_QEMU_API;
+ goto out;
+ }
+
+ cpu_index = libxl__json_object_get_integer(o);
+ libxl_bitmap_set(¤t_map, cpu_index);
+ }
+
+
+ libxl_bitmap_copy_alloc(CTX, final_map, svos->cpumap);
+
+ libxl_for_each_set_bit(i, current_map) {
+ libxl_bitmap_reset(final_map, i);
+ }
out:
- libxl_dominfo_dispose(&info);
- if (rc)
- return AO_CREATE_FAIL(rc);
+ libxl_bitmap_dispose(¤t_map);
+ svos->index = -1;
+ set_vcpuonline_qmp_add_cpu(egc, qmp, NULL, rc); /* must be last */
+}
+
+static void set_vcpuonline_qmp_add_cpu(libxl__egc *egc,
+ libxl__ev_qmp *qmp, const libxl__json_object *response, int rc)
+{
+ STATE_AO_GC(qmp->ao);
+ set_vcpuonline_state *svos = CONTAINER_OF(qmp, *svos, qmp);
+ libxl__json_object *args = NULL;
+
+ /* Convenience aliases */
+ libxl_bitmap *map = &svos->final_map;
+
+ if (rc) goto out;
+
+ while (libxl_bitmap_cpu_valid(map, ++svos->index)) {
+ if (libxl_bitmap_test(map, svos->index)) {
+ qmp->callback = set_vcpuonline_qmp_add_cpu;
+ libxl__qmp_param_add_integer(gc, &args, "id", svos->index);
+ rc = libxl__ev_qmp_send(gc, qmp, "cpu-add", args);
+ if (rc) goto out;
+ return;
+ }
+ }
+
+out:
+ set_vcpuonline_done(egc, svos, rc);
+}
+
+static void set_vcpuonline_timeout(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs,
+ int rc)
+{
+ EGC_GC;
+ set_vcpuonline_state *svos = CONTAINER_OF(ev, *svos, timeout);
+
+ if (rc == ERROR_TIMEDOUT)
+ LOGD(ERROR, svos->qmp.domid,
+ "Setting CPU online in QEMU timed out");
+
+ set_vcpuonline_done(egc, svos, rc);
+}
+
+static void set_vcpuonline_done(libxl__egc *egc,
+ set_vcpuonline_state *svos,
+ int rc)
+{
+ STATE_AO_GC(svos->qmp.ao);
+
+ /* Convenience aliases */
+ libxl_domid domid = svos->qmp.domid;
+
+ if (!rc)
+ rc = libxl__set_vcpuonline_xenstore(gc, domid, svos->cpumap,
+ &svos->info);
+
+ libxl_bitmap_dispose(&svos->final_map);
+ libxl_dominfo_dispose(&svos->info);
+ libxl__ev_qmp_dispose(gc, &svos->qmp);
libxl__ao_complete(egc, ao, rc);
- return AO_INPROGRESS;
}
static void domain_s3_resume_done(libxl__egc *egc, libxl__ev_qmp *qmp,
@@ -1987,8 +1987,6 @@ _hidden libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc,
_hidden int libxl__qmp_resume(libxl__gc *gc, int domid);
/* Load current QEMU state from file. */
_hidden int libxl__qmp_restore(libxl__gc *gc, int domid, const char *filename);
-/* Add a virtual CPU */
-_hidden int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index);
/* Query the bitmap of CPUs */
_hidden int libxl__qmp_query_cpus(libxl__gc *gc, int domid,
libxl_bitmap *map);
@@ -767,15 +767,6 @@ int libxl__qmp_resume(libxl__gc *gc, int domid)
return qmp_run_command(gc, domid, "cont", NULL, NULL, NULL);
}
-int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int idx)
-{
- libxl__json_object *args = NULL;
-
- libxl__qmp_param_add_integer(gc, &args, "id", idx);
-
- return qmp_run_command(gc, domid, "cpu-add", args, NULL, NULL);
-}
-
static int query_cpus_callback(libxl__qmp_handler *qmp,
const libxl__json_object *response,
void *opaque)
Removed libxl__qmp_cpu_add since it's not used anymore. `cpumap' arg of libxl__set_vcpuonline_xenstore is constified. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/libxl/libxl_domain.c | 205 ++++++++++++++++++++++++++--------- tools/libxl/libxl_internal.h | 2 - tools/libxl/libxl_qmp.c | 9 -- 3 files changed, 153 insertions(+), 63 deletions(-)