qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] numa: Make deprecation warnings conditional on !qtest_enabled()
@ 2019-07-02 21:57 Eduardo Habkost
  2019-07-03  7:49 ` Igor Mammedov
  2019-07-03 15:47 ` [Qemu-devel] [PATCH v2] tests: numa-test: use -numa memdev option instead of legacy 'mem' option Igor Mammedov
  0 siblings, 2 replies; 8+ messages in thread
From: Eduardo Habkost @ 2019-07-02 21:57 UTC (permalink / raw)
  To: qemu-devel, Igor Mammedov; +Cc: Peter Maydell, Eduardo Habkost

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(-)

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;
-- 
2.18.0.rc1.1.g3f1ff2140



^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-07-09 14:57 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-02 21:57 [Qemu-devel] [PATCH] numa: Make deprecation warnings conditional on !qtest_enabled() Eduardo Habkost
2019-07-03  7:49 ` Igor Mammedov
2019-07-03 15:47 ` [Qemu-devel] [PATCH v2] tests: numa-test: use -numa memdev option instead of legacy 'mem' option Igor Mammedov
2019-07-03 19:37   ` Eduardo Habkost
2019-07-04  7:33     ` Igor Mammedov
2019-07-08 22:25       ` Eduardo Habkost
2019-07-09 14:51         ` Igor Mammedov
2019-07-03 19:57   ` no-reply

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).