[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/42] migration-test: Make machine_opts regular with other optio
From: |
Juan Quintela |
Subject: |
[PATCH 04/42] migration-test: Make machine_opts regular with other options |
Date: |
Fri, 9 Jun 2023 00:49:05 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-test.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 95ccc9bce7..2490035569 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -637,7 +637,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
start_address = S390_TEST_MEM_START;
end_address = S390_TEST_MEM_END;
} else if (strcmp(arch, "ppc64") == 0) {
- machine_opts = "vsmt=8";
+ machine_opts = "-machine vsmt=8";
memory_size = "256M";
start_address = PPC_TEST_MEM_START;
end_address = PPC_TEST_MEM_END;
@@ -649,7 +649,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
arch_target = g_strdup("-nodefaults");
} else if (strcmp(arch, "aarch64") == 0) {
init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel));
- machine_opts = "virt,gic-version=max";
+ machine_opts = "-machine virt,gic-version=max";
memory_size = "150M";
arch_source = g_strdup_printf("-cpu max "
"-kernel %s",
@@ -683,14 +683,13 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
memory_size, shmem_path);
}
- cmd_source = g_strdup_printf("-accel kvm%s -accel tcg%s%s "
+ cmd_source = g_strdup_printf("-accel kvm%s -accel tcg %s "
"-name source,debug-threads=on "
"-m %s "
"-serial file:%s/src_serial "
"%s %s %s %s",
args->use_dirty_ring ?
",dirty-ring-size=4096" : "",
- machine_opts ? " -machine " : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs,
arch_source,
@@ -705,7 +704,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
&got_src_stop);
}
- cmd_target = g_strdup_printf("-accel kvm%s -accel tcg%s%s "
+ cmd_target = g_strdup_printf("-accel kvm%s -accel tcg %s "
"-name target,debug-threads=on "
"-m %s "
"-serial file:%s/dest_serial "
@@ -713,7 +712,6 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
"%s %s %s %s",
args->use_dirty_ring ?
",dirty-ring-size=4096" : "",
- machine_opts ? " -machine " : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs, uri,
arch_target,
--
2.40.1
- Re: [PATCH 01/42] migration-test: Be consistent for ppc, (continued)
[PATCH 02/42] migration-test: Make ignore_stderr regular with other options, Juan Quintela, 2023/06/08
[PATCH 03/42] migration-test: simplify shmem_opts handling, Juan Quintela, 2023/06/08
[PATCH 04/42] migration-test: Make machine_opts regular with other options,
Juan Quintela <=
[PATCH 05/42] migration-test: Create arch_opts, Juan Quintela, 2023/06/08
[PATCH 06/42] migration-test: machine_opts is really arch specific, Juan Quintela, 2023/06/08
[PATCH 08/42] migration-test: bootpath is the same for all tests and for all archs, Juan Quintela, 2023/06/08
[PATCH 07/42] migration-test: Create kvm_opts, Juan Quintela, 2023/06/08
[PATCH 09/42] migration-test: Add bootfile_create/delete() functions, Juan Quintela, 2023/06/08