From nobody Sun May 5 03:15:10 2024 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=1576634344; cv=none; d=zohomail.com; s=zohoarc; b=k8AJxldh8vXqY4/B85OZNkZyb/uyBIhnHOFti+t5JaUF20vrOfhxPAjQACqpoUFlmXKVfe1rYKNUJtwN0qulR5F3M0xc+DLx2QxEFuPDzL3ienW5SQ0Xdj4NKDcR1K50LZyxovW0fnZHgYBkwuuIaVpDlaBZcjwZGHgA6BE1UjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634344; 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=Lo7GWUpYAcwYLrIEiFnQDNl5FmvOUFedWC0glNYqyuo=; b=iG0i5TF1bNtGyc6n0ide5ZNtgdRnFrOOEiY95V+i15xs8ivNjujqXzX5EZAdVnbt3k3PHhst0o3ckdxhqG+U9N8UcvYu0TfzMSWXXE1dlFDSnmlJXDT0QMsCG7zcia6ly2PJn9ABjZEUSspM+W251YE/DY79l1xRTX+mo5+C0qg= 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 1576634344915571.5088952931329; Tue, 17 Dec 2019 17:59:04 -0800 (PST) Received: from localhost ([::1]:48330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOcA-0007se-JS for importer@patchew.org; Tue, 17 Dec 2019 20:59:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37702) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYq-0004IB-Kd for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYk-0004Nr-R8 for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:34 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37551 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 1ihOYk-0004MJ-G8 for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:30 -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-324-C_9dmOrONz-SxqKOx3gnSA-1; Tue, 17 Dec 2019 20:55:26 -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 4DDD8593A2 for ; Wed, 18 Dec 2019 01:55:25 +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 C5FAA6886F; Wed, 18 Dec 2019 01:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634129; 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=Lo7GWUpYAcwYLrIEiFnQDNl5FmvOUFedWC0glNYqyuo=; b=NKUm43ryP7A6KwQgkpod/98mcqNG/XFi5Bh/3qyAxJ/Xz6iuxwj/EQyveQFGR4N4Tm8yHJ CYmO5HoLEvKpoYrNGeWsoYJEGZIbWkLSugJ5/D0FHAzQMf1In/8/Bk9hDdc1Dv6Ft+jEnN jdEu2LdXhMlGGIVZxtKgrQpBTaXBYyU= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 01/10] migration-test: Create cmd_soure and cmd_target Date: Wed, 18 Dec 2019 02:55:11 +0100 Message-Id: <20191218015520.2881-2-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: C_9dmOrONz-SxqKOx3gnSA-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" We are repeating almost everything for each machine while creating the command line for migration. And once for source and another for destination. We start putting there opts_src and opts_dst. 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 a5343fdc66..fbddcf2317 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -557,6 +557,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, const char *opts_dst) { gchar *cmd_src, *cmd_dst; + gchar *cmd_source, *cmd_target; char *bootpath =3D NULL; char *extra_opts =3D NULL; char *shmem_path =3D NULL; @@ -584,16 +585,16 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, cmd_src =3D g_strdup_printf("-machine accel=3D%s -m 150M" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" - " -drive file=3D%s,format=3Draw %s %s", + " -drive file=3D%s,format=3Draw %s", accel, tmpfs, bootpath, - extra_opts ? extra_opts : "", opts_src); + extra_opts ? extra_opts : ""); cmd_dst =3D g_strdup_printf("-machine accel=3D%s -m 150M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial" " -drive file=3D%s,format=3Draw" - " -incoming %s %s %s", + " -incoming %s %s", accel, tmpfs, bootpath, uri, - extra_opts ? extra_opts : "", opts_dst); + 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")) { @@ -601,15 +602,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, 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" " -name source,debug-threads=3Don" - " -serial file:%s/src_serial -bios %s %s= %s", + " -serial file:%s/src_serial -bios %s %s= ", accel, tmpfs, bootpath, - extra_opts ? extra_opts : "", opts_src); + extra_opts ? extra_opts : ""); cmd_dst =3D g_strdup_printf("-machine accel=3D%s -m 128M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial -bios %s" - " -incoming %s %s %s", + " -incoming %s %s", accel, tmpfs, bootpath, uri, - extra_opts ? extra_opts : "", opts_dst); + 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) { @@ -620,15 +621,14 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, " -prom-env 'use-nvramrc?=3Dtrue' -prom-= env " "'nvramrc=3Dhex .\" _\" begin %x %x " "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " - "until' %s %s", accel, tmpfs, end_addre= ss, - start_address, extra_opts ? extra_opts := "", - opts_src); + "until' %s", accel, tmpfs, end_address, + start_address, extra_opts ? extra_opts := ""); cmd_dst =3D g_strdup_printf("-machine accel=3D%s,vsmt=3D8 -m 256M" " -name target,debug-threads=3Don" " -serial file:%s/dest_serial" - " -incoming %s %s %s", + " -incoming %s %s", accel, tmpfs, uri, - extra_opts ? extra_opts : "", opts_dst); + extra_opts ? extra_opts : ""); =20 start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; @@ -638,16 +638,16 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, cmd_src =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3Dmax " "-name vmsource,debug-threads=3Don -cpu = max " "-m 150M -serial file:%s/src_serial " - "-kernel %s %s %s", + "-kernel %s %s", accel, tmpfs, bootpath, - extra_opts ? extra_opts : "", opts_src); + 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 " "-m 150M -serial file:%s/dest_serial " "-kernel %s " - "-incoming %s %s %s", + "-incoming %s %s", accel, tmpfs, bootpath, uri, - extra_opts ? extra_opts : "", opts_dst); + extra_opts ? extra_opts : ""); =20 start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; @@ -671,11 +671,17 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, cmd_dst =3D tmp; } =20 - *from =3D qtest_init(cmd_src); + cmd_source =3D g_strdup_printf("%s %s", + cmd_src, opts_src); g_free(cmd_src); + *from =3D qtest_init(cmd_source); + g_free(cmd_source); =20 - *to =3D qtest_init(cmd_dst); + cmd_target =3D g_strdup_printf("%s %s", + cmd_dst, opts_dst); g_free(cmd_dst); + *to =3D qtest_init(cmd_target); + g_free(cmd_target); =20 /* * Remove shmem file immediately to avoid memory leak in test failed c= ase. --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634341; cv=none; d=zohomail.com; s=zohoarc; b=ljh9Ir6PNTT+ZtaRYCX91wPXvXvrBqHnQO7cHzG5d567+1PH+1U+6r/MDbmBRSCwku4HgMpVaDb+MPADzFcNoBY0A/Q3sYG+oFvuPBElc+O/afvhwLbLYkyrCjqeLQsHxVGZ5n8RmXo8lyTRXJkx2R8UXH+NTiYOpKJkRvMd0Cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634341; 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=JaJkhFzBArY8+EsrXFkM+QhRRHH3GsgF1quiQaWN238=; b=bKdrh9PvikmjcjoIozAu0XapNB0BaRXSVq2rxFTwRcPy7vi0SPB9u5tYy5t433k1p1r6QctUD5Rq+4FIusEf6Zin97bwx2jwns8eOV4Yp/e9Nhd9xQeCkSiaPhNDL8HLE+hXImW/oMua2SP7mGzy5CTg1g0CKhEFOp7OzeInQRg= 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 1576634341240374.58459751207647; Tue, 17 Dec 2019 17:59:01 -0800 (PST) Received: from localhost ([::1]:48326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOc7-0007n0-Js for importer@patchew.org; Tue, 17 Dec 2019 20:58:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37774) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYt-0004Kr-Ki 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-0004Ug-G3 for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:38 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:22435 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-0004OQ-Hy 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-375-zSk25dY6M7KlwwjGJMgGTA-1; Tue, 17 Dec 2019 20:55:28 -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 2A03518C35A1 for ; Wed, 18 Dec 2019 01:55:27 +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 A2E836886F; Wed, 18 Dec 2019 01:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634131; 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=JaJkhFzBArY8+EsrXFkM+QhRRHH3GsgF1quiQaWN238=; b=ZhWzhvVrjZQwIkJVtNPgClxbGTGi/qo+Vc1+mV3uhoqNYoULTJcIQDonBEkzNifJJfl6pr QaIc7F7y3gx4MBMUW5VU/bSXVH/6nNOrsSowfsRPLbXdFtpH7l9C1tqQU0Ff+bNgTGs0We XtnbQJ/GPlzSWbBQrOjfbNL3IBvuVqU= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 02/10] migration-test: Move hide_stderr to common commandline Date: Wed, 18 Dec 2019 02:55:12 +0100 Message-Id: <20191218015520.2881-3-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: zSk25dY6M7KlwwjGJMgGTA-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: 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+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 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index fbddcf2317..0c01ed3543 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -558,6 +558,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, { gchar *cmd_src, *cmd_dst; gchar *cmd_source, *cmd_target; + const gchar *ignore_stderr; char *bootpath =3D NULL; char *extra_opts =3D NULL; char *shmem_path =3D NULL; @@ -661,24 +662,19 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, g_free(extra_opts); =20 if (hide_stderr) { - gchar *tmp; - tmp =3D g_strdup_printf("%s 2>/dev/null", cmd_src); - g_free(cmd_src); - cmd_src =3D tmp; - - tmp =3D g_strdup_printf("%s 2>/dev/null", cmd_dst); - g_free(cmd_dst); - cmd_dst =3D tmp; + ignore_stderr =3D "2>/dev/null"; + } else { + ignore_stderr =3D ""; } =20 - cmd_source =3D g_strdup_printf("%s %s", - cmd_src, opts_src); + cmd_source =3D g_strdup_printf("%s %s %s", + 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", - cmd_dst, opts_dst); + cmd_target =3D g_strdup_printf("%s %s %s", + cmd_dst, opts_dst, ignore_stderr); g_free(cmd_dst); *to =3D qtest_init(cmd_target); g_free(cmd_target); --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634341; cv=none; d=zohomail.com; s=zohoarc; b=dOdEBCxRSZmwDhiPv8ZL2ZE1LMKAEJ6zU05KIx5jloO05a62CXQSIWMWM4lKvUYF/E+ak/T6w37mlvuzDWqAMsGQKp1vPWj0TxjOOu7OLezraTw/ZMjwiqyJtXJ3qA+MpK8RPpkfbMfglS84CMs7Kmc4uXe7Ywv3AOVVcHDZ8FI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634341; 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=Hm62cqN4NPpf4LXW6QP3p1GeBGYGRCYVtLioajYRKjQ=; b=mToKPATBi5PXf7rMWyamZ9VeevG7jqbNnhxv0ONXqW+9mVxDEihsFZOYwZ5Ke3aNLDTzsnsE9GHhFQ/Y+KfuEkutL5/uEILq/4S8s7aP3QpSVMSTa0FJ4J6GpXTTN4w7d1SYg2Ue6Pf8ARb3JTMizT+eeMKLH7TZhoZ5BKCpAmc= 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 1576634341265437.58772401482827; Tue, 17 Dec 2019 17:59:01 -0800 (PST) Received: from localhost ([::1]:48328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOc7-0007nd-RH for importer@patchew.org; Tue, 17 Dec 2019 20:58:59 -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 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) 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= 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-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+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 | 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 From nobody Sun May 5 03:15:10 2024 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 From nobody Sun May 5 03:15:10 2024 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=1576634227; cv=none; d=zohomail.com; s=zohoarc; b=oK5KcDArRNEKyDCuFucvUB4vJucBnFJHRtd4orEHTec6zoR3F5HodUJATGz5uMHigaEiJhb0G3xghgPplLZw8lhLImsb2NaOpoL8TYiAe9s/YBDPvee6ABqgIrx0daqsA/nx9k2PKdj6u69Ch6UXUGZJEMM8mtJBN8l3xfBNywg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634227; 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=e6M9ZYPAd5b2ngSaOUhCXNlAyhIB+hjXtewLr2+i5ak=; b=JN+b5kBzDDwW8JG0cM6agWY234S5TicbXFAUoGucXtkpTdPbUmOfvyP7iHgiejPZL0WLs82Vvd3vZPDrAfYYNWGdXxIciOlOa5NL/YRxfkTBRXx95P8dRmn0orZB/7KBD+yUsXJ/nirhOKWa6MuMAfamXGL/MeVIJO8INJPco8I= 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 1576634227294230.95299585753742; Tue, 17 Dec 2019 17:57:07 -0800 (PST) Received: from localhost ([::1]:48314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOaF-0005Yy-4q for importer@patchew.org; Tue, 17 Dec 2019 20:57:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37792) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYu-0004LT-4c for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYs-0004Wp-Jo for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:39 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46267 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-0004S2-Nn for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:37 -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-78-jo5znXNnOqOpIv_3G8o1nQ-1; Tue, 17 Dec 2019 20:55:33 -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 B399010054E3 for ; Wed, 18 Dec 2019 01:55:32 +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 3823868880; Wed, 18 Dec 2019 01:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634135; 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=e6M9ZYPAd5b2ngSaOUhCXNlAyhIB+hjXtewLr2+i5ak=; b=eT1E18MMpDROPIptFxXs1UuidY2izr4Pxh1H5atvVxvQbYSfZ3vVUegK8ZpLz7b+FFGWQY hjxdULtsggyac6Gj8AS0lFUIF/luv23cBT7RaXAUnugNGzfZCi/Hn+9dur3dbMWuaGARv/ 1FMnBpx6JH3JVPbglM1Bt4TUGqXmxoQ= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 05/10] migration-test: Move shmem handling to common commandline Date: Wed, 18 Dec 2019 02:55:15 +0100 Message-Id: <20191218015520.2881-6-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: jo5znXNnOqOpIv_3G8o1nQ-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 | 76 +++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 9d40f2d30c..e17d432043 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -380,13 +380,6 @@ static void cleanup(const char *filename) g_free(path); } =20 -static char *get_shmem_opts(const char *mem_size, const char *shmem_path) -{ - return g_strdup_printf("-object memory-backend-file,id=3Dmem0,size=3D%= s" - ",mem-path=3D%s,share=3Don -numa node,memdev=3D= mem0", - mem_size, shmem_path); -} - static char *SocketAddress_to_str(SocketAddress *addr) { switch (addr->type) { @@ -560,8 +553,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, gchar *cmd_source, *cmd_target; const gchar *ignore_stderr; char *bootpath =3D NULL; - char *extra_opts =3D NULL; - char *shmem_path =3D NULL; + char *shmem_opts; + char *shmem_path; const char *arch =3D qtest_get_arch(); const char *machine_type; const char *machine_args; @@ -575,7 +568,6 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, g_test_skip("/dev/shm is not supported"); return -1; } - shmem_path =3D g_strdup_printf("/dev/shm/qemu-%d", getpid()); } =20 got_stop =3D false; @@ -587,18 +579,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D ""; machine_args =3D ""; 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 : ""); + " -drive file=3D%s,format=3Draw", + tmpfs, bootpath); 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", - tmpfs, bootpath, uri, - extra_opts ? extra_opts : ""); + " -incoming %s", + tmpfs, bootpath, uri); start_address =3D X86_TEST_MEM_START; end_address =3D X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { @@ -606,36 +595,31 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D ""; machine_args =3D ""; 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 : ""); + " -serial file:%s/src_serial -bios %s", + tmpfs, bootpath); cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" " -serial file:%s/dest_serial -bios %s" - " -incoming %s %s", - tmpfs, bootpath, uri, - extra_opts ? extra_opts : ""); + " -incoming %s", + tmpfs, bootpath, uri); 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"; - 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 " "'nvramrc=3Dhex .\" _\" begin %x %x " "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " - "until' %s", tmpfs, end_address, - start_address, extra_opts ? extra_opts := ""); + "until'", tmpfs, end_address, + start_address); cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" " -serial file:%s/dest_serial" - " -incoming %s %s", - tmpfs, uri, - extra_opts ? extra_opts : ""); + " -incoming %s", + tmpfs, uri); =20 start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; @@ -644,18 +628,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D "virt,"; machine_args =3D "gic-version=3Dmax"; 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 " "-serial file:%s/src_serial " - "-kernel %s %s", - tmpfs, bootpath, - extra_opts ? extra_opts : ""); + "-kernel %s", + tmpfs, bootpath); cmd_dst =3D g_strdup_printf("-name vmdest,debug-threads=3Don -cpu = max " "-serial file:%s/dest_serial " "-kernel %s " - "-incoming %s %s", - tmpfs, bootpath, uri, - extra_opts ? extra_opts : ""); + "-incoming %s", + tmpfs, bootpath, uri); =20 start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; @@ -666,7 +647,6 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, } =20 g_free(bootpath); - g_free(extra_opts); =20 if (hide_stderr) { ignore_stderr =3D "2>/dev/null"; @@ -674,26 +654,38 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, ignore_stderr =3D ""; } =20 + if (use_shmem) { + shmem_path =3D g_strdup_printf("/dev/shm/qemu-%d", getpid()); + shmem_opts =3D g_strdup_printf( + "-object memory-backend-file,id=3Dmem0,size=3D%s" + ",mem-path=3D%s,share=3Don -numa node,memdev=3Dmem0", + memory_size, shmem_path); + } else { + shmem_path =3D NULL; + shmem_opts =3D g_strdup(""); + } + cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " "-m %s " - "%s %s %s", + "%s %s %s %s", machine_type, machine_args, memory_size, - cmd_src, opts_src, ignore_stderr); + cmd_src, shmem_opts, opts_src, ignore_std= err); 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 " "-m %s " - "%s %s %s", + "%s %s %s %s", machine_type, machine_args, memory_size, - cmd_dst, opts_dst, ignore_stderr); + cmd_dst, shmem_opts, opts_dst, ignore_std= err); g_free(cmd_dst); *to =3D qtest_init(cmd_target); g_free(cmd_target); =20 + g_free(shmem_opts); /* * Remove shmem file immediately to avoid memory leak in test failed c= ase. * It's valid becase QEMU has already opened this file --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634482; cv=none; d=zohomail.com; s=zohoarc; b=BY1heUXkWxc55az9Np5zEwMfJEFBknY3Do2iU4JyAvCOFZPAZKFnOONKdNIGPJiV9N1LPsXKQkEbR+LAAKXQ2RqmJ9Gjuz4xjnYykIIRAJbA0qr0+ZqgPwyWllFDL//F2AbHnbsq8kHM/HpqtoJ1IAZtcJVQvUBNprDNshd3oU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634482; 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=IeTpPmgFpLTKpiUnhRgXZ+ahUwqDaincfVzgkSxVl5Q=; b=B0SXpx7Vku95zzCkUJGl6dR4edoVnW5JkWX1FjI8BtXddpWvo6pI7baUkx7tabPMQ8URH9RhD06qAEwARUEGaYxnLaGTl50H5QGyY7fc80U7HWEDpv+4VemOFfSj8QTPWcvF7lt4PItf1yIESBF+Estn/pRGda+KSbj1HnyM+YU= 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 1576634482896709.4251188251804; Tue, 17 Dec 2019 18:01:22 -0800 (PST) Received: from localhost ([::1]:48366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOeP-00028Q-9d for importer@patchew.org; Tue, 17 Dec 2019 21:01:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYw-0004MD-RN for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYu-0004Yo-4W for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:41 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:48389 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-0004Tj-Os for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:40 -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-134-O8_i_BQANZqIXf-YXy03gg-1; Tue, 17 Dec 2019 20:55:35 -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 8ECA7800D48 for ; Wed, 18 Dec 2019 01:55:34 +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 142E068880; Wed, 18 Dec 2019 01:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634136; 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=IeTpPmgFpLTKpiUnhRgXZ+ahUwqDaincfVzgkSxVl5Q=; b=XAr7wo1fpU9r7pR6m+23y8zKRyVpB45/zf6hymK9D4IrhjHjN/Hg2gVu2zEvestqPIr0pA q6j7tas79VPUqI96fLO+O7O86cxaSncu+ajCGGHhZrOhTzle8p9wxgHM/2KWtiPF3unZkO 7cTCCYUVmHS/cDCD+PhkewNgixRHkG4= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 06/10] migration-test: Move -name handling to common commandline Date: Wed, 18 Dec 2019 02:55:16 +0100 Message-Id: <20191218015520.2881-7-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: O8_i_BQANZqIXf-YXy03gg-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 | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index e17d432043..6e828fbc6c 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -579,12 +579,10 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D ""; machine_args =3D ""; memory_size =3D "150M"; - cmd_src =3D g_strdup_printf(" -name source,debug-threads=3Don" - " -serial file:%s/src_serial" + cmd_src =3D g_strdup_printf(" -serial file:%s/src_serial" " -drive file=3D%s,format=3Draw", tmpfs, bootpath); - cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" - " -serial file:%s/dest_serial" + cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial" " -drive file=3D%s,format=3Draw" " -incoming %s", tmpfs, bootpath, uri); @@ -595,11 +593,9 @@ static int test_migrate_start(QTestState **from, QTest= State **to, machine_type =3D ""; machine_args =3D ""; memory_size =3D "128M"; - cmd_src =3D g_strdup_printf(" -name source,debug-threads=3Don" - " -serial file:%s/src_serial -bios %s", + cmd_src =3D g_strdup_printf(" -serial file:%s/src_serial -bios %s", tmpfs, bootpath); - cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" - " -serial file:%s/dest_serial -bios %s" + cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial -bios %s" " -incoming %s", tmpfs, bootpath, uri); start_address =3D S390_TEST_MEM_START; @@ -609,15 +605,13 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_args =3D ",vsmt=3D8"; memory_size =3D "256M"; cmd_src =3D g_strdup_printf("-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'", tmpfs, end_address, start_address); - cmd_dst =3D g_strdup_printf(" -name target,debug-threads=3Don" - " -serial file:%s/dest_serial" + cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial" " -incoming %s", tmpfs, uri); =20 @@ -628,11 +622,11 @@ 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("-name vmsource,debug-threads=3Don -cp= u max " + cmd_src =3D g_strdup_printf("-cpu max " "-serial file:%s/src_serial " "-kernel %s", tmpfs, bootpath); - cmd_dst =3D g_strdup_printf("-name vmdest,debug-threads=3Don -cpu = max " + cmd_dst =3D g_strdup_printf("-cpu max " "-serial file:%s/dest_serial " "-kernel %s " "-incoming %s", @@ -666,6 +660,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, } =20 cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " + "-name source,debug-threads=3Don " "-m %s " "%s %s %s %s", machine_type, machine_args, @@ -676,6 +671,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, g_free(cmd_source); =20 cmd_target =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " + "-name target,debug-threads=3Don " "-m %s " "%s %s %s %s", machine_type, machine_args, --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634687; cv=none; d=zohomail.com; s=zohoarc; b=ndtW5dQ5iCnx/CFBxmn0K78mPCqPs9YzYgKisD5MJ8FVhVm3AMk1ycnsMRG6lCyWb2WyjKKUlJTobQbgQ+ePfyGaHwLX9PBbxtXS3Hh0nhlPFyKSlNraGrMmzHrG31cc0h7O27xf7MrtrgvP+6Y477Cy+fOhB9Qo8xe6Gk1aMyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634687; 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=1H1SNl9VJCJi87+rRkV+XA4svxEFGCuPaH5ZTsHd5BY=; b=XoGXypQqdUjptZ1m3cOFvu9IxWx07j5i+53XTxuhNCOOihgIGZnLSjbRqDfhPpn9orzLttcrjFuCpq95yorYS403z+Q7pWfivxCnUMVD4Aj9pCKB0ReRVBJhHSUffey0QC8AftgrII2bc+IYvcvmhk6Ybgh3blStTKHKdkZSuls= 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 157663468745045.959971874592725; Tue, 17 Dec 2019 18:04:47 -0800 (PST) Received: from localhost ([::1]:48426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOhi-0005nY-0R for importer@patchew.org; Tue, 17 Dec 2019 21:04:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37931) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYy-0004Nm-6r for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYx-0004cW-0S for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30262 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihOYw-0004Zd-SI for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:42 -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-231-Y34CBwNWP6qRFOzZ3cXROg-1; Tue, 17 Dec 2019 20:55:37 -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 6C42A107ACC4 for ; Wed, 18 Dec 2019 01:55:36 +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 E3BAF68882; Wed, 18 Dec 2019 01:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634140; 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=1H1SNl9VJCJi87+rRkV+XA4svxEFGCuPaH5ZTsHd5BY=; b=hT9hJGeMQ+n11JXNysHmu0DovKsIEWnT1Bo+5sQaIgg0gMQgoOoNDE3NnO/tv+OVUBfl94 8IMp4nRNq152+d03L6FV5efWkytz6YHj+2h8rf8MVjz9GRvrw+f1UeaFIBuj93NvqBcOyu 2XY6oqmtBCeDPx7el76u/0mpTKwVztA= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 07/10] migration-test: Move -serial handling to common commandline Date: Wed, 18 Dec 2019 02:55:17 +0100 Message-Id: <20191218015520.2881-8-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: Y34CBwNWP6qRFOzZ3cXROg-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: 207.211.31.120 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 | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 6e828fbc6c..e1304d70fc 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -579,13 +579,10 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_type =3D ""; machine_args =3D ""; memory_size =3D "150M"; - cmd_src =3D g_strdup_printf(" -serial file:%s/src_serial" - " -drive file=3D%s,format=3Draw", - tmpfs, bootpath); - cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial" - " -drive file=3D%s,format=3Draw" + cmd_src =3D g_strdup_printf("-drive file=3D%s,format=3Draw", bootp= ath); + cmd_dst =3D g_strdup_printf("-drive file=3D%s,format=3Draw" " -incoming %s", - tmpfs, bootpath, uri); + bootpath, uri); start_address =3D X86_TEST_MEM_START; end_address =3D X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { @@ -593,28 +590,22 @@ 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(" -serial file:%s/src_serial -bios %s", - tmpfs, bootpath); - cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial -bios %s" + cmd_src =3D g_strdup_printf("-bios %s", bootpath); + cmd_dst =3D g_strdup_printf("-bios %s" " -incoming %s", - tmpfs, bootpath, uri); + bootpath, uri); 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" - " -serial file:%s/src_serial" - " -prom-env 'use-nvramrc?=3Dtrue' -prom-= env " + 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'", tmpfs, end_address, - start_address); - cmd_dst =3D g_strdup_printf(" -serial file:%s/dest_serial" - " -incoming %s", - tmpfs, uri); - + "until'", end_address, start_address); + cmd_dst =3D g_strdup_printf(" -incoming %s", uri); start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; } else if (strcmp(arch, "aarch64") =3D=3D 0) { @@ -623,14 +614,12 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, machine_args =3D "gic-version=3Dmax"; memory_size =3D "150M"; cmd_src =3D g_strdup_printf("-cpu max " - "-serial file:%s/src_serial " "-kernel %s", - tmpfs, bootpath); + bootpath); cmd_dst =3D g_strdup_printf("-cpu max " - "-serial file:%s/dest_serial " "-kernel %s " "-incoming %s", - tmpfs, bootpath, uri); + bootpath, uri); =20 start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; @@ -661,10 +650,11 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, =20 cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " "-name source,debug-threads=3Don " + "-serial file:%s/src_serial " "-m %s " "%s %s %s %s", machine_type, machine_args, - memory_size, + tmpfs, memory_size, cmd_src, shmem_opts, opts_src, ignore_std= err); g_free(cmd_src); *from =3D qtest_init(cmd_source); @@ -673,9 +663,10 @@ static int test_migrate_start(QTestState **from, QTest= State **to, cmd_target =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " "-name target,debug-threads=3Don " "-m %s " + "-serial file:%s/dest_serial " "%s %s %s %s", machine_type, machine_args, - memory_size, + tmpfs, memory_size, cmd_dst, shmem_opts, opts_dst, ignore_std= err); g_free(cmd_dst); *to =3D qtest_init(cmd_target); --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634685; cv=none; d=zohomail.com; s=zohoarc; b=aikXmDUBxQBKg1jMdoClXFvdtLbDFHVBw6+bRA/fvDinBudr2/YelJc35Pa3Rg1v5MIKrvtGtWCroD43i2S4YEPNN7/mhjkX5Rbaej5VB7wp+C0qWs7bdEj7gMQQR9xaYDLFrByicCJDm88QGJSrHu28AmlxxD7Lq95GEbppJOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634685; 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=CSERinvXz0u7tspqLC1kgiqIWn45G+555/T5p3hqE90=; b=ATT8/HaGt8Y9DEC/8arIDyi+f1mLSGdcRiFJEL8Kfm5s/h/uynEfY5JAbFA9zbBFAJufdgUOu7KOLRSziWLaXEEFJ0agRy23rkK6QqMBlh/Pa9gUy5iYpMjwATyvgzSJQIi6LWSdmovVhbNXGNwDyvEDSCM2Du9v2giXEAk8Fko= 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 1576634685643212.30609752425312; Tue, 17 Dec 2019 18:04:45 -0800 (PST) Received: from localhost ([::1]:48425 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOhg-0005nR-6M for importer@patchew.org; Tue, 17 Dec 2019 21:04:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37923) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYy-0004Nb-5w for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYw-0004cL-VY for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:44 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26419 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 1ihOYw-0004a9-Rb for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:42 -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-253-ayyW3zK5PH6zo9mQtCcdhQ-1; Tue, 17 Dec 2019 20:55:39 -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 478CB18C35A0 for ; Wed, 18 Dec 2019 01:55:38 +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 BEE056886F; Wed, 18 Dec 2019 01:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634141; 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=CSERinvXz0u7tspqLC1kgiqIWn45G+555/T5p3hqE90=; b=aNwvLlMhFRLrfPcKm4I8B9SAUGZl6WOa5hr5lclVrCfoYd2KLezfNQJAmCq3k8hfOFxv9L efBFEDwsEkT93MElomeWrD9th7HiHKzRP3IhkFTaBcbkiN1lBhc+FPFqAzLVrXICg+WZJd OJ6M987mho7var4Yj5GLTS8bfmkxaGQ= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 08/10] migration-test: Move -incomming handling to common commandline Date: Wed, 18 Dec 2019 02:55:18 +0100 Message-Id: <20191218015520.2881-9-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: ayyW3zK5PH6zo9mQtCcdhQ-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: 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+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 | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index e1304d70fc..14f2ce30fb 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -580,9 +580,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, 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_printf("-drive file=3D%s,format=3Draw" - " -incoming %s", - bootpath, uri); + cmd_dst =3D g_strdup(cmd_src); start_address =3D X86_TEST_MEM_START; end_address =3D X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { @@ -591,9 +589,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, machine_args =3D ""; memory_size =3D "128M"; cmd_src =3D g_strdup_printf("-bios %s", bootpath); - cmd_dst =3D g_strdup_printf("-bios %s" - " -incoming %s", - bootpath, uri); + cmd_dst =3D g_strdup(cmd_src); start_address =3D S390_TEST_MEM_START; end_address =3D S390_TEST_MEM_END; } else if (strcmp(arch, "ppc64") =3D=3D 0) { @@ -605,7 +601,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "'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_printf(" -incoming %s", uri); + cmd_dst =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) { @@ -616,11 +612,7 @@ static int test_migrate_start(QTestState **from, QTest= State **to, cmd_src =3D g_strdup_printf("-cpu max " "-kernel %s", bootpath); - cmd_dst =3D g_strdup_printf("-cpu max " - "-kernel %s " - "-incoming %s", - bootpath, uri); - + cmd_dst =3D g_strdup(cmd_src); start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; =20 @@ -650,11 +642,11 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, =20 cmd_source =3D g_strdup_printf("-machine %saccel=3Dkvm:tcg%s " "-name source,debug-threads=3Don " - "-serial file:%s/src_serial " "-m %s " + "-serial file:%s/src_serial " "%s %s %s %s", machine_type, machine_args, - tmpfs, memory_size, + memory_size, tmpfs, cmd_src, shmem_opts, opts_src, ignore_std= err); g_free(cmd_src); *from =3D qtest_init(cmd_source); @@ -664,9 +656,10 @@ static int test_migrate_start(QTestState **from, QTest= State **to, "-name target,debug-threads=3Don " "-m %s " "-serial file:%s/dest_serial " + "-incoming %s " "%s %s %s %s", machine_type, machine_args, - tmpfs, memory_size, + memory_size, tmpfs, uri, cmd_dst, shmem_opts, opts_dst, ignore_std= err); g_free(cmd_dst); *to =3D qtest_init(cmd_target); --=20 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634486; cv=none; d=zohomail.com; s=zohoarc; b=XrqNQJqzniirdRLfaRDLToHQnh+KfRQ8s8Xaz1aVR9thmeZChX9C+0F0XlVAJnbmqR2KxucfyVe7KoaIIAei5dVfNPyk1vEf+kDqxzpydj+k+//0g3Jcjvizy4WeVJgLMkLpgSFStzg97VQVCly4jtx6ilY8EPRCVwMuUXZhlpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634486; 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=bD0YIqSSPR/3/k96vWX/sEjtHRtA/S2Rf0ct698gL94=; b=jT76yH3i6vK6khlHYV8bOKKUpSE8aCN80SgzyXcDZRkUFHKDZYtF5YpQqjIqQaQPlfeYOwhINa5XHzcvjUZSf7VSgmf0Cg3AV0nlns6eHIgzDhvhGu2L0y3E/WWaaaONmhNzI4YnmTH+2ty7Za36frZGBTSET9tvi3uWt8yVirI= 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 15766344862869.507626475899428; Tue, 17 Dec 2019 18:01:26 -0800 (PST) Received: from localhost ([::1]:48364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOeS-00026u-G2 for importer@patchew.org; Tue, 17 Dec 2019 21:01:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOYy-0004Nh-6T for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYx-0004cg-0x for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49823 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihOYw-0004bR-Sf for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:42 -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-291-WtyNv6IEOJ-lSCEzJuPAhA-1; Tue, 17 Dec 2019 20:55:41 -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 240C0800D48 for ; Wed, 18 Dec 2019 01:55:40 +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 9DE6F51; Wed, 18 Dec 2019 01:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634142; 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=bD0YIqSSPR/3/k96vWX/sEjtHRtA/S2Rf0ct698gL94=; b=RZcKwc97qKSePOz+kP15leaT+8Uh5bRY8VrVoPUexpICz+CVDCpAvYQxiL7Ee8OK57RHuV JHUslhK+7eO83sv8lCcYKCPQ7Z2WebFLl0gmDd6ANwu9iX0wIiPnUTPV3xRE+SuUgZ+13n 9/+rDHLiUtcOAPizMBbqo6onSpB5SmE= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 09/10] migration-test: Rename cmd_src/dst to arch_source/arch_target Date: Wed, 18 Dec 2019 02:55:19 +0100 Message-Id: <20191218015520.2881-10-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: WtyNv6IEOJ-lSCEzJuPAhA-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: 207.211.31.120 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" This explains better what they do and avoid confussino with command_src/target. Signed-off-by: Juan Quintela --- 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 14f2ce30fb..37e9663ab4 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 2.23.0 From nobody Sun May 5 03:15:10 2024 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=1576634816; cv=none; d=zohomail.com; s=zohoarc; b=OXSAXGZlGnYanT/0REmufsQrCmPYBujXsQIYNFKZVxX+VLGkEYMxt/F7v174ZXFmVa1nRS30LuojDEsEhfPQxRt5AZE5PMJFhXrZMhe/dJc6jsd235eaWtVFehLx2xrpgGVxDfXnH6Q2xw+RLafn3/4xNKi8bIDOYrnaltgKZKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576634816; 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=qWzmd2YkcPjbpTWqhopJhWAlhFsn3prx4VAw0Eq9F/s=; b=nezFJ/a4CYxktlD3eIhWubBEELuXbMIyp8DKYAyl64okMi5srurFFkTJyxNUt1Z+z+K66AUrTRt7mZ22wsk9+urSY7WT1l6RvaYUHKnwc81aCvrnDGNE1cz4EYp+GWQlJdRaBVlBmUyFgqsRMuEUPaOY6spT1jhi3ZbWlvQAENs= 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 1576634816272437.30821664757; Tue, 17 Dec 2019 18:06:56 -0800 (PST) Received: from localhost ([::1]:48460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOjm-0000Om-Mg for importer@patchew.org; Tue, 17 Dec 2019 21:06:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38081) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihOZ0-0004Rr-IG for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihOYy-0004gH-PJ for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:46 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46001 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 1ihOYy-0004fd-L9 for qemu-devel@nongnu.org; Tue, 17 Dec 2019 20:55:44 -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-245-J7hDw1lFMhWSwFACg6YqXQ-1; Tue, 17 Dec 2019 20:55:42 -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 03FF0107ACC4 for ; Wed, 18 Dec 2019 01:55:42 +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 7AEFC6886F; Wed, 18 Dec 2019 01:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576634144; 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=qWzmd2YkcPjbpTWqhopJhWAlhFsn3prx4VAw0Eq9F/s=; b=Q7ezeR+4p7t9MKi2slkXsgluSVBDDDabkaQo5/m3M8ZtTSGuo1+6WB8tLa15u9HAX6Zeaa S8xEXUvuBBWz8QPmwkfBtCqUSsMdKUhGo/1giZhCxevL6t0ItZF7lCwoh1kBImOeFT1ixR DfzzuLu6K+OGta2Z1JI2ZZdQm3LFOgw= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 10/10] migration-test: Use a struct for test_migrate_start parameters Date: Wed, 18 Dec 2019 02:55:20 +0100 Message-Id: <20191218015520.2881-11-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: J7hDw1lFMhWSwFACg6YqXQ-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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It has two bools and two strings, it is very difficult to remember which does what. And it makes very difficult to add new parameters as we need to modify all the callers. Signed-off-by: Juan Quintela --- Move the free after last use. --- tests/migration-test.c | 118 +++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 40 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 37e9663ab4..f58430c1cb 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -544,10 +544,31 @@ static void migrate_postcopy_start(QTestState *from, = QTestState *to) qtest_qmp_eventwait(to, "RESUME"); } =20 +typedef struct { + bool hide_stderr; + bool use_shmem; + char *opts_source; + char *opts_target; +} MigrateStart; + +static MigrateStart *migrate_start_new(void) +{ + MigrateStart *args =3D g_new0(MigrateStart, 1); + + args->opts_source =3D g_strdup(""); + args->opts_target =3D g_strdup(""); + return args; +} + +static void migrate_start_destroy(MigrateStart *args) +{ + g_free(args->opts_source); + g_free(args->opts_target); + g_free(args); +} + static int test_migrate_start(QTestState **from, QTestState **to, - const char *uri, bool hide_stderr, - bool use_shmem, const char *opts_src, - const char *opts_dst) + const char *uri, MigrateStart *args) { gchar *arch_source, *arch_target; gchar *cmd_source, *cmd_target; @@ -560,10 +581,7 @@ static int test_migrate_start(QTestState **from, QTest= State **to, const char *machine_args; const char *memory_size; =20 - opts_src =3D opts_src ? opts_src : ""; - opts_dst =3D opts_dst ? opts_dst : ""; - - if (use_shmem) { + if (args->use_shmem) { if (!g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) { g_test_skip("/dev/shm is not supported"); return -1; @@ -623,13 +641,13 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, =20 g_free(bootpath); =20 - if (hide_stderr) { + if (args->hide_stderr) { ignore_stderr =3D "2>/dev/null"; } else { ignore_stderr =3D ""; } =20 - if (use_shmem) { + if (args->use_shmem) { shmem_path =3D g_strdup_printf("/dev/shm/qemu-%d", getpid()); shmem_opts =3D g_strdup_printf( "-object memory-backend-file,id=3Dmem0,size=3D%s" @@ -647,7 +665,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "%s %s %s %s", machine_type, machine_args, memory_size, tmpfs, - arch_source, shmem_opts, opts_src, + arch_source, shmem_opts, args->opts_sourc= e, ignore_stderr); g_free(arch_source); *from =3D qtest_init(cmd_source); @@ -661,8 +679,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, "%s %s %s %s", machine_type, machine_args, memory_size, tmpfs, uri, - arch_target, shmem_opts, opts_dst, - ignore_stderr); + arch_target, shmem_opts, + args->opts_target, ignore_stderr); g_free(arch_target); *to =3D qtest_init(cmd_target); g_free(cmd_target); @@ -672,10 +690,11 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, * Remove shmem file immediately to avoid memory leak in test failed c= ase. * It's valid becase QEMU has already opened this file */ - if (use_shmem) { + if (args->use_shmem) { unlink(shmem_path); g_free(shmem_path); } + migrate_start_destroy(args); =20 return 0; } @@ -762,13 +781,13 @@ static void test_deprecated(void) } =20 static int migrate_postcopy_prepare(QTestState **from_ptr, - QTestState **to_ptr, - bool hide_error) + QTestState **to_ptr, + MigrateStart *args) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, hide_error, false, NULL, NULL)= ) { + if (test_migrate_start(&from, &to, uri, args)) { return -1; } =20 @@ -813,9 +832,10 @@ static void migrate_postcopy_complete(QTestState *from= , QTestState *to) =20 static void test_postcopy(void) { + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; =20 - if (migrate_postcopy_prepare(&from, &to, false)) { + if (migrate_postcopy_prepare(&from, &to, args)) { return; } migrate_postcopy_start(from, to); @@ -824,10 +844,13 @@ static void test_postcopy(void) =20 static void test_postcopy_recovery(void) { + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; char *uri; =20 - if (migrate_postcopy_prepare(&from, &to, true)) { + args->hide_stderr =3D true; + + if (migrate_postcopy_prepare(&from, &to, args)) { return; } =20 @@ -910,9 +933,12 @@ static void wait_for_migration_fail(QTestState *from, = bool allow_active) =20 static void test_baddest(void) { + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, "tcp:0:0", true, false, NULL, NULL)= ) { + args->hide_stderr =3D true; + + if (test_migrate_start(&from, &to, "tcp:0:0", args)) { return; } migrate(from, "tcp:0:0", "{}"); @@ -923,9 +949,10 @@ static void test_baddest(void) static void test_precopy_unix(void) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, false, false, NULL, NULL)) { + if (test_migrate_start(&from, &to, uri, args)) { return; } =20 @@ -1001,9 +1028,10 @@ static void test_ignore_shared(void) =20 static void test_xbzrle(const char *uri) { + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, false, false, NULL, NULL)) { + if (test_migrate_start(&from, &to, uri, args)) { return; } =20 @@ -1052,11 +1080,11 @@ static void test_xbzrle_unix(void) =20 static void test_precopy_tcp(void) { + MigrateStart *args =3D migrate_start_new(); char *uri; QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", false, false, - NULL, NULL)) { + if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", args)) { return; } =20 @@ -1096,13 +1124,14 @@ static void test_precopy_tcp(void) =20 static void test_migrate_fd_proto(void) { + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; int ret; int pair[2]; QDict *rsp; const char *error_desc; =20 - if (test_migrate_start(&from, &to, "defer", false, false, NULL, NULL))= { + if (test_migrate_start(&from, &to, "defer", args)) { return; } =20 @@ -1178,15 +1207,12 @@ static void test_migrate_fd_proto(void) test_migrate_end(from, to, true); } =20 -static void do_test_validate_uuid(const char *uuid_arg_src, - const char *uuid_arg_dst, - bool should_fail, bool hide_stderr) +static void do_test_validate_uuid(MigrateStart *args, bool should_fail) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, hide_stderr, false, - uuid_arg_src, uuid_arg_dst)) { + if (test_migrate_start(&from, &to, uri, args)) { return; } =20 @@ -1216,33 +1242,45 @@ static void do_test_validate_uuid(const char *uuid_= arg_src, =20 static void test_validate_uuid(void) { - do_test_validate_uuid("-uuid 11111111-1111-1111-1111-111111111111", - "-uuid 11111111-1111-1111-1111-111111111111", - false, false); + MigrateStart *args =3D migrate_start_new(); + + args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); + args->opts_target =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); + do_test_validate_uuid(args, false); } =20 static void test_validate_uuid_error(void) { - do_test_validate_uuid("-uuid 11111111-1111-1111-1111-111111111111", - "-uuid 22222222-2222-2222-2222-222222222222", - true, true); + MigrateStart *args =3D migrate_start_new(); + + args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); + args->opts_target =3D g_strdup("-uuid 22222222-2222-2222-2222-22222222= 2222"); + args->hide_stderr =3D true; + do_test_validate_uuid(args, true); } =20 static void test_validate_uuid_src_not_set(void) { - do_test_validate_uuid(NULL, "-uuid 11111111-1111-1111-1111-11111111111= 1", - false, true); + MigrateStart *args =3D migrate_start_new(); + + args->opts_target =3D g_strdup("-uuid 22222222-2222-2222-2222-22222222= 2222"); + args->hide_stderr =3D true; + do_test_validate_uuid(args, false); } =20 static void test_validate_uuid_dst_not_set(void) { - do_test_validate_uuid("-uuid 11111111-1111-1111-1111-111111111111", NU= LL, - false, true); + MigrateStart *args =3D migrate_start_new(); + + args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); + args->hide_stderr =3D true; + do_test_validate_uuid(args, false); } =20 static void test_migrate_auto_converge(void) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); + MigrateStart *args =3D migrate_start_new(); QTestState *from, *to; int64_t remaining, percentage; =20 @@ -1261,7 +1299,7 @@ static void test_migrate_auto_converge(void) */ const int64_t expected_threshold =3D max_bandwidth * downtime_limit / = 1000; =20 - if (test_migrate_start(&from, &to, uri, false, false, NULL, NULL)) { + if (test_migrate_start(&from, &to, uri, args)) { return; } =20 --=20 2.23.0