openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NUMA fixes, 2017-05-30 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZLcO0AAoJECgHk2+YTcWmFpIQAKv0lLX84QhR7l0jxgGWxCeJ
 clj8fZ036iv8ZM/QtBzsxj1R+KghimsJ1jT7inllbyyEUXbUa6CURE/DBT7BrSO5
 EDPY9FuxDBnVxOlEgXgBbWYSYRiEoUA8A7giaRRqiK3VtIPzOlmVRfgD/oIHzs8w
 617tP7I4mbRnTa9m2SNvdU4nyRs2VGGLoj/AJmoyGHOoxHPHjN5GVSMxI8HKQnv4
 E+gvLTfaq2vnQHiIijuvIPN3I+v5n++A9VwypluaqafIrBSc517MtgvjIIqidjqW
 lhuDo6amp06PVbgsziToagPievU2+HJlsYdHJMQgqUiJc052+ybXWigTEItXso/8
 n8Zn8rDlULvyiuKxVm4MXzmBb179oP4+6h0Xd+cK9RDPo+/mwRW+2B213SueYP7Z
 QOxpDy59JWb+NmbUFZ2yWhPe1MDr1KwBJydHdYdLE7i2yw+sGatIK9IOV7UHYtzu
 up8ziYQOGnWrWxv/YEL3mUIue5o1IrUAhEITklXNc8Hft21eYbp62jZNkUA6NdDG
 VrhnJvwxQJQytwy+8HyepDa0aOc4QqUMmK3yNZASy5V0OBMAq/U1XYLPIJLTcc6G
 0rsnP7M+xZFle/Yicdv5Ig127v3D6VTUASRWbB3/v39dI3wSt6FHoCrA3ktDP5pk
 GnMflT0TJH3ci9VtHIb0
 =VHc0
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-06-01 10:58:47 +01:00
parent 0748b3526e f892291eee
commit 70f31414e7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
numa.c
View File

@ -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;
}

14
tests/numa-test.c
View File

@ -92,7 +92,7 @@ static QList *get_cpus(QDict **resp)
*resp = qmp("{ 'execute': 'query-cpus' }");
g_assert(*resp);
g_assert(qdict_haskey(*resp, "return"));
return qdict_get_qlist(*resp, "return");
return qdict_get_qlist(*resp, "return");
}
static void test_query_cpus(const void *data)
@ -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);