numa: Make deprecation warnings conditional on !qtest_enabled()

[Qemu-devel] [PATCH] numa: Make deprecation warnings conditional on !qtest_enabled()

Posted by Eduardo Habkost 4 years, 10 months ago

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

Re: [Qemu-devel] [PATCH] numa: Make deprecation warnings conditional on !qtest_enabled()

Posted by Igor Mammedov 4 years, 10 months ago

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;

[Qemu-devel] [PATCH v2] tests: numa-test: use -numa memdev option instead of legacy 'mem' option

Posted by Igor Mammedov 4 years, 10 months ago

it drops testing of deprecated 'mem' option and will test preferred memdev
option instead.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v2:
  - make backend size depend on initial RAM size and a number of backends
    fixes test faulure with spapr machine (Eduardo Habkost <ehabkost@redhat.com>)

 tests/numa-test.c | 85 +++++++++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/tests/numa-test.c b/tests/numa-test.c
index 8de8581231..e102b3b70f 100644
--- a/tests/numa-test.c
+++ b/tests/numa-test.c
@@ -14,9 +14,28 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 
-static char *make_cli(const char *generic_cli, const char *test_cli)
+typedef struct {
+    const char *args;
+    int ram_size; /* size in MB */
+} TestData;
+
+static char *make_cli(const TestData *data, int memdev_count,
+                      const char *test_cli)
 {
-    return g_strdup_printf("%s %s", generic_cli ? generic_cli : "", test_cli);
+    int i;
+    char *tmp = NULL;
+    char *cli = g_strdup_printf("%s -m %d", data->args ? : "", data->ram_size);
+
+    for (i = 0; memdev_count && (i < memdev_count); i++) {
+        tmp = g_strdup_printf("%s -object memory-backend-ram,id=r%d,size=%dM",
+                              cli, i, data->ram_size / memdev_count);
+        g_free(cli);
+        cli = tmp;
+    }
+    tmp = g_strdup_printf("%s %s", cli, test_cli);
+    g_free(cli);
+    cli = tmp;
+    return cli;
 }
 
 static void test_mon_explicit(const void *data)
@@ -25,9 +44,8 @@ static void test_mon_explicit(const void *data)
     char *cli;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 "
-                   "-numa node,nodeid=0,cpus=0-3 "
-                   "-numa node,nodeid=1,cpus=4-7 ");
+    cli = make_cli(data, 2, "-smp 8 -numa node,nodeid=0,cpus=0-3,memdev=r0 "
+                   "-numa node,nodeid=1,cpus=4-7,memdev=r1 ");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -45,7 +63,7 @@ static void test_mon_default(const void *data)
     char *cli;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 -numa node -numa node");
+    cli = make_cli(data, 2, "-smp 8 -numa node,memdev=r0 -numa node,memdev=r1");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -63,9 +81,8 @@ static void test_mon_partial(const void *data)
     char *cli;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 "
-                   "-numa node,nodeid=0,cpus=0-1 "
-                   "-numa node,nodeid=1,cpus=4-5 ");
+    cli = make_cli(data, 2, "-smp 8 -numa node,nodeid=0,cpus=0-1,memdev=r0 "
+                   "-numa node,nodeid=1,cpus=4-5,memdev=r1");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -93,7 +110,8 @@ static void test_query_cpus(const void *data)
     QObject *e;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7");
+    cli = make_cli(data, 2, "-smp 8 -numa node,cpus=0-3,memdev=r0 "
+                   "-numa node,cpus=4-7,memdev=r1");
     qts = qtest_init(cli);
     cpus = get_cpus(qts, &resp);
     g_assert(cpus);
@@ -131,8 +149,8 @@ static void pc_numa_cpu(const void *data)
     QObject *e;
     QTestState *qts;
 
-    cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+    cli = make_cli(data, 2, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
+        "-numa node,nodeid=0,memdev=r0 -numa node,nodeid=1,memdev=r1 "
         "-numa cpu,node-id=1,socket-id=0 "
         "-numa cpu,node-id=0,socket-id=1,core-id=0 "
         "-numa cpu,node-id=0,socket-id=1,core-id=1,thread-id=0 "
@@ -185,8 +203,8 @@ static void spapr_numa_cpu(const void *data)
     QObject *e;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 4,cores=4 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+    cli = make_cli(data, 2, "-smp 4,cores=4 "
+        "-numa node,nodeid=0,memdev=r0 -numa node,nodeid=1,memdev=r1 "
         "-numa cpu,node-id=0,core-id=0 "
         "-numa cpu,node-id=0,core-id=1 "
         "-numa cpu,node-id=0,core-id=2 "
@@ -231,8 +249,8 @@ static void aarch64_numa_cpu(const void *data)
     QObject *e;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 2 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+    cli = make_cli(data, 2, "-smp 2 "
+        "-numa node,nodeid=0,memdev=r0 -numa node,nodeid=1,memdev=r1 "
         "-numa cpu,node-id=1,thread-id=0 "
         "-numa cpu,node-id=0,thread-id=1");
     qts = qtest_init(cli);
@@ -272,16 +290,14 @@ static void pc_dynamic_cpu_cfg(const void *data)
     QObject *e;
     QDict *resp;
     QList *cpus;
-    QTestState *qs;
-
-    qs = qtest_initf("%s -nodefaults --preconfig -smp 2",
-                     data ? (char *)data : "");
+    char *cli = make_cli(data, 2, "-nodefaults --preconfig -smp 2");
+    QTestState *qs = qtest_init(cli);
 
     /* create 2 numa nodes */
     g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
-        " 'arguments': { 'type': 'node', 'nodeid': 0 } }")));
+        " 'arguments': { 'type': 'node', 'nodeid': 0, 'memdev': 'r0' } }")));
     g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
-        " 'arguments': { 'type': 'node', 'nodeid': 1 } }")));
+        " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'r1' } }")));
 
     /* map 2 cpus in non default reverse order
      * i.e socket1->node0, socket0->node1
@@ -325,35 +341,38 @@ static void pc_dynamic_cpu_cfg(const void *data)
     qobject_unref(resp);
 
     qtest_quit(qs);
+    g_free(cli);
 }
 
 int main(int argc, char **argv)
 {
-    const char *args = NULL;
     const char *arch = qtest_get_arch();
+    TestData data = { .ram_size = 128 };
 
-    if (strcmp(arch, "aarch64") == 0) {
-        args = "-machine virt";
+    if (!strcmp(arch, "aarch64")) {
+        data.args = "-machine virt";
+    } else if (!strcmp(arch, "ppc64")) {
+        data.ram_size = 512;
     }
 
     g_test_init(&argc, &argv, NULL);
 
-    qtest_add_data_func("/numa/mon/default", args, test_mon_default);
-    qtest_add_data_func("/numa/mon/cpus/explicit", args, test_mon_explicit);
-    qtest_add_data_func("/numa/mon/cpus/partial", args, test_mon_partial);
-    qtest_add_data_func("/numa/qmp/cpus/query-cpus", args, test_query_cpus);
+    qtest_add_data_func("/numa/mon/default", &data, test_mon_default);
+    qtest_add_data_func("/numa/mon/cpus/explicit", &data, test_mon_explicit);
+    qtest_add_data_func("/numa/mon/cpus/partial", &data, test_mon_partial);
+    qtest_add_data_func("/numa/qmp/cpus/query-cpus", &data, test_query_cpus);
 
     if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
-        qtest_add_data_func("/numa/pc/cpu/explicit", args, pc_numa_cpu);
-        qtest_add_data_func("/numa/pc/dynamic/cpu", args, pc_dynamic_cpu_cfg);
+        qtest_add_data_func("/numa/pc/cpu/explicit", &data, pc_numa_cpu);
+        qtest_add_data_func("/numa/pc/dynamic/cpu", &data, pc_dynamic_cpu_cfg);
     }
 
     if (!strcmp(arch, "ppc64")) {
-        qtest_add_data_func("/numa/spapr/cpu/explicit", args, spapr_numa_cpu);
+        qtest_add_data_func("/numa/spapr/cpu/explicit", &data, spapr_numa_cpu);
     }
 
     if (!strcmp(arch, "aarch64")) {
-        qtest_add_data_func("/numa/aarch64/cpu/explicit", args,
+        qtest_add_data_func("/numa/aarch64/cpu/explicit", &data,
                             aarch64_numa_cpu);
     }
 
-- 
2.18.1