From nobody Thu Nov 13 03:15:51 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=1576513862; cv=none; d=zohomail.com; s=zohoarc; b=ATpL5xfABTBRXCKMd/a20ZvbuM9N5DtmsVtROTYYLiheDaSbhlERqCzxZpGYTHn/VBie2TMtIqEmf81KlH5Nz9R45NlHs640i3MciZtRQ0D8TWtm5tPhiqv+zVuJ9lcFvsj+M4hnltHjM5r1KwmusdegJXqzuHbF3vzA95gsgFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576513862; 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=MigzyWj+F7hTHupvGUMkFQy7vhes1xwrq5hfxQuvvdk=; b=KzXm83f/Nb0Gn2VynEAfUG9BD9VbfHlYJve1nwf1CViY+2fjAX8JE6rYUWJQDZ77jUgq7sqhBpY65k+Lx+Qk4G76XXhyp7JNas0PyWDnoPnXT3tevISqPwb0gPUx13VKbf6f/HUymRUOTvA0vNDi+jQOXpAte25v+h65tLPaSKU= 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 1576513862380114.36310682878639; Mon, 16 Dec 2019 08:31:02 -0800 (PST) Received: from localhost ([::1]:56588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtGu-0006em-5p for importer@patchew.org; Mon, 16 Dec 2019 11:31:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56368) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtEt-0004dc-R1 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:28:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igtEs-0006tB-Gj for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:28:55 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33131) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igtEs-0006rA-8p for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:28:54 -0500 Received: by mail-wr1-x435.google.com with SMTP id b6so8070091wrq.0 for ; Mon, 16 Dec 2019 08:28:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q68sm19962334wme.14.2019.12.16.08.28.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 08:28:52 -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=MigzyWj+F7hTHupvGUMkFQy7vhes1xwrq5hfxQuvvdk=; b=tRCNwmqec1PksABPpXFhpmRzE6dkX0FHy9s1IfcFQyGmRI7z9XoJhTKMkPy+Fl/BTA 6gMolq6VOb4AV54un0fJ0w8BkbJFL8ME6M8D+6VQ/AmQBPV7r/xZg65/UT6iLg8ao2+x SR7syR9f/Rs52ih5RJaY56EYFYeU+DwDxIOlZpjFSUcqXc3c4kIHhQTgmreXiqfDbyT1 ZOw7veq0c2C2B5F1J+MS+NeacGa5ZCPbbng0MnfvRlupE43pjE7goQjcJbm/Hw4RwMhS 5UWDGwyXgYsuodz5164oPmlTDGsBAWSTLuYLWf/zuL4pHzGRVXT88wyfeENRwlmBqJjN i9fw== 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=MigzyWj+F7hTHupvGUMkFQy7vhes1xwrq5hfxQuvvdk=; b=ouMJlOj078CxhOcKW0Vk+JQesitE2c8m59aQWdbFyGs+pscc6MIr/QRZOdZAJ0iVhb LdZ/h0ZOHjYeNj2FMuujh2E+ohgl/cAz9FJP7B6RbA/W++sF2C8k+NzG35TtyKvSessF dBbUQ0ApTwckIZmPvAm3kF0j6619MOWLIJib5mZQuktssA1rdzjdzxLrk1qINCiQ6/CV AAl1/6BQwEoP4VJs1PWjmbxyAyeR/sgvfeNRHcxRuWZ4QGzXx78tdWmwhJ9byt4kQuBJ 1CkPWw1cZVVXkqu8mxSwJ3I2F4aegV4JWlAJX+XZ6ocKvKPSLIj2PmS+c2Zf+wuV72z1 r0cA== X-Gm-Message-State: APjAAAW08uRuFibn3DwpX2UiWoT4R/NLi4ktVFSQXUNW0RPs12ApgjFE gL4XWS+idhHY1v8TJPI6Vk4cgrky X-Google-Smtp-Source: APXvYqxu4W6COsEZb1Nue9k3E46pUFCYfa+sbPSxVfP0mkR5PtpQhurI4ELDMc7JnCsWO2oIVJ/2pQ== X-Received: by 2002:a5d:4044:: with SMTP id w4mr31114588wrp.322.1576513732953; Mon, 16 Dec 2019 08:28:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/62] migration-test: Move memory size to common commandline Date: Mon, 16 Dec 2019 17:27:49 +0100 Message-Id: <1576513726-53700-6-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::435 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 Signed-off-by: Juan Quintela Tested-by: Cornelia Huck #s390x Tested-by: Laurent Vivier --- 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 39203f6..18857f0 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 1.8.3.1