Commit 62e570b1 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents e1fe27a2 c6ff347c

hw/core/machine.c

+2 −1
Original line number Diff line number Diff line
@@ -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 "