From nobody Sat Nov 15 16:34:21 2025 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=1750674420; cv=none; d=zohomail.com; s=zohoarc; b=GxnOUFryVweUqlq51LYIvPLekfT856x9mGijin5NY2pS1XUPXDdS8HxQDZLRBQA6J4bsHmhtIVZGjLHZRHN+xFJ6XdVp+URRnJ2RephKWugZUQL4T36VruadgJwzv3dsra1EHHtXL+HJgu4Dlwmxy2kHDPaQ98x77tHBpRVQq6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750674420; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=byGMaHtbYZRNgi0T6ADQku+LFtpjJr2riRhJRobUU4U=; b=JcvMzqdPBz25Z3hpLGxa9n+kgDPnHYDvYIP7X9Rfjlb7cfekCl0/0nm/G7qZGp21inN1pwgxIwllp+LIK+Z4/nhT8D9f/GWgtSVAbII76vWrChEy2GLh2fb6q9ehlw3CbWf+DLB/sqI0ceWa8S2uHYc309SMmamECHAhlsYliog= 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 1750674420196104.48368823756937; Mon, 23 Jun 2025 03:27:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTeNu-0005yp-CK; Mon, 23 Jun 2025 06:26:42 -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 1uTeNs-0005y5-88 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:40 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTeNn-0000lQ-6u for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:39 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:33 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750674395; x=1782210395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MxMVveEJ4lElsNDpu96M/mDOZpSh974jvh00HM5eCIM=; b=VOpiQPwiX071fM34lm7n/zOFV5MGjeOUzwcPuGALAzUCoUy34z3tah5N tPEll98v8XYGqDq7qfrdbV5mrJeN4wYDImfD46YXkGaZNBpLp4pPLbdKw ccKWIjqZwTv8iMdhAv0BiVqHETBThS+jnRyPFcKzyQutvzuSKJ/O72279 B13tSHptG/6XyqjqDJO9xT8vx1OzEKonS6r+XPskg/xRyVxs+FMvyGCh+ yiF1xcOEH+w9cnNFsR9WpcvqgZhPLNmmcMRx8v0Y9rRLMo4ndgcKIxZL5 UGVrlMEvTbnqomKhqaUO1+JTbV53U58GRGO6p76yO+2z9iJ8A+tbEmW30 w==; X-CSE-ConnectionGUID: VusGftHmS5u41vyfalMqjg== X-CSE-MsgGUID: FGP9y6ZuQ7i0SRSrqfybUw== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="63565460" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="63565460" X-CSE-ConnectionGUID: QMyG46dgTWeX31r7d2ukVw== X-CSE-MsgGUID: 8BfRjpIASwuSv2yFwOOBWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="182427947" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, steven.sistare@oracle.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 2/4] vfio/container: fails mdev hotplug if add migration blocker failed Date: Mon, 23 Jun 2025 18:22:33 +0800 Message-Id: <20250623102235.94877-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623102235.94877-1-zhenzhong.duan@intel.com> References: <20250623102235.94877-1-zhenzhong.duan@intel.com> 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=192.198.163.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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: 1750674420868116600 Content-Type: text/plain; charset="utf-8" It's aggressive to abort a running QEMU process when hotplug a mdev and it fails migration blocker adding. Fix by just failing mdev hotplug itself. Signed-off-by: Zhenzhong Duan Reviewed-by: C=C3=A9dric Le Goater --- hw/vfio/container.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 2853f6f08b..68b4fdb401 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -992,12 +992,16 @@ static bool vfio_legacy_attach_device(const char *nam= e, VFIODevice *vbasedev, if (vbasedev->mdev) { error_setg(&vbasedev->cpr.mdev_blocker, "CPR does not support vfio mdev %s", vbasedev->name); - migrate_add_blocker_modes(&vbasedev->cpr.mdev_blocker, &error_fata= l, - MIG_MODE_CPR_TRANSFER, -1); + if (migrate_add_blocker_modes(&vbasedev->cpr.mdev_blocker, errp, + MIG_MODE_CPR_TRANSFER, -1)) { + goto hiod_unref_exit; + } } =20 return true; =20 +hiod_unref_exit: + object_unref(vbasedev->hiod); device_put_exit: vfio_device_put(vbasedev); group_put_exit: --=20 2.34.1