| Message ID | 20240513123358.612355-3-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/core: revert deprecation of 'parameter=1' for SMP topology | expand |
On 5/13/2024 8:33 PM, Daniel P. Berrangé wrote: > Validate that it is possible to pass 'parameter=1' for any SMP topology > parameter, since unsupported parameters are implicitly considered to > always have a value of 1. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/unit/test-smp-parse.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c > index 56165e6644..56ce5128f1 100644 > --- a/tests/unit/test-smp-parse.c > +++ b/tests/unit/test-smp-parse.c > @@ -330,6 +330,14 @@ static const struct SMPTestData data_generic_valid[] = { > .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 16), > .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), > .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), > + }, { > + /* > + * Unsupported parameters are always allowed to be set to '1' > + * config: -smp 8,books=1,drawers=1,sockets=2,modules=1,dies=1,cores=4,threads=2,maxcpus=8 cores=2 not 4. > + * expect: cpus=8,sockets=2,cores=2,threads=2,maxcpus=8 */ > + .config = SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), > + .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), > + .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), > }, > }; >
On Mon, May 13, 2024 at 01:33:58PM +0100, Daniel P. Berrangé wrote: > Date: Mon, 13 May 2024 13:33:58 +0100 > From: "Daniel P. Berrangé" <berrange@redhat.com> > Subject: [PATCH 2/2] tests: add testing of parameter=1 for SMP topology > > Validate that it is possible to pass 'parameter=1' for any SMP topology > parameter, since unsupported parameters are implicitly considered to > always have a value of 1. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/unit/test-smp-parse.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c > index 56165e6644..56ce5128f1 100644 > --- a/tests/unit/test-smp-parse.c > +++ b/tests/unit/test-smp-parse.c > @@ -330,6 +330,14 @@ static const struct SMPTestData data_generic_valid[] = { > .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 16), > .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), > .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), > + }, { > + /* > + * Unsupported parameters are always allowed to be set to '1' > + * config: -smp 8,books=1,drawers=1,sockets=2,modules=1,dies=1,cores=4,threads=2,maxcpus=8 > + * expect: cpus=8,sockets=2,cores=2,threads=2,maxcpus=8 */ > + .config = SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), > + .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), > + .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), > }, > }; > As Xiaoyao's suggestion, only the nit in the comment. Others look good to me, so, Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 56165e6644..56ce5128f1 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -330,6 +330,14 @@ static const struct SMPTestData data_generic_valid[] = { .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 16), .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16), + }, { + /* + * Unsupported parameters are always allowed to be set to '1' + * config: -smp 8,books=1,drawers=1,sockets=2,modules=1,dies=1,cores=4,threads=2,maxcpus=8 + * expect: cpus=8,sockets=2,cores=2,threads=2,maxcpus=8 */ + .config = SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), + .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), + .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), }, };
Validate that it is possible to pass 'parameter=1' for any SMP topology parameter, since unsupported parameters are implicitly considered to always have a value of 1. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/unit/test-smp-parse.c | 8 ++++++++ 1 file changed, 8 insertions(+)