[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/30] migration-test: machine_opts is really arch specific
From: |
Juan Quintela |
Subject: |
[PULL 14/30] migration-test: machine_opts is really arch specific |
Date: |
Thu, 22 Jun 2023 04:13:04 +0200 |
And it needs to be in both source and target, so put it on arch_opts.
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-7-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-test.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 4d8542f5c7..fc3337b7bb 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -609,7 +609,6 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
g_autofree char *shmem_opts = NULL;
g_autofree char *shmem_path = NULL;
const char *arch = qtest_get_arch();
- const char *machine_opts = NULL;
const char *memory_size;
if (args->use_shmem) {
@@ -637,7 +636,6 @@ 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 = "-machine vsmt=8";
memory_size = "256M";
start_address = PPC_TEST_MEM_START;
end_address = PPC_TEST_MEM_END;
@@ -645,12 +643,12 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
"'nvramrc=hex .\" _\" begin %x %x "
"do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
"until'", end_address, start_address);
- arch_opts = g_strdup("-nodefaults");
+ arch_opts = g_strdup("-nodefaults -machine vsmt=8");
} else if (strcmp(arch, "aarch64") == 0) {
init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel));
- machine_opts = "-machine virt,gic-version=max";
memory_size = "150M";
- arch_opts = g_strdup_printf("-cpu max -kernel %s", bootpath);
+ arch_opts = g_strdup_printf("-machine virt,gic-version=max -cpu max "
+ "-kernel %s", bootpath);
start_address = ARM_TEST_MEM_START;
end_address = ARM_TEST_MEM_END;
@@ -685,14 +683,13 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
shmem_opts = g_strdup("");
}
- cmd_source = g_strdup_printf("-accel kvm%s -accel tcg %s "
+ cmd_source = g_strdup_printf("-accel kvm%s -accel tcg "
"-name source,debug-threads=on "
"-m %s "
"-serial file:%s/src_serial "
"%s %s %s %s %s",
args->use_dirty_ring ?
",dirty-ring-size=4096" : "",
- machine_opts ? machine_opts : "",
memory_size, tmpfs,
arch_opts ? arch_opts : "",
arch_source ? arch_source : "",
@@ -706,7 +703,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
&got_src_stop);
}
- cmd_target = g_strdup_printf("-accel kvm%s -accel tcg %s "
+ cmd_target = g_strdup_printf("-accel kvm%s -accel tcg "
"-name target,debug-threads=on "
"-m %s "
"-serial file:%s/dest_serial "
@@ -714,7 +711,6 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
"%s %s %s %s %s",
args->use_dirty_ring ?
",dirty-ring-size=4096" : "",
- machine_opts ? machine_opts : "",
memory_size, tmpfs, uri,
arch_opts ? arch_opts : "",
arch_target ? arch_target : "",
--
2.40.1
- [PULL 04/30] qapi/migration: Introduce x-vcpu-dirty-limit-period parameter, (continued)
- [PULL 04/30] qapi/migration: Introduce x-vcpu-dirty-limit-period parameter, Juan Quintela, 2023/06/21
- [PULL 03/30] softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit", Juan Quintela, 2023/06/21
- [PULL 06/30] migration: Introduce dirty-limit capability, Juan Quintela, 2023/06/21
- [PULL 05/30] qapi/migration: Introduce vcpu-dirty-limit parameters, Juan Quintela, 2023/06/21
- [PULL 07/30] migration: Refactor auto-converge capability logic, Juan Quintela, 2023/06/21
- [PULL 08/30] migration: Put the detection logic before auto-converge checking, Juan Quintela, 2023/06/21
- [PULL 09/30] migration: Implement dirty-limit convergence algo, Juan Quintela, 2023/06/21
- [PULL 11/30] migration-test: Be consistent for ppc, Juan Quintela, 2023/06/21
- [PULL 12/30] migration-test: Make machine_opts regular with other options, Juan Quintela, 2023/06/21
- [PULL 13/30] migration-test: Create arch_opts, Juan Quintela, 2023/06/21
- [PULL 14/30] migration-test: machine_opts is really arch specific,
Juan Quintela <=
- [PULL 10/30] migration: Extend query-migrate to provide dirty page limit info, Juan Quintela, 2023/06/21
- [PULL 18/30] migration-test: dirtylimit checks for x86_64 arch before, Juan Quintela, 2023/06/21
- [PULL 15/30] migration-test: Create kvm_opts, Juan Quintela, 2023/06/21
- [PULL 17/30] migration-test: Add bootfile_create/delete() functions, Juan Quintela, 2023/06/21
- [PULL 16/30] migration-test: bootpath is the same for all tests and for all archs, Juan Quintela, 2023/06/21
- [PULL 23/30] qtest/migration-tests.c: use "-incoming defer" for postcopy tests, Juan Quintela, 2023/06/21
- [PULL 24/30] qemu-file: Rename qemu_file_transferred_ fast -> noflush, Juan Quintela, 2023/06/21
- [PULL 26/30] migration: Use qemu_file_transferred_noflush() for block migration., Juan Quintela, 2023/06/21
- [PULL 25/30] migration: Change qemu_file_transferred to noflush, Juan Quintela, 2023/06/21
- [PULL 20/30] migration: Update error description whenever migration fails, Juan Quintela, 2023/06/21