From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PATCH 2/2] tests: use -numa memdev option in tests instead of legacy 'mem' option
Date: Tue, 2 Jul 2019 10:07:45 -0400 [thread overview]
Message-ID: <20190702140745.27767-3-imammedo@redhat.com> (raw)
In-Reply-To: <20190702140745.27767-1-imammedo@redhat.com>
it will test preferred memdev option more extensively and remove
undesired deprecation warnings during 'make check'
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/bios-tables-test.c | 40 ++++++++++++++++++++++++++-----------
tests/numa-test.c | 43 +++++++++++++++++++++++++++++-----------
2 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 0ce55182f2..d863233fe9 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -688,6 +688,8 @@ static void test_acpi_q35_tcg_mmio64(void)
};
test_acpi_one("-m 128M,slots=1,maxmem=2G "
+ "-object memory-backend-ram,id=ram0,size=128M "
+ "-numa node,memdev=ram0 "
"-device pci-testdev,membar=2G",
&data);
free_test_data(&data);
@@ -701,7 +703,9 @@ static void test_acpi_piix4_tcg_cphp(void)
data.machine = MACHINE_PC;
data.variant = ".cphp";
test_acpi_one("-smp 2,cores=3,sockets=2,maxcpus=6"
- " -numa node -numa node"
+ " -object memory-backend-ram,id=ram0,size=64M"
+ " -object memory-backend-ram,id=ram1,size=64M"
+ " -numa node,memdev=ram0 -numa node,memdev=ram1"
" -numa dist,src=0,dst=1,val=21",
&data);
free_test_data(&data);
@@ -715,7 +719,9 @@ static void test_acpi_q35_tcg_cphp(void)
data.machine = MACHINE_Q35;
data.variant = ".cphp";
test_acpi_one(" -smp 2,cores=3,sockets=2,maxcpus=6"
- " -numa node -numa node"
+ " -object memory-backend-ram,id=ram0,size=64M"
+ " -object memory-backend-ram,id=ram1,size=64M"
+ " -numa node,memdev=ram0 -numa node,memdev=ram1"
" -numa dist,src=0,dst=1,val=21",
&data);
free_test_data(&data);
@@ -766,7 +772,9 @@ static void test_acpi_q35_tcg_memhp(void)
data.machine = MACHINE_Q35;
data.variant = ".memhp";
test_acpi_one(" -m 128,slots=3,maxmem=1G"
- " -numa node -numa node"
+ " -object memory-backend-ram,id=ram0,size=64M"
+ " -object memory-backend-ram,id=ram1,size=64M"
+ " -numa node,memdev=ram0 -numa node,memdev=ram1"
" -numa dist,src=0,dst=1,val=21",
&data);
free_test_data(&data);
@@ -780,7 +788,9 @@ static void test_acpi_piix4_tcg_memhp(void)
data.machine = MACHINE_PC;
data.variant = ".memhp";
test_acpi_one(" -m 128,slots=3,maxmem=1G"
- " -numa node -numa node"
+ " -object memory-backend-ram,id=ram0,size=64M"
+ " -object memory-backend-ram,id=ram1,size=64M"
+ " -numa node,memdev=ram0 -numa node,memdev=ram1"
" -numa dist,src=0,dst=1,val=21",
&data);
free_test_data(&data);
@@ -793,7 +803,8 @@ static void test_acpi_q35_tcg_numamem(void)
memset(&data, 0, sizeof(data));
data.machine = MACHINE_Q35;
data.variant = ".numamem";
- test_acpi_one(" -numa node -numa node,mem=128", &data);
+ test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M"
+ " -numa node -numa node,memdev=ram0", &data);
free_test_data(&data);
}
@@ -804,7 +815,8 @@ static void test_acpi_piix4_tcg_numamem(void)
memset(&data, 0, sizeof(data));
data.machine = MACHINE_PC;
data.variant = ".numamem";
- test_acpi_one(" -numa node -numa node,mem=128", &data);
+ test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M"
+ " -numa node -numa node,memdev=ram0", &data);
free_test_data(&data);
}
@@ -818,17 +830,21 @@ static void test_acpi_tcg_dimm_pxm(const char *machine)
test_acpi_one(" -machine nvdimm=on,nvdimm-persistence=cpu"
" -smp 4,sockets=4"
" -m 128M,slots=3,maxmem=1G"
- " -numa node,mem=32M,nodeid=0"
- " -numa node,mem=32M,nodeid=1"
- " -numa node,mem=32M,nodeid=2"
- " -numa node,mem=32M,nodeid=3"
+ " -object memory-backend-ram,id=ram0,size=32M"
+ " -object memory-backend-ram,id=ram1,size=32M"
+ " -object memory-backend-ram,id=ram2,size=32M"
+ " -object memory-backend-ram,id=ram3,size=32M"
+ " -numa node,memdev=ram0,nodeid=0"
+ " -numa node,memdev=ram1,nodeid=1"
+ " -numa node,memdev=ram2,nodeid=2"
+ " -numa node,memdev=ram3,nodeid=3"
" -numa cpu,node-id=0,socket-id=0"
" -numa cpu,node-id=1,socket-id=1"
" -numa cpu,node-id=2,socket-id=2"
" -numa cpu,node-id=3,socket-id=3"
- " -object memory-backend-ram,id=ram0,size=128M"
+ " -object memory-backend-ram,id=ram4,size=128M"
" -object memory-backend-ram,id=nvm0,size=128M"
- " -device pc-dimm,id=dimm0,memdev=ram0,node=1"
+ " -device pc-dimm,id=dimm0,memdev=ram4,node=1"
" -device nvdimm,id=dimm1,memdev=nvm0,node=2",
&data);
free_test_data(&data);
diff --git a/tests/numa-test.c b/tests/numa-test.c
index 8de8581231..902e8de4d1 100644
--- a/tests/numa-test.c
+++ b/tests/numa-test.c
@@ -26,8 +26,10 @@ static void test_mon_explicit(const void *data)
QTestState *qts;
cli = make_cli(data, "-smp 8 "
- "-numa node,nodeid=0,cpus=0-3 "
- "-numa node,nodeid=1,cpus=4-7 ");
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,nodeid=0,cpus=0-3,memdev=ram0 "
+ "-numa node,nodeid=1,cpus=4-7,memdev=ram1 ");
qts = qtest_init(cli);
s = qtest_hmp(qts, "info numa");
@@ -45,7 +47,10 @@ 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, "-smp 8 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,memdev=ram0 -numa node,memdev=ram1");
qts = qtest_init(cli);
s = qtest_hmp(qts, "info numa");
@@ -64,8 +69,10 @@ static void test_mon_partial(const void *data)
QTestState *qts;
cli = make_cli(data, "-smp 8 "
- "-numa node,nodeid=0,cpus=0-1 "
- "-numa node,nodeid=1,cpus=4-5 ");
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,nodeid=0,cpus=0-1,memdev=ram0 "
+ "-numa node,nodeid=1,cpus=4-5,memdev=ram1");
qts = qtest_init(cli);
s = qtest_hmp(qts, "info numa");
@@ -93,7 +100,11 @@ 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, "-smp 8 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,cpus=0-3,memdev=ram0 "
+ "-numa node,cpus=4-7,memdev=ram1");
qts = qtest_init(cli);
cpus = get_cpus(qts, &resp);
g_assert(cpus);
@@ -132,7 +143,9 @@ static void pc_numa_cpu(const void *data)
QTestState *qts;
cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
- "-numa node,nodeid=0 -numa node,nodeid=1 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
"-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 "
@@ -186,7 +199,9 @@ static void spapr_numa_cpu(const void *data)
QTestState *qts;
cli = make_cli(data, "-smp 4,cores=4 "
- "-numa node,nodeid=0 -numa node,nodeid=1 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
"-numa cpu,node-id=0,core-id=0 "
"-numa cpu,node-id=0,core-id=1 "
"-numa cpu,node-id=0,core-id=2 "
@@ -232,7 +247,9 @@ static void aarch64_numa_cpu(const void *data)
QTestState *qts;
cli = make_cli(data, "-smp 2 "
- "-numa node,nodeid=0 -numa node,nodeid=1 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M "
+ "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
"-numa cpu,node-id=1,thread-id=0 "
"-numa cpu,node-id=0,thread-id=1");
qts = qtest_init(cli);
@@ -274,14 +291,16 @@ static void pc_dynamic_cpu_cfg(const void *data)
QList *cpus;
QTestState *qs;
- qs = qtest_initf("%s -nodefaults --preconfig -smp 2",
+ qs = qtest_initf("%s -nodefaults --preconfig -smp 2 "
+ "-object memory-backend-ram,id=ram0,size=64M "
+ "-object memory-backend-ram,id=ram1,size=64M",
data ? (char *)data : "");
/* 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': 'ram0' } }")));
g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
- " 'arguments': { 'type': 'node', 'nodeid': 1 } }")));
+ " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'ram1' } }")));
/* map 2 cpus in non default reverse order
* i.e socket1->node0, socket0->node1
--
2.18.1
next prev parent reply other threads:[~2019-07-02 14:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 18:47 [Qemu-devel] [PULL v2 00/29] Machine and x86 queue, 2019-06-28 Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 01/29] hw/boards: Add struct CpuTopology to MachineState Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 02/29] machine: Refactor smp-related call chains to pass MachineState Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 03/29] general: Replace global smp variables with smp machine properties Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 04/29] hw/ppc: Replace global smp variables with machine smp properties Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 05/29] hw/riscv: " Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 06/29] hw/s390x: " Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 07/29] hw/i386: " Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 08/29] hw/arm: " Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 09/29] hw: Replace global smp variables with MachineState for all remaining archs Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 10/29] vl.c: Replace smp global variables with smp machine properties Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 11/29] i386: Add die-level cpu topology to x86CPU on PCMachine Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 12/29] hw/i386: Adjust nr_dies with configured smp_dies for PCMachine Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 13/29] i386/cpu: Consolidate die-id validity in smp context Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 14/29] i386: Update new x86_apicid parsing rules with die_offset support Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 15/29] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size() Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 16/29] machine: show if CLI option '-numa node, mem' is supported in QAPI schema Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 17/29] numa: deprecate 'mem' parameter of '-numa node' option Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 18/29] numa: deprecate implict memory distribution between nodes Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 19/29] hppa: Delete unused hppa_cpu_list() function Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 20/29] target/i386: fix feature check in hyperv-stub.c Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 21/29] deprecate -mem-path fallback to anonymous RAM Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 22/29] i386: Don't print warning if phys-bits was set automatically Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 23/29] i386: Fix signedness of hyperv_spinlock_attempts Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 24/29] i386: make 'hv-spinlocks' a regular uint32 property Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 25/29] x86/cpu: use FeatureWordArray to define filtered_features Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 26/29] i386: Remove unused host_cpudef variable Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 27/29] target/i386: Add CPUID.1F generation support for multi-dies PCMachine Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 28/29] machine: Refactor smp_parse() in vl.c as MachineClass::smp_parse() Eduardo Habkost
2019-06-28 18:47 ` [Qemu-devel] [PULL v2 29/29] vl.c: Add -smp, dies=* command line support and update doc Eduardo Habkost
2019-07-02 10:48 ` [Qemu-devel] [PULL v2 00/29] Machine and x86 queue, 2019-06-28 Peter Maydell
2019-07-02 11:44 ` Igor Mammedov
2019-07-02 14:07 ` [Qemu-devel] [PATCH 0/2] fix memory-less numa configuration and switch to memdev syntax in tests Igor Mammedov
2019-07-02 14:07 ` [Qemu-devel] [PATCH 1/2] numa: allow memory-less nodes when using memdev as backend Igor Mammedov
2019-07-02 14:07 ` Igor Mammedov [this message]
2019-07-02 17:19 ` [Qemu-devel] [PATCH 2/2] tests: use -numa memdev option in tests instead of legacy 'mem' option Eduardo Habkost
2019-07-02 22:03 ` Eduardo Habkost
2019-07-03 12:13 ` Igor Mammedov
2019-07-02 19:58 ` [Qemu-devel] [PATCH 0/2] fix memory-less numa configuration and switch to memdev syntax in tests no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190702140745.27767-3-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=ehabkost@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).