Commit 70f31414 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging 



NUMA fixes, 2017-05-30

# gpg: Signature made Tue 30 May 2017 20:10:44 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/numa-pull-request:
  numa: Fix format string for "Invalid node" message
  numa-test: fix query-cpus leaks

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0748b352 f892291e

numa.c

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ static void parse_numa_distance(NumaDistOptions *dist, Error **errp) 


    if (src >= MAX_NODES || dst >= MAX_NODES) {

        error_setg(errp,

                   "Invalid node %" PRIu16

                   ", max possible could be %" PRIu16,

                   "Invalid node %d, max possible could be %d",

                   MAX(src, dst), MAX_NODES);

        return;

    }

tests/numa-test.c

+9 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void test_query_cpus(const void *data) 
    char *cli;

    QDict *resp;

    QList *cpus;

    const QObject *e;

    QObject *e;



    cli = make_cli(data, "-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7");

    qtest_start(cli);
@@ -124,6 +124,7 @@ static void test_query_cpus(const void *data) 
        } else {

            g_assert_cmpint(node, ==, 1);

        }

        qobject_decref(e);

    }



    QDECREF(resp);
@@ -136,7 +137,7 @@ static void pc_numa_cpu(const void *data) 
    char *cli;

    QDict *resp;

    QList *cpus;

    const QObject *e;

    QObject *e;



    cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "

        "-numa node,nodeid=0 -numa node,nodeid=1 "
@@ -176,6 +177,7 @@ static void pc_numa_cpu(const void *data) 
        } else {

            g_assert(false);

        }

        qobject_decref(e);

    }



    QDECREF(resp);
@@ -188,7 +190,7 @@ static void spapr_numa_cpu(const void *data) 
    char *cli;

    QDict *resp;

    QList *cpus;

    const QObject *e;

    QObject *e;



    cli = make_cli(data, "-smp 4,cores=4 "

        "-numa node,nodeid=0 -numa node,nodeid=1 "
@@ -220,6 +222,7 @@ static void spapr_numa_cpu(const void *data) 
        } else {

            g_assert(false);

        }

        qobject_decref(e);

    }



    QDECREF(resp);
@@ -232,7 +235,7 @@ static void aarch64_numa_cpu(const void *data) 
    char *cli;

    QDict *resp;

    QList *cpus;

    const QObject *e;

    QObject *e;



    cli = make_cli(data, "-smp 2 "

        "-numa node,nodeid=0 -numa node,nodeid=1 "
@@ -262,6 +265,7 @@ static void aarch64_numa_cpu(const void *data) 
        } else {

            g_assert(false);

        }

        qobject_decref(e);

    }



    QDECREF(resp);