From nobody Mon Nov 25 09:41:38 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=1716353288; cv=none; d=zohomail.com; s=zohoarc; b=nitWe+r3nQ+lLgv8F0THiJaSZKyLh0WkZU1B8EXzMizDkCI+xlx1TDyCy5Cnj1R3AR41HaCg4Bq6Xe76Ir2+bQOhE9z5KeibqkHzmbcikxvwEi7oM0Y/1fmcjp1Op1nptW5/iWI+46i6agCdqF1d41spHHOnjesvYg6XJkwA/xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716353288; 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=1eIespveF67+ye/k6W3GcS84w89o5YRNQ1bVOyzKdes=; b=RZpyj3y1O0ENj8y0sQAg1pq3vh9kTdGT/y4p5ugPVGmJWpPEEZHaO1FC3LY8fJ5wsNJzKliM3dgDt5hmO1LZZ6kZNlRrDT5S0n9D0TXdBPDsAoA2BFWAYBX86MbMlaOiVkDUWWkRHWdFNX9sBOthBwHuOCh4034e1QDV8NtqkKQ= 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 1716353288971632.3726717687607; Tue, 21 May 2024 21:48:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9dph-0003J8-3V; Wed, 22 May 2024 00:44:09 -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 1s9dpX-00038E-01; Wed, 22 May 2024 00:44:00 -0400 Received: from mgamail.intel.com ([192.198.163.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9dpV-0005wQ-Bx; Wed, 22 May 2024 00:43:58 -0400 Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:43:26 -0700 Received: from unknown (HELO SPR-S2600BT.bj.intel.com) ([10.240.192.124]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:43:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716353037; x=1747889037; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NOv++k7YIHXe3mdhvNwiZ7ufitLLfKDDIQWej2awCVw=; b=fVw7hCUnBu2G+HfsDep4vjgpg8bpIElHMXKO+WYcxRyQIbsuLAxBhMA4 1QMwr0g7brivtQe5P6Eh7sNN5OdPfO4C2WWM3ltUKYPZ5IV11RVpQPkkp DdITMfXFUc1N89FcXYQ3x5mXVceaBVOJ06c+ru6bUh0lD5NBGGIrO87Jv 8GHMOy5JtSAwG/QFFOKf2ykzWor46FldPLNUg4S1wUbkFSIYsOV7x0lsG rwgoe2Gb9HJ5MIUCuLo4Xfn6k9UdJU3KHIwGW5xk9nJx6DKuP2tXCHjEw z+a8gdAUE6xTKKs4Jjr5iYfnQTtbQ4NveDryAz/xZeUPAlvxCjfcPsjoJ g==; X-CSE-ConnectionGUID: 76dDk/nkQSWX9waplNIO4g== X-CSE-MsgGUID: uNWP6dFtQ3SWYjkQRXw6oQ== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="23994222" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="23994222" X-CSE-ConnectionGUID: 8qQ1aQAwRGODSSZ+ui4pQg== X-CSE-MsgGUID: 9ZBqyuXsR06wHAM0pFaxSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33683818" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, chao.p.peng@intel.com, Zhenzhong Duan , Eric Farman , Matthew Rosato , Thomas Huth , qemu-s390x@nongnu.org (open list:vfio-ccw) Subject: [PATCH v2 20/20] vfio/ccw: Fix the missed unrealize() call in error path Date: Wed, 22 May 2024 12:40:15 +0800 Message-Id: <20240522044015.412951-21-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240522044015.412951-1-zhenzhong.duan@intel.com> References: <20240522044015.412951-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.10; 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, 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.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: 1716353289180100001 Content-Type: text/plain; charset="utf-8" When get name failed, we should call unrealize() so that vfio_ccw_realize() is self contained. Fixes: 909a6254eda ("vfio/ccw: Make vfio cdev pre-openable by passing a fil= e handle") Signed-off-by: Zhenzhong Duan --- hw/vfio/ccw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 168c9e5973..161704cd7b 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -589,7 +589,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **= errp) } =20 if (!vfio_device_get_name(vbasedev, errp)) { - return; + goto out_unrealize; } =20 if (!vfio_attach_device(cdev->mdevid, vbasedev, @@ -633,6 +633,7 @@ out_region_err: vfio_detach_device(vbasedev); out_attach_dev_err: g_free(vbasedev->name); +out_unrealize: if (cdc->unrealize) { cdc->unrealize(cdev); } --=20 2.34.1