mirror of https://github.com/xemu-project/xemu.git
tests/unit/test-smp-parse: Constify some pointer/struct
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>
This commit is contained in:
parent
47ab8a491a
commit
cf65000ae9
|
@ -83,7 +83,7 @@ typedef struct SMPTestData {
|
||||||
* then test the automatic calculation algorithm of the missing
|
* then test the automatic calculation algorithm of the missing
|
||||||
* values in the parser.
|
* values in the parser.
|
||||||
*/
|
*/
|
||||||
static struct SMPTestData data_generic_valid[] = {
|
static const struct SMPTestData data_generic_valid[] = {
|
||||||
{
|
{
|
||||||
/* config: no configuration provided
|
/* config: no configuration provided
|
||||||
* expect: cpus=1,sockets=1,cores=1,threads=1,maxcpus=1 */
|
* 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 2,dies=2 */
|
||||||
.config = SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
|
.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 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),
|
.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);
|
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(
|
return g_strdup_printf(
|
||||||
"(CpuTopology) {\n"
|
"(CpuTopology) {\n"
|
||||||
|
@ -372,7 +372,7 @@ static char *cpu_topology_to_string(CpuTopology *topo)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_parse(MachineState *ms, SMPConfiguration *config,
|
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)
|
bool is_valid)
|
||||||
{
|
{
|
||||||
g_autofree char *config_str = smp_config_to_string(config);
|
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 */
|
/* 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) {
|
if (!mc->smp_props.dies_supported) {
|
||||||
data->expect_prefer_sockets.dies = 1;
|
data->expect_prefer_sockets.dies = 1;
|
||||||
|
|
Loading…
Reference in New Issue