[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/87] migration-test: Rename cmd_src/dst to arch_source/arch_targ
From: |
Paolo Bonzini |
Subject: |
[PULL 10/87] migration-test: Rename cmd_src/dst to arch_source/arch_target |
Date: |
Wed, 18 Dec 2019 13:01:36 +0100 |
From: Juan Quintela <address@hidden>
This explains better what they do and avoid confussino with
command_src/target.
Signed-off-by: Juan Quintela <address@hidden>
Tested-by: Cornelia Huck <address@hidden> #s390x
Tested-by: Laurent Vivier <address@hidden>
---
tests/migration-test.c | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 14f2ce3..37e9663 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -549,7 +549,7 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
bool use_shmem, const char *opts_src,
const char *opts_dst)
{
- gchar *cmd_src, *cmd_dst;
+ gchar *arch_source, *arch_target;
gchar *cmd_source, *cmd_target;
const gchar *ignore_stderr;
char *bootpath = NULL;
@@ -579,8 +579,8 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
machine_type = "";
machine_args = "";
memory_size = "150M";
- cmd_src = g_strdup_printf("-drive file=%s,format=raw", bootpath);
- cmd_dst = g_strdup(cmd_src);
+ arch_source = g_strdup_printf("-drive file=%s,format=raw", bootpath);
+ arch_target = g_strdup(arch_source);
start_address = X86_TEST_MEM_START;
end_address = X86_TEST_MEM_END;
} else if (g_str_equal(arch, "s390x")) {
@@ -588,20 +588,20 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
machine_type = "";
machine_args = "";
memory_size = "128M";
- cmd_src = g_strdup_printf("-bios %s", bootpath);
- cmd_dst = g_strdup(cmd_src);
+ arch_source = g_strdup_printf("-bios %s", bootpath);
+ arch_target = g_strdup(arch_source);
start_address = S390_TEST_MEM_START;
end_address = S390_TEST_MEM_END;
} else if (strcmp(arch, "ppc64") == 0) {
machine_type = "";
machine_args = ",vsmt=8";
memory_size = "256M";
- cmd_src = g_strdup_printf("-nodefaults "
- "-prom-env 'use-nvramrc?=true' -prom-env "
- "'nvramrc=hex .\" _\" begin %x %x "
- "do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
- "until'", end_address, start_address);
- cmd_dst = g_strdup("");
+ arch_source = g_strdup_printf("-nodefaults "
+ "-prom-env 'use-nvramrc?=true' -prom-env
"
+ "'nvramrc=hex .\" _\" begin %x %x "
+ "do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
+ "until'", end_address, start_address);
+ arch_target = g_strdup("");
start_address = PPC_TEST_MEM_START;
end_address = PPC_TEST_MEM_END;
} else if (strcmp(arch, "aarch64") == 0) {
@@ -609,10 +609,10 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
machine_type = "virt,";
machine_args = "gic-version=max";
memory_size = "150M";
- cmd_src = g_strdup_printf("-cpu max "
- "-kernel %s",
- bootpath);
- cmd_dst = g_strdup(cmd_src);
+ arch_source = g_strdup_printf("-cpu max "
+ "-kernel %s",
+ bootpath);
+ arch_target = g_strdup(arch_source);
start_address = ARM_TEST_MEM_START;
end_address = ARM_TEST_MEM_END;
@@ -647,8 +647,9 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
"%s %s %s %s",
machine_type, machine_args,
memory_size, tmpfs,
- cmd_src, shmem_opts, opts_src, ignore_stderr);
- g_free(cmd_src);
+ arch_source, shmem_opts, opts_src,
+ ignore_stderr);
+ g_free(arch_source);
*from = qtest_init(cmd_source);
g_free(cmd_source);
@@ -660,8 +661,9 @@ static int test_migrate_start(QTestState **from, QTestState
**to,
"%s %s %s %s",
machine_type, machine_args,
memory_size, tmpfs, uri,
- cmd_dst, shmem_opts, opts_dst, ignore_stderr);
- g_free(cmd_dst);
+ arch_target, shmem_opts, opts_dst,
+ ignore_stderr);
+ g_free(arch_target);
*to = qtest_init(cmd_target);
g_free(cmd_target);
--
1.8.3.1
- [PULL 12/87] memory: do not look at current_machine->accel, (continued)
- [PULL 12/87] memory: do not look at current_machine->accel, Paolo Bonzini, 2019/12/18
- [PULL 11/87] migration-test: Use a struct for test_migrate_start parameters, Paolo Bonzini, 2019/12/18
- [PULL 16/87] vl: merge -accel processing into configure_accelerators, Paolo Bonzini, 2019/12/18
- [PULL 22/87] qom: add object_new_with_class, Paolo Bonzini, 2019/12/18
- [PULL 23/87] accel: pass object to accel_init_machine, Paolo Bonzini, 2019/12/18
- [PULL 25/87] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size", Paolo Bonzini, 2019/12/18
- [PULL 31/87] object: Improve documentation of interfaces, Paolo Bonzini, 2019/12/18
- [PULL 32/87] build-sys: build vhost-user-gpu only if CONFIG_TOOLS, Paolo Bonzini, 2019/12/18
- [PULL 26/87] xen: convert "-machine igd-passthru" to an accelerator property, Paolo Bonzini, 2019/12/18
- [PULL 18/87] vl: introduce object_parse_property_opt, Paolo Bonzini, 2019/12/18
- [PULL 10/87] migration-test: Rename cmd_src/dst to arch_source/arch_target,
Paolo Bonzini <=
- [PULL 17/87] accel: compile accel/accel.c just once, Paolo Bonzini, 2019/12/18
- [PULL 19/87] vl: configure accelerators from -accel options, Paolo Bonzini, 2019/12/18
- [PULL 28/87] kvm: introduce kvm_kernel_irqchip_* functions, Paolo Bonzini, 2019/12/18
- [PULL 33/87] build-sys: do not include Windows SLIRP dependencies in $LIBS, Paolo Bonzini, 2019/12/18
- [PULL 34/87] migration: fix maybe-uninitialized warning, Paolo Bonzini, 2019/12/18
- [PULL 21/87] qom: introduce object_register_sugar_prop, Paolo Bonzini, 2019/12/18
- [PULL 20/87] vl: warn for unavailable accelerators, clarify messages, Paolo Bonzini, 2019/12/18
- [PULL 24/87] tcg: convert "-accel threads" to a QOM property, Paolo Bonzini, 2019/12/18
- [PULL 30/87] Makefile: remove unused variables, Paolo Bonzini, 2019/12/18
- [PULL 27/87] kvm: convert "-machine kvm_shadow_mem" to an accelerator property, Paolo Bonzini, 2019/12/18