From nobody Mon Feb 9 16:34:16 2026 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=1576634487; cv=none; d=zohomail.com; s=zohoarc; b=dEra/SmSOyuw49eHQjx3nOHS5994/fo1JhTk0T7wEKeYEKXO4Bmy3rBFQAaJB14/EPwaL0TOCPHjQ7z9MwvRizRRxYbVKEpqud3PqlC/O4MxEtJ0ejFZS0a1WqaYauMPqoVGNV2289vsaOxJa0e3g+ntwVo96xSbLzP1Ki1FAtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634487; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iRr1OF3viO0bKBaEWJ541LZGqs1yYMlaX+6gEdOJo1c=; b=a9RpxOqirmYnz7gUJjx26MvINrdU5bbp26gKckFXC6mS6sluCxUfAUKmtPYsgmdWhB/C1BBMJgb35eEmg7M0Bzxq6sqzGXK9Qy4s45bD1VQcZCoRs68RWGgwuUqHDmepURIE6BPsDWWa1KeLkxNhHDN4hXcppvCzsByorkKSCx4= 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 1576634487632341.6729613905155; Tue, 17 Dec 2019 18:01:27 -0800 (PST) Received: from localhost ([::1]:48368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOeU-0002Bp-9e for importer@patchew.org; Tue, 17 Dec 2019 21:01:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37777) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYt-0004Kt-Kr for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYr-0004Uf-G2 for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:39 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28929 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihOYq-0004Q2-8Z for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-dHE5zYfBNk-MFeWT656n_A-1; Tue, 17 Dec 2019 20:55:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5DAF800EBF for ; Wed, 18 Dec 2019 01:55:30 +0000 (UTC) Received: from secure.mitica (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B8356886F; Wed, 18 Dec 2019 01:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iRr1OF3viO0bKBaEWJ541LZGqs1yYMlaX+6gEdOJo1c=; b=UEEeY0o510p8b/Z30w4h/yv8mb61tZbf6Blknk8rJ1BpsgRUPQhTZkR50rjHZciWQpY5ZN H1xJIPFyGqeL5nEvc1lHdBa7T/7w7DGOM3Y7s6oin5Z+S6ZRMjj+RsuYuTk/10aLZEw8O3 x4s5FSbxEj99oAh6BDIjpxEU4h4MLrA= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 04/10] migration-test: Move memory size to common commandline Date: Wed, 18 Dec 2019 02:55:14 +0100 Message-Id: <20191218015520.2881-5-quintela@redhat.com> In-Reply-To: <20191218015520.2881-1-quintela@redhat.com> References: <20191218015520.2881-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: dHE5zYfBNk-MFeWT656n_A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , 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-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- tests/migration-test.c | 44 ++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 5a63158872..9d40f2d30c 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -565,6 +565,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, const char *arch =3D qtest_get_arch(); const char *machine_type; const char *machine_args; + const char *memory_size; =20 opts_src =3D opts_src ? opts_src : ""; opts_dst =3D opts_dst ? opts_dst : ""; @@ -585,15 +586,14 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, init_bootfile(bootpath, x86_bootsect, sizeof(x86_bootsect)); machine_type =3D ""; machine_args =3D ""; - extra_opts =3D use_shmem ? get_shmem_opts("150M", shmem_path) : NU= LL; - cmd_src =3D g_strdup_printf("-m 150M" - " -name source,debug-threads=3Don" + memory_size =3D "150M"; + extra_opts =3D use_shmem ? get_shmem_opts(memory_size, shmem_path)= : NULL; + cmd_src =3D g_strdup_printf(" -name source,debug-threads=3Don" " -serial file:%s/src_serial" " -drive file=3D%s,format=3Draw %s", tmpfs, bootpath, extra_opts ? extra_opts : ""); - cmd_dst =3D g_strdup_printf("-m 150M" - " -name target,debug-threads=3Don" + cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" " -serial file:%s/dest_serial" " -drive file=3D%s,format=3Draw" " -incoming %s %s", @@ -605,14 +605,13 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, init_bootfile(bootpath, s390x_elf, sizeof(s390x_elf)); machine_type =3D ""; machine_args =3D ""; - extra_opts =3D use_shmem ? get_shmem_opts("128M", shmem_path) : NU= LL; - cmd_src =3D g_strdup_printf("-m 128M" - " -name source,debug-threads=3Don" + memory_size =3D "128M"; + extra_opts =3D use_shmem ? get_shmem_opts(memory_size, shmem_path)= : NULL; + cmd_src =3D g_strdup_printf(" -name source,debug-threads=3Don" " -serial file:%s/src_serial -bios %s %s= ", tmpfs, bootpath, extra_opts ? extra_opts : ""); - cmd_dst =3D g_strdup_printf("-m 128M" - " -name target,debug-threads=3Don" + cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" " -serial file:%s/dest_serial -bios %s" " -incoming %s %s", tmpfs, bootpath, uri, @@ -622,8 +621,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, } else if (strcmp(arch, "ppc64") =3D=3D 0) { machine_type =3D ""; machine_args =3D ",vsmt=3D8"; - extra_opts =3D use_shmem ? get_shmem_opts("256M", shmem_path) : NU= LL; - cmd_src =3D g_strdup_printf("-m 256M -nodefaults" + memory_size =3D "256M"; + extra_opts =3D use_shmem ? get_shmem_opts(memory_size, shmem_path)= : NULL; + cmd_src =3D g_strdup_printf("-nodefaults" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" " -prom-env 'use-nvramrc?=3Dtrue' -prom-= env " @@ -631,8 +631,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " "until' %s", tmpfs, end_address, start_address, extra_opts ? extra_opts := ""); - cmd_dst =3D g_strdup_printf("-m 256M" - " -name target,debug-threads=3Don" + cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" " -serial file:%s/dest_serial" " -incoming %s %s", tmpfs, uri, @@ -644,14 +643,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel)); machine_type =3D "virt,"; machine_args =3D "gic-version=3Dmax"; - extra_opts =3D use_shmem ? get_shmem_opts("150M", shmem_path) : NU= LL; + memory_size =3D "150M"; + extra_opts =3D use_shmem ? get_shmem_opts(memory_size, shmem_path)= : NULL; cmd_src =3D g_strdup_printf("-name vmsource,debug-threads=3Don -cp= u max " - "-m 150M -serial file:%s/src_serial " + "-serial file:%s/src_serial " "-kernel %s %s", tmpfs, bootpath, extra_opts ? extra_opts : ""); cmd_dst =3D g_strdup_printf("-name vmdest,debug-threads=3Don -cpu = max " - "-m 150M -serial file:%s/dest_serial " + "-serial file:%s/dest_serial " "-kernel %s " "-incoming %s %s", tmpfs, bootpath, uri, @@ -674,15 +674,21 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, ignore_stderr =3D ""; } =20 - cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s %s %s %s", + cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " + "-m %s " + "%s %s %s", machine_type, machine_args, + memory_size, cmd_src, opts_src, ignore_stderr); g_free(cmd_src); *from =3D qtest_init(cmd_source); g_free(cmd_source); =20 - cmd_target =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s %s %s %s", + cmd_target =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " + "-m %s " + "%s %s %s", machine_type, machine_args, + memory_size, cmd_dst, opts_dst, ignore_stderr); g_free(cmd_dst); *to =3D qtest_init(cmd_target); --=20 2.23.0