From nobody Thu Nov 13 03:15:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576514560; cv=none; d=zohomail.com; s=zohoarc; b=PL/NvrXKoo4oQ+WdKj7310d+76eJk0ue+53I/llmlsBgmb+QaaGidAtTdiVfxUZwYDU4hX7XAx88K9R5bYOzSfIzOWTAD4oex9canccqcl8/2lWayywDga0utc7jBz0nAaXv06R9vMWZCHs4cnNJj2g4ZP51x/92R6cFUOSmtDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576514560; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=cNBpnObxWBVztSPS/48mA1SEs15cBP9TJArik3nLB+U=; b=g4fCgNn3SdmqCFNmnk3DM3lx7NRZP5cZdSl/q0zxAdhxlAcBPC+FdmFZMAHO3Wf0HQDJf4kdUOCQsH16k34yUzuKYpUL2FeQ7qsv0ZTbusREFQxDq7GPPDakCfXzGD6Xp0n+qX0YGAYJBFzDapJT/UT3AzylLx1yJXB3U49C2IE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576514560418959.7221935064844; Mon, 16 Dec 2019 08:42:40 -0800 (PST) Received: from localhost ([::1]:56744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtS9-0004yV-O4 for importer@patchew.org; Mon, 16 Dec 2019 11:42:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtEy-0004kn-Cb for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:29:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igtEx-00072W-1R for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:29:00 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igtEw-000716-Qv for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:28:58 -0500 Received: by mail-wm1-x32f.google.com with SMTP id p17so7413115wmb.0 for ; Mon, 16 Dec 2019 08:28:58 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q68sm19962334wme.14.2019.12.16.08.28.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 08:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cNBpnObxWBVztSPS/48mA1SEs15cBP9TJArik3nLB+U=; b=Oq0aGq9bW19PtQ1OcuJdaJQlHoYPpS+i3IJ60/IrMscJAHHZBgPPsrwUgFSJMg9OWf Fpk95fhVTZR4rkJYfgmw/N52yTszBpCJ642CEgAtRcrvpaaPpqhnkpfi6vaenHgk2rVS 0NR2zgQZS7xjEB87ty3gYDkNUh6dBg0vDMkbPu8L+rj6Qy2gXw+4xK4DD/Jt74z9Y4x/ tP7OVClOiMdwH3SXdwxaggynI+EqWiRPbmEqLmHYK1+5MY4dZ/PSRQU0PlMqMeiMDMpU 4bPHOnXoBlC4wCArPyI4d5gFUfyU0Z0qyyj0756/HU2kVTcIsFtfMCTUyiD0xXSkd96C /Z4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cNBpnObxWBVztSPS/48mA1SEs15cBP9TJArik3nLB+U=; b=gLBZWFFtXUgSFSJ0eVQihhGS0GWg90qIa0k6IFTlvixU5QLuJtTmmXiqXedM7LQqxB 8yQaDjkfHepHYMPIR3DNZhezBkiF2LF+H+u7FEnoUba9WuOj3tZVJsRdL1s4W1OcN8yX yBOltcy7PolsP0NOLUTGDyKxhtpV66f6u0EbCPVq49FfSn2sGrTBh/yNqIA/8ieyhwrM eysebi1jf0KDdEE3i0UcSbtYn0hGVDV1//bNGBjH9KTtH4kR3Ux9CruFKFIgDmY5iYHL CiUH2BCfkJ6AkI1ri3Vl+uUpEOJFAfKb9wEweuP0bBXLNC/AvynX3l82vLZU8y9wN0P2 rEpQ== X-Gm-Message-State: APjAAAWtWvQPRBwPPUVRNAgDXoxYffBRvfwu8+023Gj0BAcG86DNAPh5 1a4UfnqpZoAwze5afvo/Nwaqy52a X-Google-Smtp-Source: APXvYqy7nobk8PMef4mwNyz7lwt1sP2c6Aa6ZRGWmccFaQLstd5uePvRJU7DnH7NaE56jnKA6JNn1g== X-Received: by 2002:a1c:486:: with SMTP id 128mr32218822wme.163.1576513737600; Mon, 16 Dec 2019 08:28:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/62] migration-test: Rename cmd_src/dst to arch_source/arch_target Date: Mon, 16 Dec 2019 17:27:54 +0100 Message-Id: <1576513726-53700-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576513726-53700-1-git-send-email-pbonzini@redhat.com> References: <1576513726-53700-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Juan Quintela This explains better what they do and avoid confussino with command_src/target. Signed-off-by: Juan Quintela Tested-by: Cornelia Huck #s390x Tested-by: Laurent Vivier --- 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 5ab8cfd..6c7c416 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -549,7 +549,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **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 =3D NULL; @@ -579,8 +579,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, machine_type =3D ""; machine_args =3D ""; memory_size =3D "150M"; - cmd_src =3D g_strdup_printf("-drive file=3D%s,format=3Draw", bootp= ath); - cmd_dst =3D g_strdup(cmd_src); + arch_source =3D g_strdup_printf("-drive file=3D%s,format=3Draw", b= ootpath); + arch_target =3D g_strdup(arch_source); start_address =3D X86_TEST_MEM_START; end_address =3D X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { @@ -588,20 +588,20 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D ""; machine_args =3D ""; memory_size =3D "128M"; - cmd_src =3D g_strdup_printf("-bios %s", bootpath); - cmd_dst =3D g_strdup(cmd_src); + arch_source =3D g_strdup_printf("-bios %s", bootpath); + arch_target =3D g_strdup(arch_source); start_address =3D S390_TEST_MEM_START; end_address =3D S390_TEST_MEM_END; } else if (strcmp(arch, "ppc64") =3D=3D 0) { machine_type =3D ""; machine_args =3D ",vsmt=3D8"; memory_size =3D "256M"; - cmd_src =3D g_strdup_printf("-nodefaults " - "-prom-env 'use-nvramrc?=3Dtrue' -prom-e= nv " - "'nvramrc=3Dhex .\" _\" begin %x %x " - "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " - "until'", end_address, start_address); - cmd_dst =3D g_strdup(""); + arch_source =3D g_strdup_printf("-nodefaults " + "-prom-env 'use-nvramrc?=3Dtrue' -pr= om-env " + "'nvramrc=3Dhex .\" _\" begin %x %x " + "do i c@ 1 + i c! 1000 +loop .\" B\"= 0 " + "until'", end_address, start_address= ); + arch_target =3D g_strdup(""); start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; } else if (strcmp(arch, "aarch64") =3D=3D 0) { @@ -609,10 +609,10 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D "virt,"; machine_args =3D "gic-version=3Dmax"; memory_size =3D "150M"; - cmd_src =3D g_strdup_printf("-cpu max " - "-kernel %s", - bootpath); - cmd_dst =3D g_strdup(cmd_src); + arch_source =3D g_strdup_printf("-cpu max " + "-kernel %s", + bootpath); + arch_target =3D g_strdup(arch_source); start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; =20 @@ -647,8 +647,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "%s %s %s %s", machine_type, machine_args, memory_size, tmpfs, - cmd_src, shmem_opts, opts_src, ignore_std= err); - g_free(cmd_src); + arch_source, shmem_opts, opts_src, + ignore_stderr); + g_free(arch_source); *from =3D qtest_init(cmd_source); g_free(cmd_source); =20 @@ -660,8 +661,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "%s %s %s %s", machine_type, machine_args, memory_size, tmpfs, uri, - cmd_dst, shmem_opts, opts_dst, ignore_std= err); - g_free(cmd_dst); + arch_target, shmem_opts, opts_dst, + ignore_stderr); + g_free(arch_target); *to =3D qtest_init(cmd_target); g_free(cmd_target); =20 --=20 1.8.3.1