[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v5 41/43] numa: Make deprecation warnings conditional
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v5 41/43] numa: Make deprecation warnings conditional on !qtest_enabled() |
Date: |
Wed, 3 Jul 2019 18:08:19 -0300 |
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 <address@hidden>
Message-Id: <address@hidden>
---
hw/core/numa.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/core/numa.c b/hw/core/numa.c
index 7faec75a07..fa52f59e86 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -31,6 +31,7 @@
#include "qapi/error.h"
#include "qapi/opts-visitor.h"
#include "qapi/qapi-visit-machine.h"
+#include "sysemu/qtest.h"
#include "hw/mem/pc-dimm.h"
#include "hw/mem/memory-device.h"
#include "qemu/option.h"
@@ -118,8 +119,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;
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL v5 42/43] numa: allow memory-less nodes when using memdev as backend, (continued)
- [Qemu-devel] [PULL v5 42/43] numa: allow memory-less nodes when using memdev as backend, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 33/43] i386: Add x-force-features option for testing, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 17/43] numa: deprecate 'mem' parameter of '-numa node' option, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 39/43] docs: Deprecate CPU model runnability guarantees, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 38/43] i386: Make unversioned CPU models be aliases, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 35/43] i386: Register versioned CPU models, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 43/43] tests: use -numa memdev option in tests instead of legacy 'mem' option, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 37/43] i386: Replace -noTSX, -IBRS, -IBPB CPU models with aliases, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 36/43] i386: Define -IBRS, -noTSX, -IBRS versions of CPU models, Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 34/43] i386: Get model-id from CPU object on "-cpu help", Eduardo Habkost, 2019/07/03
- [Qemu-devel] [PULL v5 41/43] numa: Make deprecation warnings conditional on !qtest_enabled(),
Eduardo Habkost <=
- [Qemu-devel] [PULL v5 40/43] i386: Add Cascadelake-Server-v2 CPU model, Eduardo Habkost, 2019/07/03
- Re: [Qemu-devel] [PULL v5 00/43] Machine and x86 queue, 2019-07-03, no-reply, 2019/07/03
- Re: [Qemu-devel] [PULL v5 00/43] Machine and x86 queue, 2019-07-03, no-reply, 2019/07/03
- Re: [Qemu-devel] [PULL v5 00/43] Machine and x86 queue, 2019-07-03, Peter Maydell, 2019/07/04