From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250599; cv=none; d=zohomail.com; s=zohoarc; b=NmWdZDkDlKWFILjolADQCpW1abRNLqOAYKcNMX6YVlN2O399/8m3iEOFuea/qw2PoBGICE+r1LkIZfvCG5xiX2laJJBJI4xKkNR7rW67srnkLU1b98S35D79/qhg+v1KRXAH0+OCw23QbKQX028ySi8S6zF/sKjqXR4SOfvHZOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250599; 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=j1KuvpX+tCgUhZIK/rgs/gHcu3KBWyNP/amqjnIWs/A=; b=GedPP53f5lWm54+Lo+NsoA+dfqgIg5LwNXbU3vPtWVdQhWnDlQY+dXL0i1Gmq0r5faP/uP2lZ9ZbHceqhp8ezsDabQlYhtbQOxwTu7r38LtlTsLY8qywn5El7cmSBlTMyB4jdZFCkA3j4/A3AUhvemKA2W4M3AxB4iAhSLsr09M= 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 1605250599467179.4660581437048; Thu, 12 Nov 2020 22:56:39 -0800 (PST) Received: from localhost ([::1]:34692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdT0g-0007g3-Em for importer@patchew.org; Fri, 13 Nov 2020 01:56:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSwv-0003dq-2e for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSws-0006EU-0W for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52: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-21-u8HhlRY6MOuWy6APtgNwTg-1; Fri, 13 Nov 2020 01:52:38 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0AD15F9E3 for ; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 989EF19C66; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 21FCD11386A3; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250361; 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=j1KuvpX+tCgUhZIK/rgs/gHcu3KBWyNP/amqjnIWs/A=; b=Tj6uQ/FLaWVL575lZWQ3dmuXgfGcK+DbYKZqKYQzshjqevdlmPpeZvXEAQV52FPy3vsfoc hs1BhVKKrv9vHYSgWs1sdXZq57FWmdTt39wnxTbKa8+E95DxV87iN2llFvylLUD9VTEcHu UpJ3JNoQCdGWrYYlAjeyZDUImHa0GeI= X-MC-Unique: u8HhlRY6MOuWy6APtgNwTg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/6] migration: Fix and clean up around @tls-authz Date: Fri, 13 Nov 2020 07:52:31 +0100 Message-Id: <20201113065236.2644169-2-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action 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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit d2f1d29b95 "migration: add support for a "tls-authz" migration parameter" added MigrationParameters member @tls-authz. Whereas the other members aren't really optional (see commit 1bda8b3c695), this one is genuinely optional: migration_instance_init() leaves it absent, and migration_tls_channel_process_incoming() passes it to qcrypto_tls_session_new(), which checks for null. Commit d2f1d29b95 has a number of issues, though: * When qmp_query_migrate_parameters() copies migration parameters into its reply, it ignores has_tls_authz, and assumes true instead. When it is false, - HMP info migrate_parameters prints the null pointer (crash bug on some systems), and - QMP query-migrate-parameters replies "tls-authz": "" (because the QObject output visitor silently maps null pointer to "", which it really shouldn't). The HMP defect was noticed and fixed in commit 7cd75cbdb8 'migration: use "" instead of (null) for tls-authz'. Unfortunately, the fix papered over the real bug: it made qmp_query_migrate_parameters() map null tls_authz to "". It also dropped the check for has_tls_authz from hmp_info_migrate_parameters(). Revert, and fix qmp_query_migrate_parameters() not to screw up has_tls_authz. No change to HMP. QMP now has "tls-authz" in the reply only when it's actually present in migrate_get_current()->parameters. If we prefer to remain bug-compatible, we should make tls_authz non-optional there. * migrate_params_test_apply() neglects to apply tls_authz. Currently harmless, because migrate_params_check() doesn't care. Fix it anyway. * qmp_migrate_set_parameters() crashes: {"execute": "migrate-set-parameters", "arguments": {"tls-authz": null}} Add the necessary rewrite of null to "". For background information, see commit 01fa559826 "migration: Use JSON null instead of "" to reset parameter to default". Fixes: d2f1d29b95aa45d13262b39153ff501ed6b1ac95 Cc: Daniel P. Berrang=C3=A9 Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert --- qapi/migration.json | 2 +- migration/migration.c | 17 ++++++++++++++--- monitor/hmp-cmds.c | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 3c75820527..688e8da749 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -928,7 +928,7 @@ ## # @MigrationParameters: # -# The optional members aren't actually optional. +# The optional members aren't actually optional, except for @tls-authz. # # @announce-initial: Initial delay (in milliseconds) before sending the # first announce (Since 4.0) diff --git a/migration/migration.c b/migration/migration.c index 3263aa55a9..cad56fbf8c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -855,9 +855,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error= **errp) params->tls_creds =3D g_strdup(s->parameters.tls_creds); params->has_tls_hostname =3D true; params->tls_hostname =3D g_strdup(s->parameters.tls_hostname); - params->has_tls_authz =3D true; - params->tls_authz =3D g_strdup(s->parameters.tls_authz ? - s->parameters.tls_authz : ""); + params->has_tls_authz =3D s->parameters.has_tls_authz; + params->tls_authz =3D g_strdup(s->parameters.tls_authz); params->has_max_bandwidth =3D true; params->max_bandwidth =3D s->parameters.max_bandwidth; params->has_downtime_limit =3D true; @@ -1433,6 +1432,11 @@ static void migrate_params_test_apply(MigrateSetPara= meters *params, dest->tls_hostname =3D params->tls_hostname->u.s; } =20 + if (params->has_tls_authz) { + assert(params->tls_authz->type =3D=3D QTYPE_QSTRING); + dest->tls_authz =3D params->tls_authz->u.s; + } + if (params->has_max_bandwidth) { dest->max_bandwidth =3D params->max_bandwidth; } @@ -1622,6 +1626,13 @@ void qmp_migrate_set_parameters(MigrateSetParameters= *params, Error **errp) params->tls_hostname->type =3D QTYPE_QSTRING; params->tls_hostname->u.s =3D strdup(""); } + /* TODO Rewrite "" to null instead */ + if (params->has_tls_authz + && params->tls_authz->type =3D=3D QTYPE_QNULL) { + qobject_unref(params->tls_authz->u.n); + params->tls_authz->type =3D QTYPE_QSTRING; + params->tls_authz->u.s =3D strdup(""); + } =20 migrate_params_test_apply(params, &tmp); =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index a6a6684df1..492789248f 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -476,7 +476,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QD= ict *qdict) params->max_postcopy_bandwidth); monitor_printf(mon, "%s: '%s'\n", MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ), - params->tls_authz); + params->has_tls_authz ? params->tls_authz : ""); =20 if (params->has_block_bitmap_mapping) { const BitmapMigrationNodeAliasList *bmnal; --=20 2.26.2 From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250427; cv=none; d=zohomail.com; s=zohoarc; b=Q7xj/3aQhNyn8q2HbkznVyRvbH9hJjgpYXSlDsX5jGi6xupkJqfc6lL3irrMS/L5Dp9le79WpPXV9qbCtPDPq090uXWKEr6a3xb4p49A/7Fs0AcKLehHlt+4wY/iexGWuRTXpZRRonHRpqf/2fFfu+GaX5raptwsi3ZuE+0i8DU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250427; 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=0u0jRF8PhO5IpV2JDmusHqZbrngV1YuoTb/jyYOt/Aw=; b=dhyimgbsHmxx/f+tc1tYKmYXTELc1k1voABDkE1Ys6m0f0wA2doLPSTLb53jSqJcrrHufuszq2aTAk6E5AKA1WT2kVp84xa5KGHjXWIA/VtGY289mVL9da5m4200cFlRutNsXK0CiVNyFGOz3c4Kwh0BuQq8JU8W9dA3b2KNThg= 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 1605250427106418.71030366606817; Thu, 12 Nov 2020 22:53:47 -0800 (PST) Received: from localhost ([::1]:56174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdSxt-0004rU-F5 for importer@patchew.org; Fri, 13 Nov 2020 01:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSwu-0003do-UX for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSwr-0006EF-Qm for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52: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-513-l06yr7prOgmjhQWl96g5cg-1; Fri, 13 Nov 2020 01:52:39 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 082CA1006CA7 for ; Fri, 13 Nov 2020 06:52:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A833519C71; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 25E101138603; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250360; 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=0u0jRF8PhO5IpV2JDmusHqZbrngV1YuoTb/jyYOt/Aw=; b=KogtU8ozXuqg45f9mi/RcV3pf1pMnXMASRLuTvlT2HoxhTQptOWubMFRhVfDzlIQQY0J1m FPkl2DLdN73DCyrrFL9F9H8biOk+glGm0HA4APkSheDto9m6d6tU2pBbFfLQRQnoyxQ/wc T9HL7FdLTjcciYOjEgONZraFqKRGVW0= X-MC-Unique: l06yr7prOgmjhQWl96g5cg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/6] migration: Fix migrate-set-parameters argument validation Date: Fri, 13 Nov 2020 07:52:32 +0100 Message-Id: <20201113065236.2644169-3-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, quintela@redhat.com 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" Commit 741d4086c8 "migration: Use proper types in json" (v2.12.0) switched MigrationParameters to narrower integer types, and removed the simplified qmp_migrate_set_parameters()'s argument checking accordingly. Good idea, except qmp_migrate_set_parameters() takes MigrateSetParameters, not MigrationParameters. Its job is updating migrate_get_current()->parameters (which *is* of type MigrationParameters) according to its argument. The integers now get truncated silently. Reproducer: ---> {'execute': 'query-migrate-parameters'} <--- {"return": {[...] "compress-threads": 8, [...]}} ---> {"execute": "migrate-set-parameters", "arguments": {"compress-thre= ads": 257}} <--- {"return": {}} ---> {'execute': 'query-migrate-parameters'} <--- {"return": {[...] "compress-threads": 1, [...]}} Fix by resynchronizing MigrateSetParameters with MigrationParameters. Fixes: 741d4086c856320807a2575389d7c0505578270b Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert --- qapi/migration.json | 28 ++++++++++++++-------------- monitor/hmp-cmds.c | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 688e8da749..3ad3720cf0 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -885,28 +885,28 @@ '*announce-max': 'size', '*announce-rounds': 'size', '*announce-step': 'size', - '*compress-level': 'int', - '*compress-threads': 'int', + '*compress-level': 'uint8', + '*compress-threads': 'uint8', '*compress-wait-thread': 'bool', - '*decompress-threads': 'int', - '*throttle-trigger-threshold': 'int', - '*cpu-throttle-initial': 'int', - '*cpu-throttle-increment': 'int', + '*decompress-threads': 'uint8', + '*throttle-trigger-threshold': 'uint8', + '*cpu-throttle-initial': 'uint8', + '*cpu-throttle-increment': 'uint8', '*cpu-throttle-tailslow': 'bool', '*tls-creds': 'StrOrNull', '*tls-hostname': 'StrOrNull', '*tls-authz': 'StrOrNull', - '*max-bandwidth': 'int', - '*downtime-limit': 'int', - '*x-checkpoint-delay': 'int', + '*max-bandwidth': 'size', + '*downtime-limit': 'uint64', + '*x-checkpoint-delay': 'uint32', '*block-incremental': 'bool', - '*multifd-channels': 'int', + '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', - '*max-cpu-throttle': 'int', + '*max-cpu-throttle': 'uint8', '*multifd-compression': 'MultiFDCompression', - '*multifd-zlib-level': 'int', - '*multifd-zstd-level': 'int', + '*multifd-zlib-level': 'uint8', + '*multifd-zstd-level': 'uint8', '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } } =20 ## @@ -1093,7 +1093,7 @@ '*max-bandwidth': 'size', '*downtime-limit': 'uint64', '*x-checkpoint-delay': 'uint32', - '*block-incremental': 'bool' , + '*block-incremental': 'bool', '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 492789248f..f8ef061510 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1292,11 +1292,11 @@ void hmp_migrate_set_parameter(Monitor *mon, const = QDict *qdict) switch (val) { case MIGRATION_PARAMETER_COMPRESS_LEVEL: p->has_compress_level =3D true; - visit_type_int(v, param, &p->compress_level, &err); + visit_type_uint8(v, param, &p->compress_level, &err); break; case MIGRATION_PARAMETER_COMPRESS_THREADS: p->has_compress_threads =3D true; - visit_type_int(v, param, &p->compress_threads, &err); + visit_type_uint8(v, param, &p->compress_threads, &err); break; case MIGRATION_PARAMETER_COMPRESS_WAIT_THREAD: p->has_compress_wait_thread =3D true; @@ -1304,19 +1304,19 @@ void hmp_migrate_set_parameter(Monitor *mon, const = QDict *qdict) break; case MIGRATION_PARAMETER_DECOMPRESS_THREADS: p->has_decompress_threads =3D true; - visit_type_int(v, param, &p->decompress_threads, &err); + visit_type_uint8(v, param, &p->decompress_threads, &err); break; case MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD: p->has_throttle_trigger_threshold =3D true; - visit_type_int(v, param, &p->throttle_trigger_threshold, &err); + visit_type_uint8(v, param, &p->throttle_trigger_threshold, &err); break; case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL: p->has_cpu_throttle_initial =3D true; - visit_type_int(v, param, &p->cpu_throttle_initial, &err); + visit_type_uint8(v, param, &p->cpu_throttle_initial, &err); break; case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT: p->has_cpu_throttle_increment =3D true; - visit_type_int(v, param, &p->cpu_throttle_increment, &err); + visit_type_uint8(v, param, &p->cpu_throttle_increment, &err); break; case MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW: p->has_cpu_throttle_tailslow =3D true; @@ -1324,7 +1324,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QD= ict *qdict) break; case MIGRATION_PARAMETER_MAX_CPU_THROTTLE: p->has_max_cpu_throttle =3D true; - visit_type_int(v, param, &p->max_cpu_throttle, &err); + visit_type_uint8(v, param, &p->max_cpu_throttle, &err); break; case MIGRATION_PARAMETER_TLS_CREDS: p->has_tls_creds =3D true; @@ -1360,11 +1360,11 @@ void hmp_migrate_set_parameter(Monitor *mon, const = QDict *qdict) break; case MIGRATION_PARAMETER_DOWNTIME_LIMIT: p->has_downtime_limit =3D true; - visit_type_int(v, param, &p->downtime_limit, &err); + visit_type_size(v, param, &p->downtime_limit, &err); break; case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY: p->has_x_checkpoint_delay =3D true; - visit_type_int(v, param, &p->x_checkpoint_delay, &err); + visit_type_uint32(v, param, &p->x_checkpoint_delay, &err); break; case MIGRATION_PARAMETER_BLOCK_INCREMENTAL: p->has_block_incremental =3D true; @@ -1372,7 +1372,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QD= ict *qdict) break; case MIGRATION_PARAMETER_MULTIFD_CHANNELS: p->has_multifd_channels =3D true; - visit_type_int(v, param, &p->multifd_channels, &err); + visit_type_uint8(v, param, &p->multifd_channels, &err); break; case MIGRATION_PARAMETER_MULTIFD_COMPRESSION: p->has_multifd_compression =3D true; @@ -1381,11 +1381,11 @@ void hmp_migrate_set_parameter(Monitor *mon, const = QDict *qdict) break; case MIGRATION_PARAMETER_MULTIFD_ZLIB_LEVEL: p->has_multifd_zlib_level =3D true; - visit_type_int(v, param, &p->multifd_zlib_level, &err); + visit_type_uint8(v, param, &p->multifd_zlib_level, &err); break; case MIGRATION_PARAMETER_MULTIFD_ZSTD_LEVEL: p->has_multifd_zstd_level =3D true; - visit_type_int(v, param, &p->multifd_zstd_level, &err); + visit_type_uint8(v, param, &p->multifd_zstd_level, &err); break; case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE: p->has_xbzrle_cache_size =3D true; --=20 2.26.2 From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250428; cv=none; d=zohomail.com; s=zohoarc; b=OmSyVSgBD8qwAeCeXUeABRE5WvX40FZS5ElejtPnaZkNbTSNEdMWYm4vAJGMWBBCzvB6GkBE2cdHVOH4Z4+cl1izFopiCDcZ+RzZAJGWDMX9c74gb4GIA3B6lKnnTfDtreoXdRolo7ma4wzejIvbe3Whi79QyJBSFr5EKOMhHb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250427; 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=PSMGqAcqpFO3PXlsQxszL2ylrEgZdL+0PDflQgkyrQQ=; b=fMDNrn9Z91njAQ4n4TJCX4B/gw3Zb9McQF9iq6TcZsOmzgadWLFDUhTir6whaeVJJBb06hMKhfD7cl277k5KZb788OaFGFMNCQrGxZOz5ZJ/19Qua+nGeiqZcPVlZB/hVVLyeMYhxSZT0kC/T5yJBaJYqc6LKdAsOUikb3LLmyE= 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 1605250427995804.7279757919258; Thu, 12 Nov 2020 22:53:47 -0800 (PST) Received: from localhost ([::1]:56250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdSxu-0004tO-0X for importer@patchew.org; Fri, 13 Nov 2020 01:53:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSwv-0003e1-Dv for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSwr-0006EC-Oz for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:45 -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-493-fwEBcUaqMQSxNuXLtnPW0w-1; Fri, 13 Nov 2020 01:52:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED132804775 for ; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 989AB1002C02; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2918D113861C; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250360; 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=PSMGqAcqpFO3PXlsQxszL2ylrEgZdL+0PDflQgkyrQQ=; b=DTBVMj+/LIUQ2ITLrsRlhwuNGTHMlPyRuLQHwB+dEmFFNUQ1+WUKv66CScEiuIiIhNO4m1 AmbClyZI3rpXKplIuKf5J76Fj/RtVn4vGs4b6gDEMuM3IkNnmQgMM0Fnk4Ifd9AHnOwqhl NVNOzXZPj8v/ofEw+oXNsU8YjJsH4qY= X-MC-Unique: fwEBcUaqMQSxNuXLtnPW0w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/6] migration: Clean up signed vs. unsigned XBZRLE cache-size Date: Fri, 13 Nov 2020 07:52:33 +0100 Message-Id: <20201113065236.2644169-4-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, quintela@redhat.com 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" 73af8dd8d7 "migration: Make xbzrle_cache_size a migration parameter" (v2.11.0) made the new parameter unsigned (QAPI type 'size', uint64_t in C). It neglected to update existing code, which continues to use int64_t. migrate_xbzrle_cache_size() returns the new parameter. Adjust its return type. QMP query-migrate-cache-size returns migrate_xbzrle_cache_size(). Adjust its return type. migrate-set-parameters passes the new parameter to xbzrle_cache_resize(). Adjust its parameter type. xbzrle_cache_resize() passes it on to cache_init(). Adjust its parameter type. Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert --- qapi/migration.json | 4 ++-- migration/migration.h | 2 +- migration/page_cache.h | 2 +- migration/ram.h | 2 +- migration/migration.c | 4 ++-- migration/page_cache.c | 2 +- migration/ram.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 3ad3720cf0..e8a4dfecce 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -78,7 +78,7 @@ # Since: 1.2 ## { 'struct': 'XBZRLECacheStats', - 'data': {'cache-size': 'int', 'bytes': 'int', 'pages': 'int', + 'data': {'cache-size': 'size', 'bytes': 'int', 'pages': 'int', 'cache-miss': 'int', 'cache-miss-rate': 'number', 'encoding-rate': 'number', 'overflow': 'int' } } =20 @@ -1465,7 +1465,7 @@ # <- { "return": 67108864 } # ## -{ 'command': 'query-migrate-cache-size', 'returns': 'int', +{ 'command': 'query-migrate-cache-size', 'returns': 'size', 'features': [ 'deprecated' ] } =20 ## diff --git a/migration/migration.h b/migration/migration.h index d096b77f74..0387dc40d6 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -324,7 +324,7 @@ int migrate_multifd_zlib_level(void); int migrate_multifd_zstd_level(void); =20 int migrate_use_xbzrle(void); -int64_t migrate_xbzrle_cache_size(void); +uint64_t migrate_xbzrle_cache_size(void); bool migrate_colo_enabled(void); =20 bool migrate_use_block(void); diff --git a/migration/page_cache.h b/migration/page_cache.h index 0cb94498a0..8733b4df6e 100644 --- a/migration/page_cache.h +++ b/migration/page_cache.h @@ -28,7 +28,7 @@ typedef struct PageCache PageCache; * @page_size: cache page size * @errp: set *errp if the check failed, with reason */ -PageCache *cache_init(int64_t cache_size, size_t page_size, Error **errp); +PageCache *cache_init(uint64_t cache_size, size_t page_size, Error **errp); /** * cache_fini: free all cache resources * @cache pointer to the PageCache struct diff --git a/migration/ram.h b/migration/ram.h index 011e85414e..016eaa3378 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -47,7 +47,7 @@ bool ramblock_is_ignored(RAMBlock *block); INTERNAL_RAMBLOCK_FOREACH(block) \ if (!qemu_ram_is_migratable(block)) {} else =20 -int xbzrle_cache_resize(int64_t new_size, Error **errp); +int xbzrle_cache_resize(uint64_t new_size, Error **errp); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_total(void); =20 diff --git a/migration/migration.c b/migration/migration.c index cad56fbf8c..3daed2da0e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2226,7 +2226,7 @@ void qmp_migrate_set_cache_size(int64_t value, Error = **errp) qmp_migrate_set_parameters(&p, errp); } =20 -int64_t qmp_query_migrate_cache_size(Error **errp) +uint64_t qmp_query_migrate_cache_size(Error **errp) { return migrate_xbzrle_cache_size(); } @@ -2456,7 +2456,7 @@ int migrate_use_xbzrle(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE]; } =20 -int64_t migrate_xbzrle_cache_size(void) +uint64_t migrate_xbzrle_cache_size(void) { MigrationState *s; =20 diff --git a/migration/page_cache.c b/migration/page_cache.c index 098b436223..b384f265fb 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -38,7 +38,7 @@ struct PageCache { size_t num_items; }; =20 -PageCache *cache_init(int64_t new_size, size_t page_size, Error **errp) +PageCache *cache_init(uint64_t new_size, size_t page_size, Error **errp) { int64_t i; size_t num_pages =3D new_size / page_size; diff --git a/migration/ram.c b/migration/ram.c index add5396a62..a84425d04f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -126,7 +126,7 @@ static void XBZRLE_cache_unlock(void) * @new_size: new cache size * @errp: set *errp if the check failed, with reason */ -int xbzrle_cache_resize(int64_t new_size, Error **errp) +int xbzrle_cache_resize(uint64_t new_size, Error **errp) { PageCache *new_cache; int64_t ret =3D 0; --=20 2.26.2 From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250427; cv=none; d=zohomail.com; s=zohoarc; b=nc0cQbHibZak8tH5DyNi0nVf76ftpGxftiUL4TNqPDvAiE5ZpRDyF/0WFSjRd+bt+QKIn/HrOcfwF2FT6REQ0fRIx0mc4SJh5r+9hUhgN1ZRQSzxIToI8aqwh2oLl2rdGaD8eSc7STNu+f7eMGjIthFq2RRyv/EIHOA8Kjvgrkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250427; 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=r34988DNBTpFNOk9EIdt1tJzaGPoIlQa3XjvfuNUiC0=; b=EfbR6v5CzIm8k4Bl0KkLybiHyJvf7FGD/UWYDiTAEtuwHXvMWwIodKZIExA0E7j+SGCYZJkVpFENSKD5JFQvdLzXDHxxTcIGXxrpQnDk+LcOGmfxyGdjUcFV0yVD4diABsyWTJoC+LxnSytxl19oRKtDXqi5LxTpuDvROH2+oms= 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 1605250427142741.8050356525198; Thu, 12 Nov 2020 22:53:47 -0800 (PST) Received: from localhost ([::1]:56184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdSxt-0004rj-7g for importer@patchew.org; Fri, 13 Nov 2020 01:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSwt-0003cU-PE for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSwr-0006EA-Qk for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:43 -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-493-Q3yxXE_PPZSeEr7e-PwOig-1; Fri, 13 Nov 2020 01:52:38 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C83F7106B819 for ; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 989A260C15; Fri, 13 Nov 2020 06:52:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2C1C911385C9; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250360; 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=r34988DNBTpFNOk9EIdt1tJzaGPoIlQa3XjvfuNUiC0=; b=C8tfAfR+i1Jnh7YIV7vqIj/sywsHDiBBbZNNy3TzUwimKGXADnyPDVNqlYp2hH0A7DVpMh WH+92K5sK5gzOuo2mp6ZPctrmhyv5WCW5d5/CE5+85omkEphSNIKZIwhJqJJ6wTP6vfBkX u7OPSfjAq/n7u0svEPJrYkd9jau0PEo= X-MC-Unique: Q3yxXE_PPZSeEr7e-PwOig-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 4/6] migration: Check xbzrle-cache-size more carefully Date: Fri, 13 Nov 2020 07:52:34 +0100 Message-Id: <20201113065236.2644169-5-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, quintela@redhat.com 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" migrate-set-parameters passes the size to xbzrle_cache_resize(). xbzrle_cache_resize() checks it fits into size_t before it passes it on to cache_init(). cache_init() checks it is a power of two no smaller than @page_size. cache_init() is also called from xbzrle_init(), bypassing xbzrle_cache_resize()'s check. Drop xbzrle_cache_resize()'s check, and check more carefully in cache_init(). Signed-off-by: Markus Armbruster --- migration/page_cache.c | 15 ++++----------- migration/ram.c | 7 ------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/migration/page_cache.c b/migration/page_cache.c index b384f265fb..e07f4ad1dc 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -41,17 +41,10 @@ struct PageCache { PageCache *cache_init(uint64_t new_size, size_t page_size, Error **errp) { int64_t i; - size_t num_pages =3D new_size / page_size; + uint64_t num_pages =3D new_size / page_size; PageCache *cache; =20 - if (new_size < page_size) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "is smaller than one target page size"); - return NULL; - } - - /* round down to the nearest power of 2 */ - if (!is_power_of_2(num_pages)) { + if (num_pages !=3D (size_t)num_pages || !is_power_of_2(num_pages)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", "is not a power of two number of pages"); return NULL; @@ -71,8 +64,8 @@ PageCache *cache_init(uint64_t new_size, size_t page_size= , Error **errp) trace_migration_pagecache_init(cache->max_num_items); =20 /* We prefer not to abort if there is no memory */ - cache->page_cache =3D g_try_malloc((cache->max_num_items) * - sizeof(*cache->page_cache)); + cache->page_cache =3D g_try_malloc_n(cache->max_num_items, + sizeof(*cache->page_cache)); if (!cache->page_cache) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", "Failed to allocate page cache"); diff --git a/migration/ram.c b/migration/ram.c index a84425d04f..d632ae694c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -131,13 +131,6 @@ int xbzrle_cache_resize(uint64_t new_size, Error **err= p) PageCache *new_cache; int64_t ret =3D 0; =20 - /* Check for truncation */ - if (new_size !=3D (size_t)new_size) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "exceeding address space"); - return -1; - } - if (new_size =3D=3D migrate_xbzrle_cache_size()) { /* nothing to do */ return 0; --=20 2.26.2 From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250757; cv=none; d=zohomail.com; s=zohoarc; b=WZ1tEU/SXtx8MOJIBvWPMvKJZMc9fP1+rQHsylvzFg0ibZ6/J0E8CMd6O7SHm++eyJPFh6vlkHJHx4anfzLVXXA209rped/xAhStwr5os0S/pha4qWi3JedN9489ew7gtpY+Z+5ndZJxHNZHMmPy8O+ZQA7ze/rNnrdmeiDyj7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250757; 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=EH/+jWkJd9DbUpLMZC60zJbA0W9CEfAAxjKWY7zYW14=; b=Sac9vosoy6vHqGUsFpRN4kgtISGOCB12g8oCdAAH1JVWuMHhaIFLEwXBgugzryQUs57lWutCLCgqrZIUfZyfplKvGYiIjO3mAhnlIsNBfk1mwKOZD53MR/GApODmJyc3tudBdqHSGSq/86GI0sBAWzkNGYFS7LPuHh9a3SPFg4k= 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 1605250757811164.0708524436227; Thu, 12 Nov 2020 22:59:17 -0800 (PST) Received: from localhost ([::1]:41806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdT3E-0002Rf-ET for importer@patchew.org; Fri, 13 Nov 2020 01:59:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSww-0003ek-Hm for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSwt-0006FL-5C for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:46 -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-410-X6wrjRU9M4SElX-d87y2uQ-1; Fri, 13 Nov 2020 01:52:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B77F1006C89 for ; Fri, 13 Nov 2020 06:52:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C6055B4B0; Fri, 13 Nov 2020 06:52:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2F27E11385CA; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250362; 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=EH/+jWkJd9DbUpLMZC60zJbA0W9CEfAAxjKWY7zYW14=; b=ZuRXXeepckBmNbdGnlO0ra+4nXpTiDrXQ2dc92bpkvDbdMSdKXZrwgya6ffX9dLUdQnD52 yXBh7MQeIWHt3OX76vPTAy1GZf9PSp4rShz0V1/RR6IKWuGYEIiAutvRgYO55txyBA0gSx Q3VT0jldez4gi8mgUzqQemfs3BAM7TY= X-MC-Unique: X6wrjRU9M4SElX-d87y2uQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 5/6] migration: Fix cache_init()'s "Failed to allocate" error messages Date: Fri, 13 Nov 2020 07:52:35 +0100 Message-Id: <20201113065236.2644169-6-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, quintela@redhat.com 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" cache_init() attempts to handle allocation failure.. The two error messages are garbage, as untested error messages commonly are: Parameter 'cache size' expects Failed to allocate cache Parameter 'cache size' expects Failed to allocate page cache Fix them to just Failed to allocate cache Failed to allocate page cache Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert --- migration/page_cache.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/page_cache.c b/migration/page_cache.c index e07f4ad1dc..ed979eeb45 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -53,8 +53,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size= , Error **errp) /* We prefer not to abort if there is no memory */ cache =3D g_try_malloc(sizeof(*cache)); if (!cache) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "Failed to allocate cache"); + error_setg(errp, "Failed to allocate cache"); return NULL; } cache->page_size =3D page_size; @@ -67,8 +66,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size= , Error **errp) cache->page_cache =3D g_try_malloc_n(cache->max_num_items, sizeof(*cache->page_cache)); if (!cache->page_cache) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "Failed to allocate page cache"); + error_setg(errp, "Failed to allocate page cache"); g_free(cache); return NULL; } --=20 2.26.2 From nobody Sun May 5 01:44:13 2024 Delivered-To: importer@patchew.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=1605250593; cv=none; d=zohomail.com; s=zohoarc; b=cHUhLZ3o/cMXRVC+7KZ55B9q+01Q5ydHH7s2+eV/qtt6q+IPbFDwjgad+RtcVwPqfs7CYSvSdyctgB691M3UjjHeu6MmvGYBqsWUmbC1y2lFRJxcfBR9rmM4wB1rKz1XSYQzGgbEBokLSTncF7bP1hO3ygKQvM6sxECx8uH6tCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605250593; 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=RLctlAVT6m71TV/FExcY57hOzH4ilBb5sK2BErLwZJA=; b=h6wBxYKZVZLy/49FA3QljDsv3o/53V0fK9LpZf4aTVMT6znS5bFvgJFJQTp1sSp9hJ/WBeA6B3YJgkrvNrMmi25v0wqVFRv73l2onnNB1EjBsGRqAjQeFj2oT6Q9WQd7diHBvZfQdiMN876cdtpytnxkUkMKJxZOkPEBcGRwa9E= 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 1605250593947472.5258808837177; Thu, 12 Nov 2020 22:56:33 -0800 (PST) Received: from localhost ([::1]:34548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdT0a-0007cQ-TK for importer@patchew.org; Fri, 13 Nov 2020 01:56:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdSww-0003eK-3P for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdSws-0006FJ-MO for qemu-devel@nongnu.org; Fri, 13 Nov 2020 01:52:45 -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-47-bK24xIstP9icetaziRF4CA-1; Fri, 13 Nov 2020 01:52:40 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75835804763 for ; Fri, 13 Nov 2020 06:52:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08EFD60C0F; Fri, 13 Nov 2020 06:52:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3239411384A8; Fri, 13 Nov 2020 07:52:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605250362; 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=RLctlAVT6m71TV/FExcY57hOzH4ilBb5sK2BErLwZJA=; b=KFcpPMfgqBPIsDoEOwRNPBzfpzdzHuaOQLvFSeCAjoO2ex9Ln7p2C6G8S+vzDJP/y9k0VT iqRSYwLPQKnCtm5n1uxI/lx7dX4igDaG9g/n5Ftz08b6SOQeKhYlbJ8Y2+FyAnE4DXEJGh XUjL7TGe5/Miy3A+0QK2qx48Oc9XqQo= X-MC-Unique: bK24xIstP9icetaziRF4CA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 6/6] migration: Fix a few absurdly defective error messages Date: Fri, 13 Nov 2020 07:52:36 +0100 Message-Id: <20201113065236.2644169-7-armbru@redhat.com> In-Reply-To: <20201113065236.2644169-1-armbru@redhat.com> References: <20201113065236.2644169-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, quintela@redhat.com 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" migrate_params_check() has a number of error messages of the form Parameter 'NAME' expects is invalid, it should be ... Fix them to something like Parameter 'NAME' expects a ... Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 3daed2da0e..5f9a10909d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1240,21 +1240,21 @@ static bool migrate_params_check(MigrationParameter= s *params, Error **errp) if (params->has_compress_level && (params->compress_level > 9)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level", - "is invalid, it should be in the range of 0 to 9"); + "a value between 0 and 9"); return false; } =20 if (params->has_compress_threads && (params->compress_threads < 1)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_threads", - "is invalid, it should be in the range of 1 to 255"); + "a value between 1 and 255"); return false; } =20 if (params->has_decompress_threads && (params->decompress_threads < 1)= ) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "decompress_threads", - "is invalid, it should be in the range of 1 to 255"); + "a value between 1 and 255"); return false; } =20 @@ -1307,21 +1307,21 @@ static bool migrate_params_check(MigrationParameter= s *params, Error **errp) if (params->has_multifd_channels && (params->multifd_channels < 1)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_channels", - "is invalid, it should be in the range of 1 to 255"); + "a value between 1 and 255"); return false; } =20 if (params->has_multifd_zlib_level && (params->multifd_zlib_level > 9)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level= ", - "is invalid, it should be in the range of 0 to 9"); + "a value between 0 and 9"); return false; } =20 if (params->has_multifd_zstd_level && (params->multifd_zstd_level > 20)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level= ", - "is invalid, it should be in the range of 0 to 20"); + "a value between 0 and 20"); return false; } =20 @@ -1330,8 +1330,7 @@ static bool migrate_params_check(MigrationParameters = *params, Error **errp) !is_power_of_2(params->xbzrle_cache_size))) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "xbzrle_cache_size", - "is invalid, it should be bigger than target page size" - " and a power of 2"); + "a power of two no less than the target page size"); return false; } =20 @@ -1348,21 +1347,21 @@ static bool migrate_params_check(MigrationParameter= s *params, Error **errp) params->announce_initial > 100000) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "announce_initial", - "is invalid, it must be less than 100000 ms"); + "a value between 0 and 100000"); return false; } if (params->has_announce_max && params->announce_max > 100000) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "announce_max", - "is invalid, it must be less than 100000 ms"); + "a value between 0 and 100000"); return false; } if (params->has_announce_rounds && params->announce_rounds > 1000) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "announce_rounds", - "is invalid, it must be in the range of 0 to 1000"); + "a value between 0 and 1000"); return false; } if (params->has_announce_step && @@ -1370,7 +1369,7 @@ static bool migrate_params_check(MigrationParameters = *params, Error **errp) params->announce_step > 10000)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "announce_step", - "is invalid, it must be in the range of 1 to 10000 ms"); + "a value between 0 and 10000"); return false; } =20 --=20 2.26.2