numa_conf.c 22.1 KB
Newer Older
1
/*
2
 * numa_conf.c
3
 *
4
 * Copyright (C) 2014-2015 Red Hat, Inc.
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library.  If not, see
 * <http://www.gnu.org/licenses/>.
 *
 * Author: Martin Kletzander <mkletzan@redhat.com>
 */

#include <config.h>

25
#include "numa_conf.h"
26

27 28
#include "domain_conf.h"
#include "viralloc.h"
29
#include "virnuma.h"
30 31 32 33
#include "virstring.h"

#define VIR_FROM_THIS VIR_FROM_DOMAIN

34 35 36 37 38 39
VIR_ENUM_IMPL(virDomainNumatuneMemMode,
              VIR_DOMAIN_NUMATUNE_MEM_LAST,
              "strict",
              "preferred",
              "interleave");

40 41
VIR_ENUM_IMPL(virDomainNumatunePlacement,
              VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST,
42 43 44
              "default",
              "static",
              "auto");
45

46 47 48 49 50
VIR_ENUM_IMPL(virNumaMemAccess, VIR_NUMA_MEM_ACCESS_LAST,
              "default",
              "shared",
              "private");

51 52
typedef struct _virDomainNumaNode virDomainNumaNode;
typedef virDomainNumaNode *virDomainNumaNodePtr;
53

54
struct _virDomainNuma {
55
    struct {
56
        bool specified;
57 58 59 60 61
        virBitmapPtr nodeset;
        virDomainNumatuneMemMode mode;
        virDomainNumatunePlacement placement;
    } memory;               /* pinning for all the memory */

62
    struct _virDomainNumaNode {
63 64 65 66 67
        virBitmapPtr nodeset;
        virDomainNumatuneMemMode mode;
    } *mem_nodes;           /* fine tuning per guest node */
    size_t nmem_nodes;

68 69 70 71
    /* Future NUMA tuning related stuff should go here. */
};


72
inline bool
73
virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
74 75 76 77 78 79 80 81 82 83
                               int cellid)
{
    if (numatune &&
        cellid >= 0 &&
        cellid < numatune->nmem_nodes)
        return numatune->mem_nodes[cellid].nodeset;

    return false;
}

84
static int
85
virDomainNumatuneNodeParseXML(virDomainNumaPtr *numatunePtr,
86
                              size_t ncells,
87 88 89
                              xmlXPathContextPtr ctxt)
{
    char *tmp = NULL;
E
Eric Blake 已提交
90
    int n = 0;
91 92
    int ret = -1;
    size_t i = 0;
93
    virDomainNumaPtr numatune = *numatunePtr;
94 95 96 97 98 99 100 101 102 103 104
    xmlNodePtr *nodes = NULL;

    if ((n = virXPathNodeSet("./numatune/memnode", ctxt, &nodes)) < 0) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Cannot extract memnode nodes"));
        goto cleanup;
    }

    if (!n)
        return 0;

105 106
    if (numatune && numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO) {
107 108 109 110 111 112
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                       _("Per-node binding is not compatible with "
                         "automatic NUMA placement."));
        goto cleanup;
    }

113
    if (!ncells) {
114 115 116 117 118 119
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("Element 'memnode' is invalid without "
                         "any guest NUMA cells"));
        goto cleanup;
    }

120 121
    VIR_FREE(numatune->mem_nodes);
    if (VIR_ALLOC_N(numatune->mem_nodes, ncells) < 0)
122 123
        goto cleanup;

124
    numatune->nmem_nodes = ncells;
125 126 127 128

    for (i = 0; i < n; i++) {
        int mode = 0;
        unsigned int cellid = 0;
129
        virDomainNumaNodePtr mem_node = NULL;
130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146
        xmlNodePtr cur_node = nodes[i];

        tmp = virXMLPropString(cur_node, "cellid");
        if (!tmp) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing required cellid attribute "
                             "in memnode element"));
            goto cleanup;
        }
        if (virStrToLong_uip(tmp, NULL, 10, &cellid) < 0) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Invalid cellid attribute in memnode element: %s"),
                           tmp);
            goto cleanup;
        }
        VIR_FREE(tmp);

147
        if (cellid >= numatune->nmem_nodes) {
148 149 150 151 152 153
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Argument 'cellid' in memnode element must "
                             "correspond to existing guest's NUMA cell"));
            goto cleanup;
        }

154
        mem_node = &numatune->mem_nodes[cellid];
155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195

        if (mem_node->nodeset) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Multiple memnode elements with cellid %u"),
                           cellid);
            goto cleanup;
        }

        tmp = virXMLPropString(cur_node, "mode");
        if (!tmp) {
            mem_node->mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
        } else {
            if ((mode = virDomainNumatuneMemModeTypeFromString(tmp)) < 0) {
                virReportError(VIR_ERR_XML_ERROR, "%s",
                               _("Invalid mode attribute in memnode element"));
                goto cleanup;
            }
            VIR_FREE(tmp);
            mem_node->mode = mode;
        }

        tmp = virXMLPropString(cur_node, "nodeset");
        if (!tmp) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing required nodeset attribute "
                             "in memnode element"));
            goto cleanup;
        }
        if (virBitmapParse(tmp, 0, &mem_node->nodeset,
                           VIR_DOMAIN_CPUMASK_LEN) < 0)
            goto cleanup;
        VIR_FREE(tmp);
    }

    ret = 0;
 cleanup:
    VIR_FREE(nodes);
    VIR_FREE(tmp);
    return ret;
}

196
int
197
virDomainNumatuneParseXML(virDomainNumaPtr *numatunePtr,
198 199
                          bool placement_static,
                          size_t ncells,
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221
                          xmlXPathContextPtr ctxt)
{
    char *tmp = NULL;
    int mode = -1;
    int n = 0;
    int placement = -1;
    int ret = -1;
    virBitmapPtr nodeset = NULL;
    xmlNodePtr node = NULL;

    if (virXPathInt("count(./numatune)", ctxt, &n) < 0) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("cannot extract numatune nodes"));
        goto cleanup;
    } else if (n > 1) {
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("only one numatune is supported"));
        goto cleanup;
    }

    node = virXPathNode("./numatune/memory[1]", ctxt);

222 223 224 225 226 227 228 229
    if (!placement_static && !node)
        placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;

    if (node) {
        if ((tmp = virXMLPropString(node, "mode")) &&
            (mode = virDomainNumatuneMemModeTypeFromString(tmp)) < 0) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("Unsupported NUMA memory tuning mode '%s'"), tmp);
230
            goto cleanup;
231 232
        }
        VIR_FREE(tmp);
233

234 235 236 237 238 239 240
        if ((tmp = virXMLPropString(node, "placement")) &&
            (placement = virDomainNumatunePlacementTypeFromString(tmp)) < 0) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("Unsupported NUMA memory placement mode '%s'"), tmp);
            goto cleanup;
        }
        VIR_FREE(tmp);
241

242 243 244 245
        if ((tmp = virXMLPropString(node, "nodeset")) &&
            virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0)
            goto cleanup;
        VIR_FREE(tmp);
246 247
    }

248
    if (virDomainNumatuneSet(*numatunePtr,
249 250 251 252
                             placement_static,
                             placement,
                             mode,
                             nodeset) < 0)
253 254
        goto cleanup;

255
    if (virDomainNumatuneNodeParseXML(numatunePtr, ncells, ctxt) < 0)
256
        goto cleanup;
257

258 259 260 261 262 263 264 265 266
    ret = 0;
 cleanup:
    virBitmapFree(nodeset);
    VIR_FREE(tmp);
    return ret;
}

int
virDomainNumatuneFormatXML(virBufferPtr buf,
267
                           virDomainNumaPtr numatune)
268 269 270
{
    const char *tmp = NULL;
    char *nodeset = NULL;
271
    bool nodesetSpecified = false;
272
    size_t i = 0;
273 274 275 276

    if (!numatune)
        return 0;

277 278 279 280 281 282 283 284 285 286
    for (i = 0; i < numatune->nmem_nodes; i++) {
        if (numatune->mem_nodes[i].nodeset) {
            nodesetSpecified = true;
            break;
        }
    }

    if (!nodesetSpecified && !numatune->memory.specified)
        return 0;

287 288 289
    virBufferAddLit(buf, "<numatune>\n");
    virBufferAdjustIndent(buf, 2);

290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
    if (numatune->memory.specified) {
        tmp = virDomainNumatuneMemModeTypeToString(numatune->memory.mode);
        virBufferAsprintf(buf, "<memory mode='%s' ", tmp);

        if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) {
            if (!(nodeset = virBitmapFormat(numatune->memory.nodeset)))
                return -1;
            virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset);
            VIR_FREE(nodeset);
        } else if (numatune->memory.placement) {
            tmp = virDomainNumatunePlacementTypeToString(numatune->memory.placement);
            virBufferAsprintf(buf, "placement='%s'/>\n", tmp);
        }
    }

    for (i = 0; i < numatune->nmem_nodes; i++) {
306
        virDomainNumaNodePtr mem_node = &numatune->mem_nodes[i];
307

308 309 310 311
        if (!mem_node->nodeset)
            continue;

        if (!(nodeset = virBitmapFormat(mem_node->nodeset)))
312
            return -1;
313 314 315 316 317 318

        virBufferAsprintf(buf,
                          "<memnode cellid='%zu' mode='%s' nodeset='%s'/>\n",
                          i,
                          virDomainNumatuneMemModeTypeToString(mem_node->mode),
                          nodeset);
319 320 321 322 323 324 325 326 327
        VIR_FREE(nodeset);
    }

    virBufferAdjustIndent(buf, -2);
    virBufferAddLit(buf, "</numatune>\n");
    return 0;
}

void
328
virDomainNumaFree(virDomainNumaPtr numa)
329
{
330 331
    size_t i = 0;

332
    if (!numa)
333 334
        return;

335 336 337 338
    virBitmapFree(numa->memory.nodeset);
    for (i = 0; i < numa->nmem_nodes; i++)
        virBitmapFree(numa->mem_nodes[i].nodeset);
    VIR_FREE(numa->mem_nodes);
339

340
    VIR_FREE(numa);
341 342 343
}

virDomainNumatuneMemMode
344
virDomainNumatuneGetMode(virDomainNumaPtr numatune,
345
                         int cellid)
346
{
347 348 349 350 351 352 353 354 355 356
    if (!numatune)
        return 0;

    if (virDomainNumatuneNodeSpecified(numatune, cellid))
        return numatune->mem_nodes[cellid].mode;

    if (numatune->memory.specified)
        return numatune->memory.mode;

    return 0;
357 358 359
}

virBitmapPtr
360
virDomainNumatuneGetNodeset(virDomainNumaPtr numatune,
361 362
                            virBitmapPtr auto_nodeset,
                            int cellid)
363 364 365 366
{
    if (!numatune)
        return NULL;

367 368
    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
369 370
        return auto_nodeset;

371 372 373 374
    if (virDomainNumatuneNodeSpecified(numatune, cellid))
        return numatune->mem_nodes[cellid].nodeset;

    if (!numatune->memory.specified)
375 376 377 378 379 380
        return NULL;

    return numatune->memory.nodeset;
}

char *
381
virDomainNumatuneFormatNodeset(virDomainNumaPtr numatune,
382 383
                               virBitmapPtr auto_nodeset,
                               int cellid)
384 385
{
    return virBitmapFormat(virDomainNumatuneGetNodeset(numatune,
386 387
                                                       auto_nodeset,
                                                       cellid));
388 389
}

390

391
int
392
virDomainNumatuneMaybeGetNodeset(virDomainNumaPtr numatune,
393 394 395
                                 virBitmapPtr auto_nodeset,
                                 virBitmapPtr *retNodeset,
                                 int cellid)
396
{
397
    *retNodeset = NULL;
398 399 400 401

    if (!numatune)
        return 0;

402 403 404 405 406 407
    if (!virDomainNumatuneNodeSpecified(numatune, cellid) &&
        !numatune->memory.specified)
        return 0;

    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
408 409 410 411 412 413 414
        !auto_nodeset) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Advice from numad is needed in case of "
                         "automatic numa placement"));
        return -1;
    }

415 416 417 418 419 420 421
    *retNodeset = virDomainNumatuneGetNodeset(numatune, auto_nodeset, cellid);

    return 0;
}


int
422
virDomainNumatuneMaybeFormatNodeset(virDomainNumaPtr numatune,
423 424 425 426 427 428 429 430 431 432 433 434
                                    virBitmapPtr auto_nodeset,
                                    char **mask,
                                    int cellid)
{
    virBitmapPtr nodeset;

    if (virDomainNumatuneMaybeGetNodeset(numatune, auto_nodeset, &nodeset,
                                         cellid) < 0)
        return -1;

    if (nodeset &&
        !(*mask = virBitmapFormat(nodeset)))
435 436 437 438 439 440
        return -1;

    return 0;
}

int
441
virDomainNumatuneSet(virDomainNumaPtr numa,
442
                     bool placement_static,
443 444 445 446 447 448 449 450 451 452
                     int placement,
                     int mode,
                     virBitmapPtr nodeset)
{
    int ret = -1;

    /* No need to do anything in this case */
    if (mode == -1 && placement == -1 && !nodeset)
        return 0;

453
    if (!numa->memory.specified) {
454 455 456 457 458 459
        if (mode == -1)
            mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT;
    }

460 461 462 463 464 465 466 467
    /* Range checks */
    if (mode != -1 &&
        (mode < 0 || mode >= VIR_DOMAIN_NUMATUNE_MEM_LAST)) {
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                       _("Unsupported numatune mode '%d'"),
                       mode);
        goto cleanup;
    }
468

469 470 471 472 473 474 475 476 477
    if (placement != -1 &&
        (placement < 0 || placement >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST)) {
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                       _("Unsupported numatune placement '%d'"),
                       mode);
        goto cleanup;
    }

    if (mode != -1)
478
        numa->memory.mode = mode;
479

480
    if (nodeset) {
481 482
        virBitmapFree(numa->memory.nodeset);
        if (!(numa->memory.nodeset = virBitmapNewCopy(nodeset)))
483 484 485 486 487 488
            goto cleanup;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT) {
489
        if (numa->memory.nodeset || placement_static)
490 491 492 493 494 495
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
        else
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC &&
496
        !numa->memory.nodeset) {
497 498 499 500 501 502
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                       _("nodeset for NUMA memory tuning must be set "
                         "if 'placement' is 'static'"));
        goto cleanup;
    }

503 504
    /* setting nodeset when placement auto is invalid */
    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
505 506 507
        numa->memory.nodeset) {
        virBitmapFree(numa->memory.nodeset);
        numa->memory.nodeset = NULL;
508 509
    }

510
    if (placement != -1)
511
        numa->memory.placement = placement;
512

513
    numa->memory.specified = true;
514

515
    ret = 0;
516

517 518 519 520
 cleanup:
    return ret;
}

521
static bool
522 523
virDomainNumaNodesEqual(virDomainNumaPtr n1,
                        virDomainNumaPtr n2)
524 525 526 527 528 529 530
{
    size_t i = 0;

    if (n1->nmem_nodes != n2->nmem_nodes)
        return false;

    for (i = 0; i < n1->nmem_nodes; i++) {
531 532
        virDomainNumaNodePtr nd1 = &n1->mem_nodes[i];
        virDomainNumaNodePtr nd2 = &n2->mem_nodes[i];
533 534 535 536 537 538 539 540 541 542 543 544 545 546

        if (!nd1->nodeset && !nd2->nodeset)
            continue;

        if (nd1->mode != nd2->mode)
            return false;

        if (!virBitmapEqual(nd1->nodeset, nd2->nodeset))
            return false;
    }

    return true;
}

547
bool
548 549
virDomainNumaEquals(virDomainNumaPtr n1,
                    virDomainNumaPtr n2)
550 551 552 553 554 555 556
{
    if (!n1 && !n2)
        return true;

    if (!n1 || !n2)
        return false;

557
    if (!n1->memory.specified && !n2->memory.specified)
558
        return virDomainNumaNodesEqual(n1, n2);
559 560 561 562

    if (!n1->memory.specified || !n2->memory.specified)
        return false;

563 564 565 566 567 568
    if (n1->memory.mode != n2->memory.mode)
        return false;

    if (n1->memory.placement != n2->memory.placement)
        return false;

569 570 571
    if (!virBitmapEqual(n1->memory.nodeset, n2->memory.nodeset))
        return false;

572
    return virDomainNumaNodesEqual(n1, n2);
573 574 575
}

bool
576
virDomainNumatuneHasPlacementAuto(virDomainNumaPtr numatune)
577 578 579 580
{
    if (!numatune)
        return false;

581 582 583
    if (!numatune->memory.specified)
        return false;

584 585 586 587 588
    if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
        return true;

    return false;
}
589 590

bool
591
virDomainNumatuneHasPerNodeBinding(virDomainNumaPtr numatune)
592 593 594 595 596 597 598 599 600 601 602 603 604
{
    size_t i = 0;

    if (!numatune)
        return false;

    for (i = 0; i < numatune->nmem_nodes; i++) {
        if (numatune->mem_nodes[i].nodeset)
            return true;
    }

    return false;
}
605 606

int
607
virDomainNumatuneSpecifiedMaxNode(virDomainNumaPtr numatune)
608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632
{
    int ret = -1;
    virBitmapPtr nodemask = NULL;
    size_t i;
    int bit;

    if (!numatune)
        return ret;

    nodemask = virDomainNumatuneGetNodeset(numatune, NULL, -1);
    if (nodemask)
        ret = virBitmapLastSetBit(nodemask);

    for (i = 0; i < numatune->nmem_nodes; i++) {
        nodemask = numatune->mem_nodes[i].nodeset;
        if (!nodemask)
            continue;

        bit = virBitmapLastSetBit(nodemask);
        if (bit > ret)
            ret = bit;
    }

    return ret;
}
633 634

bool
635
virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune,
636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655
                                    virBitmapPtr auto_nodeset)
{
    size_t i = 0;
    virBitmapPtr b = NULL;

    if (!numatune)
        return true;

    b = virDomainNumatuneGetNodeset(numatune, auto_nodeset, -1);
    if (!virNumaNodesetIsAvailable(b))
        return false;

    for (i = 0; i < numatune->nmem_nodes; i++) {
        b = virDomainNumatuneGetNodeset(numatune, auto_nodeset, i);
        if (!virNumaNodesetIsAvailable(b))
            return false;
    }

    return true;
}
656 657 658 659 660 661 662 663


int
virDomainNumaDefCPUParseXML(virCPUDefPtr def,
                            xmlXPathContextPtr ctxt)
{
    xmlNodePtr *nodes = NULL;
    xmlNodePtr oldNode = ctxt->node;
664
    char *tmp = NULL;
665 666 667 668
    int n;
    size_t i;
    int ret = -1;

669 670 671
    /* check if NUMA definition is present */
    if (!virXPathNode("/domain/cpu/numa[1]", ctxt))
        return 0;
672

673 674 675 676 677 678 679 680 681
    if ((n = virXPathNodeSet("/domain/cpu/numa[1]/cell", ctxt, &nodes)) <= 0) {
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("NUMA topology defined without NUMA cells"));
        goto cleanup;
    }

    if (VIR_ALLOC_N(def->cells, n) < 0)
        goto cleanup;
    def->ncells = n;
682

683
    for (i = 0; i < n; i++) {
684
        int rc;
685 686 687 688 689 690 691 692 693
        unsigned int cur_cell = i;

        /* cells are in order of parsing or explicitly numbered */
        if ((tmp = virXMLPropString(nodes[i], "id"))) {
            if (virStrToLong_uip(tmp, NULL, 10, &cur_cell) < 0) {
                virReportError(VIR_ERR_XML_ERROR,
                               _("Invalid 'id' attribute in NUMA cell: '%s'"),
                               tmp);
                goto cleanup;
694 695 696 697 698 699 700
            }

            if (cur_cell >= n) {
                virReportError(VIR_ERR_XML_ERROR, "%s",
                               _("Exactly one 'cell' element per guest "
                                 "NUMA cell allowed, non-contiguous ranges or "
                                 "ranges not starting from 0 are not allowed"));
701
                goto cleanup;
702
            }
703 704
        }
        VIR_FREE(tmp);
705

706 707 708 709 710 711
        if (def->cells[cur_cell].cpumask) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Duplicate NUMA cell info for cell id '%u'"),
                           cur_cell);
            goto cleanup;
        }
712

713 714 715 716 717
        if (!(tmp = virXMLPropString(nodes[i], "cpus"))) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing 'cpus' attribute in NUMA cell"));
            goto cleanup;
        }
718

719
        if (virBitmapParse(tmp, 0, &def->cells[cur_cell].cpumask,
720
                           VIR_DOMAIN_CPUMASK_LEN) < 0)
721
            goto cleanup;
722

723 724 725 726 727
        if (virBitmapIsAllClear(def->cells[cur_cell].cpumask)) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                          _("NUMA cell %d has no vCPUs assigned"), cur_cell);
            goto cleanup;
        }
728
        VIR_FREE(tmp);
729

730 731 732 733
        ctxt->node = nodes[i];
        if (virDomainParseMemory("./@memory", "./@unit", ctxt,
                                 &def->cells[cur_cell].mem, true, false) < 0)
            goto cleanup;
734

735
        if ((tmp = virXMLPropString(nodes[i], "memAccess"))) {
736
            if ((rc = virNumaMemAccessTypeFromString(tmp)) <= 0) {
737 738 739 740
                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                               _("Invalid 'memAccess' attribute value '%s'"),
                               tmp);
                goto cleanup;
741
            }
742 743 744

            def->cells[cur_cell].memAccess = rc;
            VIR_FREE(tmp);
745 746 747 748 749 750 751 752
        }
    }

    ret = 0;

 cleanup:
    ctxt->node = oldNode;
    VIR_FREE(nodes);
753
    VIR_FREE(tmp);
754 755
    return ret;
}
756 757 758 759 760 761


int
virDomainNumaDefCPUFormat(virBufferPtr buf,
                          virCPUDefPtr def)
{
762
    virNumaMemAccess memAccess;
763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783
    char *cpustr;
    size_t i;

    if (def->ncells == 0)
        return 0;

    virBufferAddLit(buf, "<numa>\n");
    virBufferAdjustIndent(buf, 2);
    for (i = 0; i < def->ncells; i++) {
        memAccess = def->cells[i].memAccess;

        if (!(cpustr = virBitmapFormat(def->cells[i].cpumask)))
            return -1;

        virBufferAddLit(buf, "<cell");
        virBufferAsprintf(buf, " id='%zu'", i);
        virBufferAsprintf(buf, " cpus='%s'", cpustr);
        virBufferAsprintf(buf, " memory='%llu'", def->cells[i].mem);
        virBufferAddLit(buf, " unit='KiB'");
        if (memAccess)
            virBufferAsprintf(buf, " memAccess='%s'",
784
                              virNumaMemAccessTypeToString(memAccess));
785 786 787 788 789 790 791 792
        virBufferAddLit(buf, "/>\n");
        VIR_FREE(cpustr);
    }
    virBufferAdjustIndent(buf, -2);
    virBufferAddLit(buf, "</numa>\n");

    return 0;
}
793 794 795 796 797 798 799 800 801 802 803 804 805


unsigned int
virDomainNumaGetCPUCountTotal(virCPUDefPtr numa)
{
    size_t i;
    unsigned int ret = 0;

    for (i = 0; i < numa->ncells; i++)
        ret += virBitmapCountBits(numa->cells[i].cpumask);

    return ret;
}
806 807 808 809 810 811 812 813 814 815 816


virDomainNumaPtr
virDomainNumaNew(void)
{
    virDomainNumaPtr ret = NULL;

    ignore_value(VIR_ALLOC(ret));

    return ret;
}