From nobody Sun May 19 11:06:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686817949; cv=none; d=zohomail.com; s=zohoarc; b=CJfS3v5d7B8ALdnKzwObjyNTHW+jhZaJIv83y1kAo0TJMq2E98DO6El+hrEL1M9HshYGqmq1X4611Y1n2oCJX8iRlOuwMAwD+OlOtCccM9OapeSOW3vKklcpV6F68144O8guFO6CxgNUfIfoMQinGjUBGDTbtNXVlEFNDfYl5f8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686817949; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=umwyOW8SJ75vPa0exsjDZz3gwMIkqF/fNC8YJe83qbY=; b=lJKNKgNDYFZgG8TBh5fL/+iQvlsvFtYG3FUi7v/vrQQDRg3BOXN70ZID0LfM5j8NVAsdrNjTlluqeFyjdpRzp2jBGfwIDlGgskGFSd5PYBI5H/9nojMJB4qruDzt8CmjW4bToRbKARML4QwSLkEj8YpSJLXVuZWm8m5qUXo8890= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 1686817949324621.0811295846341; Thu, 15 Jun 2023 01:32:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9iOX-00049l-QC; Thu, 15 Jun 2023 04:31:54 -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 1q9iOM-00047d-RW for qemu-devel@nongnu.org; Thu, 15 Jun 2023 04:31:45 -0400 Received: from mga02.intel.com ([134.134.136.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9iOL-0000pe-6Z for qemu-devel@nongnu.org; Thu, 15 Jun 2023 04:31:42 -0400 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 01:31:39 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 01:31:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686817901; x=1718353901; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8alUIXuyR/7W1QBGpx82YSHlL1+ZOiSzVjL2k/2dBGc=; b=h36YzSMkbammAfpa587DE9GysGhx2YinTpxiBm/WoK98K5qSo411uuex iW7Jg1XD521sfOto/cxHEWHlv4mbPi+9BdALxTQ/aDfqd+U+B02k3ijot 9IJ8LdcYIkPJQdtoumaP6Xt33d9y6E/yNR55qzphmsh3C7Bbax6+eUBZ4 aNrSbt84u6lO59VtMwAKWr5M1rrSzhU3VO26dWpsLNxoNbdqvv35XEWHA OkogcJFP5GDjgTlDBSdN+vs8RiRRNg6B4OnQmH+rsl3x3KjpTSUCkB5No z5JovmeAikto5EbTS77LPW1k0DdI8Q/78LgVbP3yO0cv/o4rSuVp19u85 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="348521175" X-IronPort-AV: E=Sophos;i="6.00,244,1681196400"; d="scan'208";a="348521175" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="706569860" X-IronPort-AV: E=Sophos;i="6.00,244,1681196400"; d="scan'208";a="706569860" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, chao.p.peng@intel.com Subject: [PATCH] vfio/migration: Fix return value of vfio_migration_realize() Date: Thu, 15 Jun 2023 16:18:51 +0800 Message-Id: <20230615081851.326816-1-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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=134.134.136.20; envelope-from=zhenzhong.duan@intel.com; helo=mga02.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686817950563100001 Content-Type: text/plain; charset="utf-8" We should print "Migration disabled" when migration is blocked in vfio_migration_realize(). Fix it by reverting return value of migrate_add_blocker(), meanwhile error out directly once migrate_add_blocker() failed. Signed-off-by: Zhenzhong Duan --- hw/vfio/common.c | 4 ++-- hw/vfio/migration.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index fa8fd949b1cf..8505385798f3 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -399,7 +399,7 @@ int vfio_block_multiple_devices_migration(Error **errp) multiple_devices_migration_blocker =3D NULL; } =20 - return ret; + return !ret; } =20 void vfio_unblock_multiple_devices_migration(void) @@ -444,7 +444,7 @@ int vfio_block_giommu_migration(Error **errp) giommu_migration_blocker =3D NULL; } =20 - return ret; + return !ret; } =20 void vfio_migration_finalize(void) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 6b58dddb8859..0146521d129a 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -646,12 +646,12 @@ int vfio_migration_realize(VFIODevice *vbasedev, Erro= r **errp) } =20 ret =3D vfio_block_multiple_devices_migration(errp); - if (ret) { + if (ret || (errp && *errp)) { return ret; } =20 ret =3D vfio_block_giommu_migration(errp); - if (ret) { + if (ret || (errp && *errp)) { return ret; } =20 @@ -667,7 +667,7 @@ add_blocker: error_free(vbasedev->migration_blocker); vbasedev->migration_blocker =3D NULL; } - return ret; + return !ret; } =20 void vfio_migration_exit(VFIODevice *vbasedev) --=20 2.34.1