83 lines
3.2 KiB
Diff
83 lines
3.2 KiB
Diff
From bcf4b802bd8971c0c5a255e606b15900cd47c6b6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Thu, 11 Nov 2021 10:23:06 +0100
|
|
Subject: [PATCH 08/24] tests/unit/test-smp-parse: Constify some pointer/struct
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Declare structures const when we don't need to modify
|
|
them at runtime.
|
|
|
|
Reviewed-by: Andrew Jones <drjones@redhat.com>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Tested-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Message-Id: <20211216132015.815493-8-philmd@redhat.com>
|
|
---
|
|
tests/unit/test-smp-parse.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
|
|
index 395929b66c..0f98c9509e 100644
|
|
--- a/tests/unit/test-smp-parse.c
|
|
+++ b/tests/unit/test-smp-parse.c
|
|
@@ -83,7 +83,7 @@ typedef struct SMPTestData {
|
|
* then test the automatic calculation algorithm of the missing
|
|
* values in the parser.
|
|
*/
|
|
-static struct SMPTestData data_generic_valid[] = {
|
|
+static const struct SMPTestData data_generic_valid[] = {
|
|
{
|
|
/* config: no configuration provided
|
|
* expect: cpus=1,sockets=1,cores=1,threads=1,maxcpus=1 */
|
|
@@ -285,7 +285,7 @@ static struct SMPTestData data_generic_valid[] = {
|
|
},
|
|
};
|
|
|
|
-static struct SMPTestData data_generic_invalid[] = {
|
|
+static const struct SMPTestData data_generic_invalid[] = {
|
|
{
|
|
/* config: -smp 2,dies=2 */
|
|
.config = SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
|
|
@@ -319,7 +319,7 @@ static struct SMPTestData data_generic_invalid[] = {
|
|
},
|
|
};
|
|
|
|
-static struct SMPTestData data_with_dies_invalid[] = {
|
|
+static const struct SMPTestData data_with_dies_invalid[] = {
|
|
{
|
|
/* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */
|
|
.config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16),
|
|
@@ -356,7 +356,7 @@ static char *smp_config_to_string(SMPConfiguration *config)
|
|
config->has_maxcpus ? "true" : "false", config->maxcpus);
|
|
}
|
|
|
|
-static char *cpu_topology_to_string(CpuTopology *topo)
|
|
+static char *cpu_topology_to_string(const CpuTopology *topo)
|
|
{
|
|
return g_strdup_printf(
|
|
"(CpuTopology) {\n"
|
|
@@ -372,7 +372,7 @@ static char *cpu_topology_to_string(CpuTopology *topo)
|
|
}
|
|
|
|
static void check_parse(MachineState *ms, SMPConfiguration *config,
|
|
- CpuTopology *expect_topo, const char *expect_err,
|
|
+ const CpuTopology *expect_topo, const char *expect_err,
|
|
bool is_valid)
|
|
{
|
|
g_autofree char *config_str = smp_config_to_string(config);
|
|
@@ -466,7 +466,7 @@ static void smp_parse_test(MachineState *ms, SMPTestData *data, bool is_valid)
|
|
}
|
|
|
|
/* The parsed results of the unsupported parameters should be 1 */
|
|
-static void unsupported_params_init(MachineClass *mc, SMPTestData *data)
|
|
+static void unsupported_params_init(const MachineClass *mc, SMPTestData *data)
|
|
{
|
|
if (!mc->smp_props.dies_supported) {
|
|
data->expect_prefer_sockets.dies = 1;
|
|
--
|
|
2.27.0
|
|
|