From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27C51C3F68F for ; Wed, 18 Dec 2019 01:58:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB3652176D for ; Wed, 18 Dec 2019 01:58:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="So8laODV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB3652176D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOc3-0007nd-Oi for qemu-devel@archiver.kernel.org; Tue, 17 Dec 2019 20:58:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37848) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYw-0004ME-Rj for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYu-0004Yg-3p for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:41 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:57594 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 1ihOYt-0004Q7-Jq for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:39 -0500 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=Hm62cqN4NPpf4LXW6QP3p1GeBGYGRCYVtLioajYRKjQ=; b=So8laODVL0c5b+KUCNHZuhq+JxXgEbINQwQNtxfUUjqwMKPTHvJ4OvUjs+gp+EdySO4Ape /KhVN0FxLyyXK0MbUGQxd/DPqNtRgF1ynlM8A1Z2rh+ZmQLEitCwARmKuOm0vXc6yZcN4e v+ouSa29HkkA7SxdMozfELZmWWmsmc4= 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-179-NzPOCwTJP3WaKsHC13evsA-1; Tue, 17 Dec 2019 20:55:30 -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 0701D800053 for ; Wed, 18 Dec 2019 01:55:29 +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 7F7ED6886F; Wed, 18 Dec 2019 01:55:27 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 03/10] migration-test: Move -machine to common commandline Date: Wed, 18 Dec 2019 02:55:13 +0100 Message-Id: <20191218015520.2881-4-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: NzPOCwTJP3WaKsHC13evsA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII 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: 207.211.31.81 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela --- tests/migration-test.c | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 0c01ed3543..5a63158872 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -563,7 +563,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, char *extra_opts =3D NULL; char *shmem_path =3D NULL; const char *arch =3D qtest_get_arch(); - const char *accel =3D "kvm:tcg"; + const char *machine_type; + const char *machine_args; =20 opts_src =3D opts_src ? opts_src : ""; opts_dst =3D opts_dst ? opts_dst : ""; @@ -582,72 +583,78 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, /* the assembled x86 boot sector should be exactly one sector larg= e */ assert(sizeof(x86_bootsect) =3D=3D 512); 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("-machine accel=3D%s -m 150M" + cmd_src =3D g_strdup_printf("-m 150M" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" " -drive file=3D%s,format=3Draw %s", - accel, tmpfs, bootpath, + tmpfs, bootpath, extra_opts ? extra_opts : ""); - cmd_dst =3D g_strdup_printf("-machine accel=3D%s -m 150M" + cmd_dst =3D g_strdup_printf("-m 150M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial" " -drive file=3D%s,format=3Draw" " -incoming %s %s", - accel, tmpfs, bootpath, uri, + tmpfs, bootpath, uri, extra_opts ? extra_opts : ""); start_address =3D X86_TEST_MEM_START; end_address =3D X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { 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("-machine accel=3D%s -m 128M" + cmd_src =3D g_strdup_printf("-m 128M" " -name source,debug-threads=3Don" " -serial file:%s/src_serial -bios %s %s= ", - accel, tmpfs, bootpath, + tmpfs, bootpath, extra_opts ? extra_opts : ""); - cmd_dst =3D g_strdup_printf("-machine accel=3D%s -m 128M" + cmd_dst =3D g_strdup_printf("-m 128M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial -bios %s" " -incoming %s %s", - accel, tmpfs, bootpath, uri, + tmpfs, bootpath, uri, extra_opts ? extra_opts : ""); 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"; extra_opts =3D use_shmem ? get_shmem_opts("256M", shmem_path) : NU= LL; - cmd_src =3D g_strdup_printf("-machine accel=3D%s,vsmt=3D8 -m 256M = -nodefaults" + cmd_src =3D g_strdup_printf("-m 256M -nodefaults" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" " -prom-env 'use-nvramrc?=3Dtrue' -prom-= env " "'nvramrc=3Dhex .\" _\" begin %x %x " "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " - "until' %s", accel, tmpfs, end_address, + "until' %s", tmpfs, end_address, start_address, extra_opts ? extra_opts := ""); - cmd_dst =3D g_strdup_printf("-machine accel=3D%s,vsmt=3D8 -m 256M" + cmd_dst =3D g_strdup_printf("-m 256M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial" " -incoming %s %s", - accel, tmpfs, uri, + tmpfs, uri, extra_opts ? extra_opts : ""); =20 start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; } else if (strcmp(arch, "aarch64") =3D=3D 0) { 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; - cmd_src =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3Dmax " - "-name vmsource,debug-threads=3Don -cpu = max " + cmd_src =3D g_strdup_printf("-name vmsource,debug-threads=3Don -cp= u max " "-m 150M -serial file:%s/src_serial " "-kernel %s %s", - accel, tmpfs, bootpath, + tmpfs, bootpath, extra_opts ? extra_opts : ""); - cmd_dst =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3Dmax " - "-name vmdest,debug-threads=3Don -cpu ma= x " + cmd_dst =3D g_strdup_printf("-name vmdest,debug-threads=3Don -cpu = max " "-m 150M -serial file:%s/dest_serial " "-kernel %s " "-incoming %s %s", - accel, tmpfs, bootpath, uri, + tmpfs, bootpath, uri, extra_opts ? extra_opts : ""); =20 start_address =3D ARM_TEST_MEM_START; @@ -667,13 +674,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, ignore_stderr =3D ""; } =20 - cmd_source =3D g_strdup_printf("%s %s %s", + cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s %s %s %s"= , + machine_type, machine_args, 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("%s %s %s", + cmd_target =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s %s %s %s"= , + machine_type, machine_args, cmd_dst, opts_dst, ignore_stderr); g_free(cmd_dst); *to =3D qtest_init(cmd_target); --=20 2.23.0