[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/30] migration-test: simplify shmem_opts handling
From: |
Juan Quintela |
Subject: |
[PULL 19/30] migration-test: simplify shmem_opts handling |
Date: |
Thu, 22 Jun 2023 04:13:09 +0200 |
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-4-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-test.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index fbe9db23cf..e3e7d54216 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -704,9 +704,6 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
"-object memory-backend-file,id=mem0,size=%s"
",mem-path=%s,share=on -numa node,memdev=mem0",
memory_size, shmem_path);
- } else {
- shmem_path = NULL;
- shmem_opts = g_strdup("");
}
if (args->use_dirty_ring) {
@@ -722,7 +719,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
memory_size, tmpfs,
arch_opts ? arch_opts : "",
arch_source ? arch_source : "",
- shmem_opts,
+ shmem_opts ? shmem_opts : "",
args->opts_source ? args->opts_source : "",
ignore_stderr);
if (!args->only_target) {
@@ -742,7 +739,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
memory_size, tmpfs, uri,
arch_opts ? arch_opts : "",
arch_target ? arch_target : "",
- shmem_opts,
+ shmem_opts ? shmem_opts : "",
args->opts_target ? args->opts_target : "",
ignore_stderr);
*to = qtest_init(cmd_target);
--
2.40.1
- [PULL 08/30] migration: Put the detection logic before auto-converge checking, (continued)
- [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 12/30] migration-test: Make machine_opts regular with other options, Juan Quintela, 2023/06/21
- [PULL 11/30] migration-test: Be consistent for ppc, 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, 2023/06/21
- [PULL 18/30] migration-test: dirtylimit checks for x86_64 arch before, Juan Quintela, 2023/06/21
- [PULL 10/30] migration: Extend query-migrate to provide dirty page limit info, Juan Quintela, 2023/06/21
- [PULL 17/30] migration-test: Add bootfile_create/delete() functions, Juan Quintela, 2023/06/21
- [PULL 21/30] migration: Refactor repeated call of yank_unregister_instance, Juan Quintela, 2023/06/21
- [PULL 19/30] migration-test: simplify shmem_opts handling,
Juan Quintela <=
- [PULL 23/30] qtest/migration-tests.c: use "-incoming defer" for postcopy tests, Juan Quintela, 2023/06/21
- [PULL 15/30] migration-test: Create kvm_opts, Juan Quintela, 2023/06/21
- [PULL 20/30] migration: Update error description whenever migration fails, 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 25/30] migration: Change qemu_file_transferred to noflush, Juan Quintela, 2023/06/21
- [PULL 22/30] migration: enforce multifd and postcopy preempt to be set before incoming, 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 28/30] qemu-file: Simplify qemu_file_shutdown(), Juan Quintela, 2023/06/21