From nobody Sat Feb 7 02:08:02 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=1576670867; cv=none; d=zohomail.com; s=zohoarc; b=nBHtwCSqFVKJyOrpMZdXIlUh/RYlfnuUBctshyqNrYV5DMenhXqeOBOevoEHszBn9gaDinTuzn6wHkbV5HGfrVc9ZuVIT1J7l79p9EJsDx1nLwdcbPwR+wAwfwbIOxGYNq0sV1JCDkFiG9eh9boJnTUSgvtnXAktxNQMTRHXQbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576670867; 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=lQcQ8hHYJ9b8wR89sWSdLjNQioFt95lRtiBn1TJrwfs=; b=KjewoJO3x7mpE/VxjQRzwZoCZGBTmRT4/eqk/7gdfyFzZN7yYQrmJh8Z7zcoFtVpCFHt23zBkyHqenGvU/38XFQkYf8DKc8+8gP1TGjuty5m0ZrubZkLcrVGbMk+NdMuN9j3IpdLrcv5Mn1ZwIsUOFrdB4bprmRqvZyE0N2Uno4= 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 1576670867071253.6612750216293; Wed, 18 Dec 2019 04:07:47 -0800 (PST) Received: from localhost ([::1]:53208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihY7F-0003NU-EB for importer@patchew.org; Wed, 18 Dec 2019 07:07:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihY2g-0005xO-VU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihY2f-0007tX-7b for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:02 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55116) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihY2e-0007pi-SW for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:01 -0500 Received: by mail-wm1-x332.google.com with SMTP id b19so1551179wmj.4 for ; Wed, 18 Dec 2019 04:03:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n67sm2236838wmf.46.2019.12.18.04.02.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 04:02:58 -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=lQcQ8hHYJ9b8wR89sWSdLjNQioFt95lRtiBn1TJrwfs=; b=r88j6abDZc5HEwSRSlVxzAneVWBsiD9Ng2qBsfy0cI+jEHdQsSbPgAjjqaeyk1XGs4 4MPsNAfcEOHcJySK1qcwrQ6XIuXiH4OQR9sivlWQTnXDsjC/Xgo0rJgc2jU4//32YMx/ iU94PtQFXBiwLix987+umGllMMHdbaHA3PZi/AsF3IaVjkup9pYegqxqOp3KyKa3dkRm JHgELlme/90pb5NDeGWuriz+BccQwvUsQVA+v8+DW3a9l0YZjn2QLEr31X1HGgBncGv/ BOeyKHP6/c3fJz3FD9i37ea6cIXsuP/ZdwK5Zwf9bmX14RybOWkVJ4POo1yuM4r+UMq+ p1+A== 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=lQcQ8hHYJ9b8wR89sWSdLjNQioFt95lRtiBn1TJrwfs=; b=JJP2ApxFPHihed+C6/7zRLZjJSyLc8b9JD4lYp9vi57qVHFV3uItNiRpWW5C/42now kuykLN3jn0ThGvOWdKbz/w/t97h17bRESLAgWnulY2414xneXBili4fTwAKBcnZj7M/k smdtJ0RHkuEdmI0GZ6/zOleEOCFPp5I2Tq6CvkRzEiYe98RJPn37fdOYdTtFJNeOWDSq 4YwgeDVn/yv+REaAlDGAKCGxwRlyzjKL2Hc1pCE1ckwLNKNdsD5CTBziX/vo8EvJLXJ3 2AFg04mV5KTrvq6xXMAsnpJWfNpeRhfaw0m9lWbIEnf+OKBNOmaoxuoYlz1olAoNLZX5 0RkA== X-Gm-Message-State: APjAAAU9c1IQgk9A9RDyeNkqAeYHDU1+SfB8H+mRt4oMpWBOSt1eWFYU 9DdiVv/bKb05UopuRvK7zIhCR5MF X-Google-Smtp-Source: APXvYqwjcxTglWr+KY8LYDlrpO5+04SEvgB3V5jwKl/aeNtE86MGTyWM20++8CsfD+6w9ujKjxjG9g== X-Received: by 2002:a1c:7d92:: with SMTP id y140mr2635340wmc.145.1576670579430; Wed, 18 Dec 2019 04:02:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/87] migration-test: Move -machine to common commandline Date: Wed, 18 Dec 2019 13:01:30 +0100 Message-Id: <1576670573-48048-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576670573-48048-1-git-send-email-pbonzini@redhat.com> References: <1576670573-48048-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::332 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 | 51 +++++++++++++++++++++++++++++-----------------= ---- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 0c01ed3..5a63158 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 1.8.3.1