From: Zhao Liu
The support for "parameter=0" SMP configurations is removed, and QEMU
returns error for those cases.
So add the related test cases to ensure parameters can't accept 0.
Signed-off-by: Zhao Liu
---
tests/unit/test-smp-parse.c | 92 +
1 file changed, 92 insertions(+)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index d39cfdc19bfe..8994337e12c7 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -524,6 +524,91 @@ static const struct SMPTestData data_full_topo_invalid[] =
{
},
};
+static const struct SMPTestData data_zero_topo_invalid[] = {
+{
+/*
+ * Test "cpus=0".
+ * config: -smp 0,drawers=1,books=1,sockets=1,dies=1,\
+ * clusters=1,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(0, 1, 1, 1, 1, 1, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "drawers=0".
+ * config: -smp 1,drawers=0,books=1,sockets=1,dies=1,\
+ * clusters=1,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 0, 1, 1, 1, 1, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "books=0".
+ * config: -smp 1,drawers=1,books=0,sockets=1,dies=1,\
+ * clusters=1,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 0, 1, 1, 1, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "sockets=0".
+ * config: -smp 1,drawers=1,books=1,sockets=0,dies=1,\
+ * clusters=1,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 0, 1, 1, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "dies=0".
+ * config: -smp 1,drawers=1,books=1,sockets=1,dies=0,\
+ * clusters=1,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 0, 1, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "clusters=0".
+ * config: -smp 1,drawers=1,books=1,sockets=1,dies=1,\
+ * clusters=0,cores=1,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 0, 1, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "cores=0".
+ * config: -smp 1,drawers=1,books=1,sockets=1,dies=1,\
+ * clusters=1,cores=0,threads=1,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 0, 1, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "threads=0".
+ * config: -smp 1,drawers=1,books=1,sockets=1,dies=1,\
+ * clusters=1,cores=1,threads=0,maxcpus=1
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 0, 1),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+}, {
+/*
+ * Test "maxcpus=0".
+ * config: -smp 1,drawers=1,books=1,sockets=1,dies=1,\
+ * clusters=1,cores=1,threads=1,maxcpus=0
+ */
+.config = SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 0),
+.expect_error = "Invalid CPU topology: CPU topology parameters must "
+"be greater than zero",
+},
+};
+
static char *smp_config_to_string(const SMPConfiguration *config)
{
return g_strdup_printf(
@@ -1173,6 +1258,13 @@ static void test_full_topo(const void *opaque)
smp_parse_test(ms, , false);
}
+for (i = 0; i < ARRAY_SIZE(data_zero_topo_invalid); i++) {
+data = data_zero_topo_invalid[i];
+unsupported_params_init(mc, );
+
+smp_parse_test(ms, , false);
+}
+
object_unref(obj);
}
--
2.34.1
