From nobody Sat May 4 19:30:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660887896; cv=none; d=zohomail.com; s=zohoarc; b=OmnzIvfk98dwfAIGVXaLXykMZurrdYobSAEd93AZdCPZ6d6LV1sJBJlsNglxR6xYMgQsYlaUuUWmr5fp/u2Z8whurKxbGJPzyN0xf/KOid6Gq/oLR/gOJrsEkQ4Hpbmfni2Ui+8v4pX3gPEm75OcU7VTWh+LHKxgJVUJGLbdK4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660887896; h=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=gVeSk+K7fCtbdjeRFbImezN76NohiBrZ5GPPLi+qWC8=; b=kosTdtw2C/aQT5GajCLKbsjGsFhXzWNRJCwlbCVWfFWlGDzDotmtulTEmw+rkFzl1COB8y1s6TS2gNDhoFBVlXl+37Ut/o06A+2B6T72NjHR5UBzYGA/gCyVOODRz+WriYpjlGMbIu4XydYdrTaBenrEvSkLeDQXs0t/Qt6ilEI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660887896460132.82859874339374; Thu, 18 Aug 2022 22:44:56 -0700 (PDT) Received: from localhost ([::1]:55906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOuoO-0006Jl-M6 for importer@patchew.org; Fri, 19 Aug 2022 01:44:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOuhy-0003Lm-P4 for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOuhv-0002mj-Gh for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:13 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475-A5R6OfNGMOubfKWizuju2Q-1; Fri, 19 Aug 2022 01:38:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7142A8037AE; Fri, 19 Aug 2022 05:38:07 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FD7A4010D45; Fri, 19 Aug 2022 05:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660887489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gVeSk+K7fCtbdjeRFbImezN76NohiBrZ5GPPLi+qWC8=; b=HMk6ywKdRV9jZz3hlVtg1m835vkLo5aH7UfHBcpbsUJ/DZCiLtI3ATBFandvJV92xqwRU9 ir20ESRrznXDq+avJfUvE7g9rA1DTq9KFd5UYLjnd3mI44pRAreIXJ0ERndnlzgTm/OIIH 40hogfINaRoN6WRVaEHMpLodLDGwGnY= X-MC-Unique: A5R6OfNGMOubfKWizuju2Q-1 From: Thomas Huth To: Juan Quintela , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , Bin Meng Subject: [PATCH 1/4] tests/qtest/migration-test: Only wait for serial output where migration succeeds Date: Fri, 19 Aug 2022 07:37:59 +0200 Message-Id: <20220819053802.296584-2-thuth@redhat.com> In-Reply-To: <20220819053802.296584-1-thuth@redhat.com> References: <20220819053802.296584-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660887898259100003 Content-Type: text/plain; charset="utf-8" Waiting for the serial output can take a couple of seconds - and since we're doing a lot of migration tests, this time easily sums up to multiple minutes. But if a test is supposed to fail, it does not make much sense to wait for the source to be in the right state first, so we can skip the waiting here. This way we can speed up all tests where the migration is supposed to fail. In the gitlab-CI gprov-gcov test, each of the migration-tests now run two minutes faster! Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Thomas Huth --- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 520a5f917c..7be321b62d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1307,7 +1307,9 @@ static void test_precopy_common(MigrateCommon *args) } =20 /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); + if (args->result =3D=3D MIG_TEST_SUCCEED) { + wait_for_serial("src_serial"); + } =20 if (!args->connect_uri) { g_autofree char *local_connect_uri =3D --=20 2.31.1 From nobody Sat May 4 19:30:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660887893; cv=none; d=zohomail.com; s=zohoarc; b=fJsX7uaVgj6r/S4iTh3OATDwusl9JH2x2XPZongG+eaC6hfnOxj01dUNDWmuaXABFPBg8K3mCiFIdTTXO9i2doYoEAt4ANQZ1ZQ+WtPhs8YYiYXZdHXlNfkJlVhMrnbZR9Yg6af37NR6icfz5wU/ISP2Ud2Qs9Bzsdw7BAPOJeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660887893; h=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=UxQS7HFhQiZ0G2nyAw1XtT6rSAC4kVjZXOTbDVPWOvM=; b=fsSeyAoZaLw/ZOUVTsgBxEDzsnr573VwlvU+RvteEkq93q3jU6sy3E/oX7lS5lcH6tLVuqoMBH1TWOxIp2ID/MXl92v1nPXoO4jwFfSjTAh+6qxg7bdsq+TVujfS6Yz5kzJMRQChsGS709TjDVIeADWsrnTHqon7kx9LeNZXYO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660887893216919.905441901724; Thu, 18 Aug 2022 22:44:53 -0700 (PDT) Received: from localhost ([::1]:55904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOuoN-0006Is-4b for importer@patchew.org; Fri, 19 Aug 2022 01:44:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOui1-0003Lw-8v for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:35302) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOuhv-0002mt-Rq for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:14 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-215-t1WU5UEvOtGhOwsm9ex0Yg-1; Fri, 19 Aug 2022 01:38:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5049B29324A3; Fri, 19 Aug 2022 05:38:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEC5440D2827; Fri, 19 Aug 2022 05:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660887491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UxQS7HFhQiZ0G2nyAw1XtT6rSAC4kVjZXOTbDVPWOvM=; b=D1+8K1sPwvRM6bk2Ih0546KiIArHAOAgP/NwKM/ya32EbGHh737WzMN9jUn3D5gXy8eHoM 4gm9ASdWerOZk5txAoSLNCVsaB99H95ELS+pkjzteln60V1tKbI1YPSx9I4vEq2D9+gm5W C+iAdKI53N6LA5fReM7Oao/YZHSiHfc= X-MC-Unique: t1WU5UEvOtGhOwsm9ex0Yg-1 From: Thomas Huth To: Juan Quintela , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , Bin Meng Subject: [PATCH 2/4] tests/migration/aarch64: Speed up the aarch64 migration test Date: Fri, 19 Aug 2022 07:38:00 +0200 Message-Id: <20220819053802.296584-3-thuth@redhat.com> In-Reply-To: <20220819053802.296584-1-thuth@redhat.com> References: <20220819053802.296584-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660887896469100001 Content-Type: text/plain; charset="utf-8" The migration tests spend a lot of time waiting for a sign of live of the guest on the serial console. The aarch64 migration code only outputs "B"s every couple of seconds (at least it takes more than 4 seconds between each characeter on my x86 laptop). There are a lot of migration tests, and if each test that checks for a successful migration waits for these characters before and after migration, the wait time sums up to multiple minutes! Let's use a shorter delay to speed things up. While we're at it, also remove a superfluous masking with 0xff - we're reading and storing bytes, so the upper bits of the register do not matter anyway. With these changes, the test runs twice as fast on my laptop, decreasing the total run time from approx. 8 minutes to only 4 minutes! Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/migration/aarch64/a-b-kernel.h | 10 +++++----- tests/migration/aarch64/a-b-kernel.S | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/migration/aarch64/a-b-kernel.h b/tests/migration/aarch64= /a-b-kernel.h index 0a9b01137e..34e518d061 100644 --- a/tests/migration/aarch64/a-b-kernel.h +++ b/tests/migration/aarch64/a-b-kernel.h @@ -10,9 +10,9 @@ unsigned char aarch64_kernel[] =3D { 0x03, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x00, 0x39, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0xad, 0xff, 0xff, 0x54, 0x05, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x40, 0x39, - 0x63, 0x04, 0x00, 0x11, 0x63, 0x1c, 0x00, 0x12, 0x83, 0x00, 0x00, 0x39, - 0x24, 0x7e, 0x0b, 0xd5, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, - 0x2b, 0xff, 0xff, 0x54, 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x1c, 0x00, 0x12, - 0xbf, 0x00, 0x00, 0x71, 0x81, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, - 0x43, 0x00, 0x00, 0x39, 0xf1, 0xff, 0xff, 0x17 + 0x63, 0x04, 0x00, 0x11, 0x83, 0x00, 0x00, 0x39, 0x24, 0x7e, 0x0b, 0xd5, + 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0x4b, 0xff, 0xff, 0x54, + 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x10, 0x00, 0x12, 0xbf, 0x00, 0x00, 0x71, + 0xa1, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, 0x43, 0x00, 0x00, 0x39, + 0xf2, 0xff, 0xff, 0x17 }; diff --git a/tests/migration/aarch64/a-b-kernel.S b/tests/migration/aarch64= /a-b-kernel.S index 0225945348..a4103ecb71 100644 --- a/tests/migration/aarch64/a-b-kernel.S +++ b/tests/migration/aarch64/a-b-kernel.S @@ -53,7 +53,6 @@ innerloop: /* increment the first byte of each page by 1 */ ldrb w3, [x4] add w3, w3, #1 - and w3, w3, #0xff strb w3, [x4] =20 /* make sure QEMU user space can see consistent data as MMU is off= */ @@ -64,7 +63,7 @@ innerloop: blt innerloop =20 add w5, w5, #1 - and w5, w5, #0xff + and w5, w5, #0x1f cmp w5, #0 bne mainloop =20 --=20 2.31.1 From nobody Sat May 4 19:30:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660888216; cv=none; d=zohomail.com; s=zohoarc; b=ia139CC94VkEq/a34P3ku/mtKNQLTM+WgE1Zie+p+7snlhsMbWlsq0+0sy1E5HDjqY0e5mF3/EkmCHnKpyf8Cnsv9RKy/tanKvoMbpIUEB5nX91NiIE03polPgM5kLnN/8swPjqAycmaQ/a9Hb+0vUyg8AfiFHBFUS+8qeYK13I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660888216; h=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=vbzJRqak9IwZ24Po/WnRT6/Jqnt2iGn+zV4LV26v9Hs=; b=W6Kqm8it32bGYvw73TKbjJUGVbayp8MZ4k1vFeah3UAy0813wQvZbqnDJ4XcSnESJx4hMUza6gLsZOBYN41/lnijVExy/wmIOHwMv4mOUeALMmOww3Imv+WvPaGEX1dT9uv9mRtsaDGB/0iqMnsb+Oem4LupVBOdNrvxP+jl3tM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166088821626847.4958702153898; Thu, 18 Aug 2022 22:50:16 -0700 (PDT) Received: from localhost ([::1]:45046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOutb-0002Ym-2d for importer@patchew.org; Fri, 19 Aug 2022 01:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOuiC-0003Oz-7B for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOui0-0002o6-VD for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:18 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-lFUL2ffwOui5b-XEztgouQ-1; Fri, 19 Aug 2022 01:38:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F58E1C05EC7; Fri, 19 Aug 2022 05:38:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96C6840D2827; Fri, 19 Aug 2022 05:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660887492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vbzJRqak9IwZ24Po/WnRT6/Jqnt2iGn+zV4LV26v9Hs=; b=OZQKBhzDJIurz519bo3MXufCVjzr3l4YI2mqNr8GNP4TbaprVZUQmQRTqvA9p09vsH6OBE bdG/IFAWNkwP3ClO2Y2OpwTdp4BsK0XPWuNL4e6h7d2iRD6HLX21tJtrOIj5BrO/Gc4tQa t9H/MF+uFOAjLLkz/awGCxoay7yqzos= X-MC-Unique: lFUL2ffwOui5b-XEztgouQ-1 From: Thomas Huth To: Juan Quintela , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , Bin Meng Subject: [PATCH 3/4] tests/migration/i386: Speed up the i386 migration test (when using TCG) Date: Fri, 19 Aug 2022 07:38:01 +0200 Message-Id: <20220819053802.296584-4-thuth@redhat.com> In-Reply-To: <20220819053802.296584-1-thuth@redhat.com> References: <20220819053802.296584-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660888218369100001 Content-Type: text/plain; charset="utf-8" When KVM is not available, the i386 migration test also runs in a rather slow fashion, since the guest code takes a couple of seconds to print the "B"s on the serial console, and the migration test has to wait for this each time. Let's increase the frequency here, too, so that the delays in the migration tests get smaller. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/migration/i386/a-b-bootblock.h | 12 ++++++------ tests/migration/i386/a-b-bootblock.S | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/migration/i386/a-b-bootblock.h b/tests/migration/i386/a-= b-bootblock.h index 7d459d4fde..b7b0fce2ee 100644 --- a/tests/migration/i386/a-b-bootblock.h +++ b/tests/migration/i386/a-b-bootblock.h @@ -4,17 +4,17 @@ * the header and the assembler differences in your patch submission. */ unsigned char x86_bootsect[] =3D { - 0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00, + 0xfa, 0x0f, 0x01, 0x16, 0x78, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x22, 0xc0, 0x66, 0xea, 0x20, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x92, 0x0c, 0x02, 0xe6, 0x92, 0xb8, 0x10, 0x00, 0x00, 0x00, 0x8e, 0xd8, 0x66, 0xb8, 0x41, 0x00, 0x66, 0xba, 0xf8, 0x03, 0xee, 0xb3, 0x00, 0xb8, 0x00, 0x00, 0x10, 0x00, 0xfe, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x40, - 0x06, 0x7c, 0xf2, 0xfe, 0xc3, 0x75, 0xe9, 0x66, 0xb8, 0x42, 0x00, 0x66, - 0xba, 0xf8, 0x03, 0xee, 0xeb, 0xde, 0x66, 0x90, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00, - 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00, 0x27, 0x00, 0x5c, 0x7c, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x06, 0x7c, 0xf2, 0xfe, 0xc3, 0x80, 0xe3, 0x3f, 0x75, 0xe6, 0x66, 0xb8, + 0x42, 0x00, 0x66, 0xba, 0xf8, 0x03, 0xee, 0xeb, 0xdb, 0x8d, 0x76, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x9a, 0xcf, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00, + 0x27, 0x00, 0x60, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/tests/migration/i386/a-b-bootblock.S b/tests/migration/i386/a-= b-bootblock.S index 3f97f28023..3d464c7568 100644 --- a/tests/migration/i386/a-b-bootblock.S +++ b/tests/migration/i386/a-b-bootblock.S @@ -50,6 +50,7 @@ innerloop: jl innerloop =20 inc %bl + andb $0x3f,%bl jnz mainloop =20 mov $66,%ax --=20 2.31.1 From nobody Sat May 4 19:30:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660888242; cv=none; d=zohomail.com; s=zohoarc; b=oHog8wcsBGs8uOk9sX91+69DrBT4UdB9N55+xCIQjffJRU22lQd5ZO2GmLJVaVSnhSp4VuwSKBk9pgPwJUUqVdQGQVwPujzezTVJfjW/qprOY8RoUWgGqyu32uQ9pxEfCinTnrzWrNOQJVpyp2klokoyqJwqJuJvyKT0LdSbKrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660888242; h=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=ZI4KBX4KW/sjd2R7SfuowE15LMfO8KNu1anSRmZ9pqQ=; b=HvnaCdDnA6EbnjS2YPuJJu2JxAnfNe6R7f1M2Qe/UqlgLc6543DiUJ+UvBFN7bllxTcK7LcN2d0LvKRWSHQf5fa1INV+pYfQ4dSqGnU6yZ8TWNmjFP1Oe2WFojwuiKyR7zAnofKy0gXa4QVD/cLURcZZO80aBSrR1bEkADhQF/M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660888242190171.9088715619605; Thu, 18 Aug 2022 22:50:42 -0700 (PDT) Received: from localhost ([::1]:45044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOutv-0002YC-KB for importer@patchew.org; Fri, 19 Aug 2022 01:50:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOuiC-0003Ox-6t for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOui0-0002oN-Vt for qemu-devel@nongnu.org; Fri, 19 Aug 2022 01:38:18 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-263-Qe0ir1V5NSqe6uO63l69IA-1; Fri, 19 Aug 2022 01:38:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E08CC185A79C; Fri, 19 Aug 2022 05:38:12 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84E4F4010E3C; Fri, 19 Aug 2022 05:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660887494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZI4KBX4KW/sjd2R7SfuowE15LMfO8KNu1anSRmZ9pqQ=; b=MKEgKSTIeVL1OCGOgVdgyVo6GKg8ciJN4y6U7OZsq+6Gc7vYvwhOy1qN+OtRijlvnK8EkU lFA73lgRXQjZz3rNBgjN4f/aAlvhXZbVk7VdNKHRC99CDO1ajipqyszI1n7k6nwT11+g6u psMlBtC41atFugMupKGnKaF2ymRrNuI= X-MC-Unique: Qe0ir1V5NSqe6uO63l69IA-1 From: Thomas Huth To: Juan Quintela , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , Bin Meng Subject: [PATCH 4/4] tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan Date: Fri, 19 Aug 2022 07:38:02 +0200 Message-Id: <20220819053802.296584-5-thuth@redhat.com> In-Reply-To: <20220819053802.296584-1-thuth@redhat.com> References: <20220819053802.296584-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660888243318100001 Content-Type: text/plain; charset="utf-8" test_postcopy() is currently run twice - which is just a waste of resources and time. The commit d1a27b169b2d that introduced the duplicate talked about renaming the "postcopy/unix" test, but apparently it forgot to remove the old entry. Let's do that now. Fixes: d1a27b169b ("tests: Add postcopy tls migration test") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qtest/migration-test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 7be321b62d..f63edd0bc8 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -2461,7 +2461,6 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); =20 if (has_uffd) { - qtest_add_func("/migration/postcopy/unix", test_postcopy); qtest_add_func("/migration/postcopy/plain", test_postcopy); qtest_add_func("/migration/postcopy/recovery/plain", test_postcopy_recovery); --=20 2.31.1