| Message ID | 20190702215726.23661-1-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | numa: Make deprecation warnings conditional on !qtest_enabled() | expand |
On Tue, 2 Jul 2019 18:57:26 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > This will help us avoid spurious warnings during "make check". > > Note that this will silence the warnings generated by > tests/numa-test, but not the ones generated by > tests/bios-tables-test. We still need to change > tests/bios-tables-test to use "-numa ...,memdev=" to silence > these warnings. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > numa.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/numa.c b/numa.c > index 1824c4e049..4988f25cd4 100644 > --- a/numa.c > +++ b/numa.c > @@ -35,6 +35,7 @@ > #include "qapi/qapi-visit-misc.h" > #include "hw/boards.h" > #include "sysemu/hostmem.h" > +#include "sysemu/qtest.h" > #include "hw/mem/pc-dimm.h" > #include "hw/mem/memory-device.h" > #include "qemu/option.h" > @@ -117,8 +118,10 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, > > if (node->has_mem) { > numa_info[nodenr].node_mem = node->mem; > - warn_report("Parameter -numa node,mem is deprecated," > - " use -numa node,memdev instead"); > + if (!qtest_enabled()) { > + warn_report("Parameter -numa node,mem is deprecated," > + " use -numa node,memdev instead"); > + } > } > if (node->has_memdev) { > Object *o; > @@ -405,9 +408,11 @@ void numa_complete_configuration(MachineState *ms) > if (i == nb_numa_nodes) { > assert(mc->numa_auto_assign_ram); > mc->numa_auto_assign_ram(mc, numa_info, nb_numa_nodes, ram_size); > - warn_report("Default splitting of RAM between nodes is deprecated," > - " Use '-numa node,memdev' to explictly define RAM" > - " allocation per node"); > + if (!qtest_enabled()) { > + warn_report("Default splitting of RAM between nodes is deprecated," > + " Use '-numa node,memdev' to explictly define RAM" > + " allocation per node"); > + } > } > > numa_total = 0;
diff --git a/numa.c b/numa.c index 1824c4e049..4988f25cd4 100644 --- a/numa.c +++ b/numa.c @@ -35,6 +35,7 @@ #include "qapi/qapi-visit-misc.h" #include "hw/boards.h" #include "sysemu/hostmem.h" +#include "sysemu/qtest.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/memory-device.h" #include "qemu/option.h" @@ -117,8 +118,10 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, if (node->has_mem) { numa_info[nodenr].node_mem = node->mem; - warn_report("Parameter -numa node,mem is deprecated," - " use -numa node,memdev instead"); + if (!qtest_enabled()) { + warn_report("Parameter -numa node,mem is deprecated," + " use -numa node,memdev instead"); + } } if (node->has_memdev) { Object *o; @@ -405,9 +408,11 @@ void numa_complete_configuration(MachineState *ms) if (i == nb_numa_nodes) { assert(mc->numa_auto_assign_ram); mc->numa_auto_assign_ram(mc, numa_info, nb_numa_nodes, ram_size); - warn_report("Default splitting of RAM between nodes is deprecated," - " Use '-numa node,memdev' to explictly define RAM" - " allocation per node"); + if (!qtest_enabled()) { + warn_report("Default splitting of RAM between nodes is deprecated," + " Use '-numa node,memdev' to explictly define RAM" + " allocation per node"); + } } numa_total = 0;
This will help us avoid spurious warnings during "make check". Note that this will silence the warnings generated by tests/numa-test, but not the ones generated by tests/bios-tables-test. We still need to change tests/bios-tables-test to use "-numa ...,memdev=" to silence these warnings. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- numa.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)