diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-30 09:31:05 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-30 09:31:09 +0100 |
| commit | 62e570b1c50cac88fb0e940cfcb7820732106c20 (patch) | |
| tree | d4c732bf65b0a2ff7c1d92a69daf63c11f279f27 | |
| parent | e1fe27a208d565bb4f52127e7d9f4fea911e0d94 (diff) | |
| parent | c6ff347c8078bb86f75d38955641cb73e9d5b309 (diff) | |
| download | qemu-62e570b1c50cac88fb0e940cfcb7820732106c20.tar.gz | |
Merge remote-tracking branch 'ehabkost/tags/numa-pull-request' into staging
Silence "make check" warnings on NUMA test
# gpg: Signature made Tue 23 May 2017 11:44:24 AM 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
* ehabkost/tags/numa-pull-request:
numa: Silence incomplete mapping warning under qtest
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/core/machine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index fd6a436064..3adebf14c4 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -21,6 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "sysemu/numa.h" +#include "sysemu/qtest.h" static char *machine_get_accel(Object *obj, Error **errp) { @@ -722,7 +723,7 @@ static void machine_numa_validate(MachineState *machine) g_free(cpu_str); } } - if (s->len) { + if (s->len && !qtest_enabled()) { error_report("warning: CPU(s) not present in any NUMA nodes: %s", s->str); error_report("warning: All CPU(s) up to maxcpus should be described " |