From nobody Mon Feb 9 23:00:21 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=1658151751; cv=none; d=zohomail.com; s=zohoarc; b=SKvNnrWpn/CBmE1mNPfHWHUjOBdhfpeTSjnrES8wvjX3MFNpzSBq8duksIzd24nhk5/o6/Pj2r5Kr+97j1GJXD4mNTZheGsQIZEOIkxmqsClpdc83xTXtU9OY6Zm2nRp97jH/80GPswqEaBiLXGMlzHB22M1Irk3zyGh2O0Me18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658151751; 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=6vEm/Wf0+FY+Lckc9c3Lx5BOBFUs270srqdXARP4/W8=; b=GaXrFYwu+ucoVrmEUQFvkkgybK8fwZ/g2pswydaBh+Z9CjZCx8975HAmBE++dOjAcfP9hUK2mvrAR/8H1if7giSnU9fAB87ZmbHff4mK8XbIdnEZaO1AVTVFC/11sTb6DjoIEfbjsKF4WNp9yp7mg7pDjhyg7YeWnn3e3GYBZkY= 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 165815175145033.65079970570605; Mon, 18 Jul 2022 06:42:31 -0700 (PDT) Received: from localhost ([::1]:44736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDR14-0005WZ-ET for importer@patchew.org; Mon, 18 Jul 2022 09:42:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDQse-0007LW-UP for qemu-devel@nongnu.org; Mon, 18 Jul 2022 09:33:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:20862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDQsc-0007Nm-JR for qemu-devel@nongnu.org; Mon, 18 Jul 2022 09:33:47 -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-271-7a3wkYm_PeK5vs2AE_iLlw-1; Mon, 18 Jul 2022 09:33:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68E8D1C04B53; Mon, 18 Jul 2022 13:33:42 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85D392166B26; Mon, 18 Jul 2022 13:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658151226; 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=6vEm/Wf0+FY+Lckc9c3Lx5BOBFUs270srqdXARP4/W8=; b=QUVmmxve/qw+5f+1ChUMWmYpnNzRsAtCg0ywPok6WpIa7pKWLa7VFl503KUugN8CEiE3uR W4GVDNQZzIHW1eXjOAm3aaraoyGLkkCgX1QVxSReKJn1DQQ35/z4OOFuIIxTU3bzUeeTQM nsOteSFnP19b36++5SzwkP9bpmCcKJk= X-MC-Unique: 7a3wkYm_PeK5vs2AE_iLlw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Harpreet Singh Anand , Gautam Dawar , "Gonglei (Arei)" , Stefan Hajnoczi , Liuxiangdong , "Michael S. Tsirkin" , Laurent Vivier , Eli Cohen , Parav Pandit , Paolo Bonzini , Zhu Lingshan , Cornelia Huck , Jason Wang , Cindy Lu , Markus Armbruster , Eric Blake Subject: [PATCH 5/5] vdpa: Delete CVQ migration blocker Date: Mon, 18 Jul 2022 15:33:21 +0200 Message-Id: <20220718133321.2902838-6-eperezma@redhat.com> In-Reply-To: <20220718133321.2902838-1-eperezma@redhat.com> References: <20220718133321.2902838-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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=eperezma@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: 1658151752841100001 We can restore the device state in the destination via CVQ now. Remove the migration blocker. Signed-off-by: Eugenio P=C3=A9rez --- include/hw/virtio/vhost-vdpa.h | 1 - hw/virtio/vhost-vdpa.c | 11 ----------- net/vhost-vdpa.c | 2 -- 3 files changed, 14 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index d10a89303e..1111d85643 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -35,7 +35,6 @@ typedef struct vhost_vdpa { bool shadow_vqs_enabled; /* IOVA mapping used by the Shadow Virtqueue */ VhostIOVATree *iova_tree; - Error *migration_blocker; GPtrArray *shadow_vqs; const VhostShadowVirtqueueOps *shadow_vq_ops; void *shadow_vq_ops_opaque; diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 4458c8d23e..479151bd77 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1023,13 +1023,6 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *= dev) return true; } =20 - if (v->migration_blocker) { - int r =3D migrate_add_blocker(v->migration_blocker, &err); - if (unlikely(r < 0)) { - goto err_migration_blocker; - } - } - for (i =3D 0; i < v->shadow_vqs->len; ++i) { VirtQueue *vq =3D virtio_get_queue(dev->vdev, dev->vq_index + i); VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); @@ -1072,7 +1065,6 @@ err: vhost_svq_stop(svq); } =20 -err_migration_blocker: error_reportf_err(err, "Cannot setup SVQ %u: ", i); =20 return false; @@ -1094,9 +1086,6 @@ static bool vhost_vdpa_svqs_stop(struct vhost_dev *de= v) } } =20 - if (v->migration_blocker) { - migrate_del_blocker(v->migration_blocker); - } return true; } =20 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index e03f026738..4a39dad47b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -568,8 +568,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientSta= te *peer, =20 s->vhost_vdpa.shadow_vq_ops =3D &vhost_vdpa_net_svq_ops; s->vhost_vdpa.shadow_vq_ops_opaque =3D s; - error_setg(&s->vhost_vdpa.migration_blocker, - "Migration disabled: vhost-vdpa uses CVQ."); } ret =3D vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, n= vqs); if (ret) { --=20 2.31.1