From nobody Mon Feb 9 10:48:09 2026 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=1620928216; cv=none; d=zohomail.com; s=zohoarc; b=A38h1WsDfAgTXQ0cq0gY0jSVm8VpjEYmNtk8/m0QyheGL3UoBUYrRituFOHtWkwDAcLSWsBjg5Nk2j3Vojl5BMxFviLS++bQGJvKnk9K1fDxo31lS6/P3diT7R7Hm+Vs7fPiW5KKwvPrvjJ8zwF5nlyAHfa81xyoOuzg93L28p4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620928216; 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=vw95cKxCzTvbM7sY282jlQFGv5+hd6tDamm/50/e+qs=; b=VgNa1IVA6ICM6AnVOpTAdVFH/xgyfTJB7rAOEwsC84/o8fev9AnT25GJcCfipTQlBPjr9TKLmSLGUJf8JIUnuu5NvpTg2JvBkqDr+zMndlK0SVs2Si4yuO607s+6Dxz8YCeUOm1/HcffzuI8pDD/i9j2WIAJTOSqyLD9saxTzc8= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620928216032897.0884198786688; Thu, 13 May 2021 10:50:16 -0700 (PDT) Received: from localhost ([::1]:59436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhFTS-0008JX-Sp for importer@patchew.org; Thu, 13 May 2021 13:50:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhFHa-0005HY-LR for qemu-devel@nongnu.org; Thu, 13 May 2021 13:37:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhFHY-00018t-Va for qemu-devel@nongnu.org; Thu, 13 May 2021 13:37:58 -0400 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-209-dg-Th5sRPUi8hJ2Kx-tTHg-1; Thu, 13 May 2021 13:37:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6206D80006E; Thu, 13 May 2021 17:37:53 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-113-200.ams2.redhat.com [10.36.113.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA4195D6AC; Thu, 13 May 2021 17:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620927476; 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=vw95cKxCzTvbM7sY282jlQFGv5+hd6tDamm/50/e+qs=; b=F/swjCbjmZg8E+fEHovRWJj574Cj9+czWtc8tyaqUnNJZ+uU3lVCFzSE1a0VMg/kiVy+Wd 5NEMS4On16qmyL/9He5P1OSJOGmz7/rr3OF8chg7odWKyJ/CZAQbV641q+13nEFF64d2VV n3gjnsHrqLDfZIKicaJe5XYOWRcLBus= X-MC-Unique: dg-Th5sRPUi8hJ2Kx-tTHg-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, david@redhat.com, zhukeqian1@huawei.com, jiangkunkun@huawei.com, armbru@redhat.com, peter.maydell@linaro.org, huangy81@chinatelecom.cn Subject: [PULL 04/17] migration: Drop redundant query-migrate result @blocked Date: Thu, 13 May 2021 18:37:24 +0100 Message-Id: <20210513173737.279402-5-dgilbert@redhat.com> In-Reply-To: <20210513173737.279402-1-dgilbert@redhat.com> References: <20210513173737.279402-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@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=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Markus Armbruster Result @blocked is redundant. Unfortunately, we realized this too close to the release to risk dropping it, so we deprecated it instead, in commit e11ce6c06. Since it was deprecated from the start, we can delete it without the customary grace period. Do so. Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20210429140424.2802929-1-armbru@redhat.com> Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 29 +++++++++++++---------------- monitor/hmp-cmds.c | 2 +- qapi/migration.json | 6 ------ 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 8ca034136b..fdadee290e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1073,27 +1073,24 @@ static void populate_vfio_info(MigrationInfo *info) static void fill_source_migration_info(MigrationInfo *info) { MigrationState *s =3D migrate_get_current(); + GSList *cur_blocker =3D migration_blockers; =20 - info->blocked =3D migration_is_blocked(NULL); - info->has_blocked_reasons =3D info->blocked; info->blocked_reasons =3D NULL; - if (info->blocked) { - GSList *cur_blocker =3D migration_blockers; =20 - /* - * There are two types of reasons a migration might be blocked; - * a) devices marked in VMState as non-migratable, and - * b) Explicit migration blockers - * We need to add both of them here. - */ - qemu_savevm_non_migratable_list(&info->blocked_reasons); + /* + * There are two types of reasons a migration might be blocked; + * a) devices marked in VMState as non-migratable, and + * b) Explicit migration blockers + * We need to add both of them here. + */ + qemu_savevm_non_migratable_list(&info->blocked_reasons); =20 - while (cur_blocker) { - QAPI_LIST_PREPEND(info->blocked_reasons, - g_strdup(error_get_pretty(cur_blocker->data)= )); - cur_blocker =3D g_slist_next(cur_blocker); - } + while (cur_blocker) { + QAPI_LIST_PREPEND(info->blocked_reasons, + g_strdup(error_get_pretty(cur_blocker->data))); + cur_blocker =3D g_slist_next(cur_blocker); } + info->has_blocked_reasons =3D info->blocked_reasons !=3D NULL; =20 switch (s->state) { case MIGRATION_STATUS_NONE: diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0ad5b77477..d9bef63373 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -224,7 +224,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) =20 migration_global_dump(mon); =20 - if (info->blocked) { + if (info->blocked_reasons) { strList *reasons =3D info->blocked_reasons; monitor_printf(mon, "Outgoing migration blocked:\n"); while (reasons) { diff --git a/qapi/migration.json b/qapi/migration.json index 0b17cce46b..7a5bdf9a0d 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -228,11 +228,6 @@ # Present and non-empty when migration is blocked. # (since 6.0) # -# @blocked: True if outgoing migration is blocked (since 6.0) -# -# Features: -# @deprecated: Member @blocked is deprecated. Use @blocked-reasons instea= d. -# # Since: 0.14 ## { 'struct': 'MigrationInfo', @@ -246,7 +241,6 @@ '*setup-time': 'int', '*cpu-throttle-percentage': 'int', '*error-desc': 'str', - 'blocked': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*blocked-reasons': ['str'], '*postcopy-blocktime' : 'uint32', '*postcopy-vcpu-blocktime': ['uint32'], --=20 2.31.1