[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v6 42/42] tests: use -numa memdev option in tests ins
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v6 42/42] tests: use -numa memdev option in tests instead of legacy 'mem' option |
Date: |
Fri, 5 Jul 2019 19:15:04 -0300 |
From: Igor Mammedov <address@hidden>
it will test preferred memdev option more extensively and remove
undesired deprecation warnings during 'make check'
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
[ehabkost: remove numa-test.c changes]
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/bios-tables-test.c | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 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);
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL v6 25/42] i386: Remove unused host_cpudef variable, (continued)
- [Qemu-devel] [PULL v6 25/42] i386: Remove unused host_cpudef variable, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 26/42] target/i386: Add CPUID.1F generation support for multi-dies PCMachine, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 20/42] deprecate -mem-path fallback to anonymous RAM, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 27/42] machine: Refactor smp_parse() in vl.c as MachineClass::smp_parse(), Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 28/42] vl.c: Add -smp, dies=* command line support and update doc, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 29/42] qmp: Add deprecation information to query-machines, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 30/42] i386: Introduce SnowRidge CPU model, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 31/42] qmp: Add "alias-of" field to query-cpu-definitions, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 34/42] i386: Register versioned CPU models, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 42/42] tests: use -numa memdev option in tests instead of legacy 'mem' option,
Eduardo Habkost <=
- [Qemu-devel] [PULL v6 32/42] i386: Add x-force-features option for testing, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 33/42] i386: Get model-id from CPU object on "-cpu help", Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 39/42] i386: Add Cascadelake-Server-v2 CPU model, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 40/42] numa: Make deprecation warnings conditional on !qtest_enabled(), Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 38/42] docs: Deprecate CPU model runnability guarantees, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 36/42] i386: Replace -noTSX, -IBRS, -IBPB CPU models with aliases, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 35/42] i386: Define -IBRS, -noTSX, -IBRS versions of CPU models, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 41/42] numa: allow memory-less nodes when using memdev as backend, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 37/42] i386: Make unversioned CPU models be aliases, Eduardo Habkost, 2019/07/05
- Re: [Qemu-devel] [PULL v6 00/42] Machine and x86 queue, 2019-07-05, no-reply, 2019/07/06