From nobody Thu Nov 28 09:57:08 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=1692979280; cv=none; d=zohomail.com; s=zohoarc; b=hGpO2J3N2d6SoLfm+yCPOEiteZJTGrm8hELw3OyfxNrvt+zAmgC0cluXaZBzRJN4l5k9pH4AghcGx3XYuk7uLvcU8QLlqt4aeTXgg7Yym7od8LyKTAylSJSk6HAyBhfd6c7oq34XKU6y1q1lOdCc3R/D3fv7b07HJ+a0BswPhJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692979280; 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=A/xw5TzRgtqL5gvcD+iF/MI8zm+z0eH+HQ+WE4j4vY0=; b=DTWieOTdnDG2tnx30wleuPOMakEAwScEpTB/BSf3kNaloKB8/+Sp3Y0/fgP/07kK29vppXLpDjSPQJZgTpBkU3cZo7czRFbTrLBTZ0vGnDoeCrURLTH/swTHpehLHgqhl73T6ty8Otyz2IXrwU+mRk63e6ZOuqzqgilVPLIoZNs= 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 169297928039280.96406890291667; Fri, 25 Aug 2023 09:01:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZZDk-0001T5-Ip; Fri, 25 Aug 2023 11:59:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZZDi-0001Ru-Qp for qemu-devel@nongnu.org; Fri, 25 Aug 2023 11:59:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZZDd-0004hx-GT for qemu-devel@nongnu.org; Fri, 25 Aug 2023 11:59:34 -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-460-F0c-GMIfMc24ml17CDjZ4w-1; Fri, 25 Aug 2023 11:59:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5D4C85D187; Fri, 25 Aug 2023 15:59:24 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A41861121319; Fri, 25 Aug 2023 15:59:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9C28321E692A; Fri, 25 Aug 2023 17:59:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692979167; 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=A/xw5TzRgtqL5gvcD+iF/MI8zm+z0eH+HQ+WE4j4vY0=; b=jWPrTWShY6GlSFqak0WCtZss6SI/CeEcp0SjLY9lD4r4U9nZpu0fiLv2KN/Kl6/cZAEdIZ U2HvAdtUMJNKFjagqAwplXIhh9EZU/DX1gS58tDVkjL+E7Ae+uwEsrvIm/O4uTo9aoxss6 h2a3bBC6Ni1j+ZrHaHHsksxZAeTCBFw= X-MC-Unique: F0c-GMIfMc24ml17CDjZ4w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, dave@treblig.org, thuth@redhat.com, qemu-block@nongnu.org, berrange@redhat.com, dgilbert@redhat.com, qemu-trivial@nongnu.org Subject: [PATCH 1/2] docs tests: Fix use of migrate_set_parameter Date: Fri, 25 Aug 2023 17:59:22 +0200 Message-ID: <20230825155923.1983141-2-armbru@redhat.com> In-Reply-To: <20230825155923.1983141-1-armbru@redhat.com> References: <20230825155923.1983141-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_PORT=0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692979283351100003 Content-Type: text/plain; charset="utf-8" docs/multi-thread-compression.txt uses parameter names with underscores instead of dashes. Wrong since day one. docs/rdma.txt, tests/qemu-iotests/181, and tests/qtest/test-hmp.c are wrong the same way since commit cbde7be900d2 (v6.0.0). Hard to see, as test-hmp doesn't check whether the commands work, and iotest 181 appears to be unaffected. Fixes: 263170e679df (docs: Add a doc about multiple thread compression) Fixes: cbde7be900d2 (migrate: remove QMP/HMP commands for speed, downtime a= nd cache size) Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- docs/multi-thread-compression.txt | 12 ++++++------ docs/rdma.txt | 2 +- tests/qtest/test-hmp.c | 6 +++--- tests/qemu-iotests/181 | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/multi-thread-compression.txt b/docs/multi-thread-compress= ion.txt index bb88c6bdf1..95b1556f67 100644 --- a/docs/multi-thread-compression.txt +++ b/docs/multi-thread-compression.txt @@ -117,13 +117,13 @@ to support the multiple thread compression migration: {qemu} migrate_set_capability compress on =20 3. Set the compression thread count on source: - {qemu} migrate_set_parameter compress_threads 12 + {qemu} migrate_set_parameter compress-threads 12 =20 4. Set the compression level on the source: - {qemu} migrate_set_parameter compress_level 1 + {qemu} migrate_set_parameter compress-level 1 =20 5. Set the decompression thread count on destination: - {qemu} migrate_set_parameter decompress_threads 3 + {qemu} migrate_set_parameter decompress-threads 3 =20 6. Start outgoing migration: {qemu} migrate -d tcp:destination.host:4444 @@ -133,9 +133,9 @@ to support the multiple thread compression migration: =20 The following are the default settings: compress: off - compress_threads: 8 - decompress_threads: 2 - compress_level: 1 (which means best speed) + compress-threads: 8 + decompress-threads: 2 + compress-level: 1 (which means best speed) =20 So, only the first two steps are required to use the multiple thread compression in migration. You can do more if the default diff --git a/docs/rdma.txt b/docs/rdma.txt index 2b4cdea1d8..bd8dd799a9 100644 --- a/docs/rdma.txt +++ b/docs/rdma.txt @@ -89,7 +89,7 @@ RUNNING: First, set the migration speed to match your hardware's capabilities: =20 QEMU Monitor Command: -$ migrate_set_parameter max_bandwidth 40g # or whatever is the MAX of your= RDMA device +$ migrate_set_parameter max-bandwidth 40g # or whatever is the MAX of your= RDMA device =20 Next, on the destination machine, add the following to the QEMU command li= ne: =20 diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index 6704be239b..c0d2d70689 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -45,9 +45,9 @@ static const char *hmp_cmds[] =3D { "log all", "log none", "memsave 0 4096 \"/dev/null\"", - "migrate_set_parameter xbzrle_cache_size 1", - "migrate_set_parameter downtime_limit 1", - "migrate_set_parameter max_bandwidth 1", + "migrate_set_parameter xbzrle-cache-size 1", + "migrate_set_parameter downtime-limit 1", + "migrate_set_parameter max-bandwidth 1", "netdev_add user,id=3Dnet1", "set_link net1 off", "set_link net1 on", diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index cb96d09ae5..dc90a10757 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -109,7 +109,7 @@ if [ ${QEMU_STATUS[$dest]} -lt 0 ]; then _notrun 'Postcopy is not supported' fi =20 -_send_qemu_cmd $src 'migrate_set_parameter max_bandwidth 4k' "(qemu)" +_send_qemu_cmd $src 'migrate_set_parameter max-bandwidth 4k' "(qemu)" _send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" _send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" _send_qemu_cmd $src 'migrate_start_postcopy' "(qemu)" --=20 2.41.0 From nobody Thu Nov 28 09:57:08 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=1692979322; cv=none; d=zohomail.com; s=zohoarc; b=i9Tro80z5JrxD3dbq7aU/Z8fkHx7Upz6Lcd93IGxZs6eZti3Cw3Gae/hD730CD/za7M10/n4WdGxzAKKWt9pDFSP+mMlRYbbWU/iJvDegnceLvFmz7lVwPAwgEXbZZl2QBbRS70+IFREGuamApdzyxwHXZ6TsxlflWgAt6hKqNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692979322; 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=73p8xwR0d96Nyix6vnB3cwl7QN4+vXfcjkeK4cI/2ss=; b=jOgcmR4iZrKkDBeCocmaGjfr1dybKgpn/JfjC9RD1PvvKIPEliO9AKoxc46oSF6nxMWEfEWWsQBDVfPJNlN6ICnqFm8jfuilfFIYIrMiarM0dVdOr1jX+yPiwJc11jtQfuK7h8BvYuWZVjIa8eVzduiqCTtqchnpC1wYw7rVscQ= 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 16929793228192.130974089556503; Fri, 25 Aug 2023 09:02:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZZDj-0001SE-K5; Fri, 25 Aug 2023 11:59:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZZDi-0001RT-Ae for qemu-devel@nongnu.org; Fri, 25 Aug 2023 11:59:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZZDd-0004i5-9K for qemu-devel@nongnu.org; Fri, 25 Aug 2023 11:59:33 -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-460-urUrj2sUPHe1CAl-KlJE4Q-1; Fri, 25 Aug 2023 11:59:25 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4C8785D186; Fri, 25 Aug 2023 15:59:24 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A477B492C18; Fri, 25 Aug 2023 15:59:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9E8DF21E692B; Fri, 25 Aug 2023 17:59:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692979167; 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=73p8xwR0d96Nyix6vnB3cwl7QN4+vXfcjkeK4cI/2ss=; b=MnwoxaR2yHyoWgDIK1yh2wIZBaxITOwmoFB269F1zkW+DzzVRe2tRolfSPSd8HIRJY5kQ3 pe47tzeulCap1cou/zI5a29uCmOl5l4Fu/E6xLVHzHqmPwhP1N6jhSlThAHC+hMKW8BVAU leXZzXF+xGmQvBXzebD8hwi3goEpjdE= X-MC-Unique: urUrj2sUPHe1CAl-KlJE4Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, dave@treblig.org, thuth@redhat.com, qemu-block@nongnu.org, berrange@redhat.com, dgilbert@redhat.com, qemu-trivial@nongnu.org Subject: [PATCH 2/2] tests/qtest/test-hmp: Fix migrate_set_parameter xbzrle-cache-size test Date: Fri, 25 Aug 2023 17:59:23 +0200 Message-ID: <20230825155923.1983141-3-armbru@redhat.com> In-Reply-To: <20230825155923.1983141-1-armbru@redhat.com> References: <20230825155923.1983141-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692979323675100001 Content-Type: text/plain; charset="utf-8" The command always fails with "Error: Parameter 'xbzrle_cache_size' expects a power of two no less than the target page size". The test passes anyway. Change the argument from 1 to 64k to make the test a bit more useful. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- tests/qtest/test-hmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index c0d2d70689..fc9125f8bb 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -45,7 +45,7 @@ static const char *hmp_cmds[] =3D { "log all", "log none", "memsave 0 4096 \"/dev/null\"", - "migrate_set_parameter xbzrle-cache-size 1", + "migrate_set_parameter xbzrle-cache-size 64k", "migrate_set_parameter downtime-limit 1", "migrate_set_parameter max-bandwidth 1", "netdev_add user,id=3Dnet1", --=20 2.41.0