[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/13] migration-test: simplify shmem_opts handling
From: |
Juan Quintela |
Subject: |
[PULL 05/13] migration-test: simplify shmem_opts handling |
Date: |
Mon, 2 Oct 2023 14:20:13 +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 334648ae19..46f1c275a2 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -806,9 +806,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) {
@@ -824,7 +821,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) {
@@ -844,7 +841,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.41.0
- [PULL 00/13] Migration 20231002 patches, Juan Quintela, 2023/10/02
- [PULL 01/13] migration-test: Create kvm_opts, Juan Quintela, 2023/10/02
- [PULL 02/13] migration-test: bootpath is the same for all tests and for all archs, Juan Quintela, 2023/10/02
- [PULL 04/13] migration-test: dirtylimit checks for x86_64 arch before, Juan Quintela, 2023/10/02
- [PULL 03/13] migration-test: Add bootfile_create/delete() functions, Juan Quintela, 2023/10/02
- [PULL 06/13] migration: Refactor repeated call of yank_unregister_instance, Juan Quintela, 2023/10/02
- [PULL 07/13] migration: Use qemu_file_transferred_noflush() for block migration., Juan Quintela, 2023/10/02
- [PULL 05/13] migration-test: simplify shmem_opts handling,
Juan Quintela <=
- [PULL 08/13] migration: Don't abuse qemu_file transferred for RDMA, Juan Quintela, 2023/10/02
- [PULL 09/13] migration/RDMA: It is accounting for zero/normal pages in two places, Juan Quintela, 2023/10/02
- [PULL 10/13] migration/rdma: Remove QEMUFile parameter when not used, Juan Quintela, 2023/10/02
- [PULL 11/13] migration/rdma: Don't use imaginary transfers, Juan Quintela, 2023/10/02
- [PULL 12/13] migration: Remove unused qemu_file_credit_transfer(), Juan Quintela, 2023/10/02
- [PULL 13/13] migration/rdma: Simplify the function that saves a page, Juan Quintela, 2023/10/02
- Re: [PULL 00/13] Migration 20231002 patches, Stefan Hajnoczi, 2023/10/02