[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 07/15] tests/qtest: Adjust qom-test to always set a -cpu o
From: |
Fabiano Rosas |
Subject: |
[RFC PATCH v4 07/15] tests/qtest: Adjust qom-test to always set a -cpu option |
Date: |
Thu, 19 Jan 2023 10:54:16 -0300 |
Start using the qtest_get_machine_args function, which explicitly
sets the -cpu option according to the machine default.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/qom-test.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index d380261f8f..462e3c4281 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -78,14 +78,28 @@ static void test_properties(QTestState *qts, const char
*path, bool recurse)
qobject_unref(response);
}
+static const char *arch_get_cpu(const char *machine)
+{
+ const char *arch = qtest_get_arch();
+
+ if (g_str_equal(arch, "aarch64")) {
+ if (!strncmp(machine, "virt", 4)) {
+ return "cortex-a57";
+ }
+ }
+
+ return NULL;
+}
+
static void test_machine(gconstpointer data)
{
const char *machine = data;
+ char *args;
QDict *response;
QTestState *qts;
- qts = qtest_initf("-machine %s", machine);
-
+ args = qtest_get_machine_args(machine, arch_get_cpu(machine), NULL);
+ qts = qtest_init(args);
test_properties(qts, "/machine", true);
response = qtest_qmp(qts, "{ 'execute': 'quit' }");
@@ -94,6 +108,7 @@ static void test_machine(gconstpointer data)
qtest_quit(qts);
g_free((void *)machine);
+ g_free((void *)args);
}
static void add_machine_test_case(const char *mname)
--
2.35.3
- Re: [RFC PATCH v4 04/15] tests/qtest: arm-cpu-features: Match tests to required accelerators, (continued)
- [RFC PATCH v4 07/15] tests/qtest: Adjust qom-test to always set a -cpu option,
Fabiano Rosas <=
- [RFC PATCH v4 08/15] tests/qtest: Adjust test-hmp to always pass -cpu option, Fabiano Rosas, 2023/01/19
- [RFC PATCH v4 09/15] tests/qtest: Adjust device-introspect-test to always set a -cpu option, Fabiano Rosas, 2023/01/19
- [RFC PATCH v4 10/15] tests/qtest: aarch64: Set -cpu for numa-test, Fabiano Rosas, 2023/01/19
- [RFC PATCH v4 11/15] tests/qemu-iotests: Allow passing a -cpu option in the QEMU cmdline, Fabiano Rosas, 2023/01/19