@@ -1052,6 +1052,8 @@ typedef struct xc_cpupoolinfo {
xc_cpumap_t cpumap;
} xc_cpupoolinfo_t;
+#define XC_CPUPOOL_POOLID_ANY 0xFFFFFFFF
+
/**
* Create a new cpupool.
*
@@ -43,7 +43,7 @@ int xc_cpupool_create(xc_interface *xch,
sysctl.cmd = XEN_SYSCTL_cpupool_op;
sysctl.u.cpupool_op.op = XEN_SYSCTL_CPUPOOL_OP_CREATE;
- sysctl.u.cpupool_op.cpupool_id = (*ppoolid == 0) ?
+ sysctl.u.cpupool_op.cpupool_id = (*ppoolid == XC_CPUPOOL_POOLID_ANY) ?
XEN_SYSCTL_CPUPOOL_PAR_ANY : *ppoolid;
sysctl.u.cpupool_op.sched_id = sched_id;
if ( (err = do_sysctl_save(xch, &sysctl)) != 0 )
@@ -137,6 +137,10 @@ int libxl_cpupool_create(libxl_ctx *ctx, const char *name,
int i;
xs_transaction_t t;
char *uuid_string;
+ uint32_t xcpoolid;
+
+ /* Zero means "choose a poolid for me" */
+ xcpoolid = (*poolid) ? (*poolid) : XC_CPUPOOL_POOLID_ANY;
uuid_string = libxl__uuid2string(gc, *uuid);
if (!uuid_string) {
@@ -144,12 +148,13 @@ int libxl_cpupool_create(libxl_ctx *ctx, const char *name,
return ERROR_NOMEM;
}
- rc = xc_cpupool_create(ctx->xch, poolid, sched);
+ rc = xc_cpupool_create(ctx->xch, &xcpoolid, sched);
if (rc) {
LOGEV(ERROR, rc, "Could not create cpupool");
GC_FREE;
return ERROR_FAIL;
}
+ *poolid = xcpoolid;
libxl_for_each_bit(i, cpumap)
if (libxl_bitmap_test(&cpumap, i)) {
@@ -1715,7 +1715,7 @@ static PyObject *pyxc_cpupool_create(XcObject *self,
PyObject *args,
PyObject *kwds)
{
- uint32_t cpupool = 0, sched = XEN_SCHEDULER_CREDIT;
+ uint32_t cpupool = XC_CPUPOOL_POOLID_ANY, sched = XEN_SCHEDULER_CREDIT;
static char *kwd_list[] = { "pool", "sched", NULL };