qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Zhenzhong Duan" <zhenzhong.duan@intel.com>,
	"Cédric Le Goater" <clg@redhat.com>,
	"Eric Farman" <farman@linux.ibm.com>
Subject: [PULL 06/11] vfio/ccw: Fix the missed unrealize() call in error path
Date: Mon, 24 Jun 2024 11:10:38 +0200	[thread overview]
Message-ID: <20240624091043.177484-7-thuth@redhat.com> (raw)
In-Reply-To: <20240624091043.177484-1-thuth@redhat.com>

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

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 file handle")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240522170107.289532-7-clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 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 a468fa2342..36f2677a44 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -588,7 +588,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
     }
 
     if (!vfio_device_get_name(vbasedev, errp)) {
-        return;
+        goto out_unrealize;
     }
 
     if (!vfio_attach_device(cdev->mdevid, vbasedev,
@@ -631,6 +631,7 @@ out_region_err:
     vfio_detach_device(vbasedev);
 out_attach_dev_err:
     g_free(vbasedev->name);
+out_unrealize:
     if (cdc->unrealize) {
         cdc->unrealize(cdev);
     }
-- 
2.45.2



  parent reply	other threads:[~2024-06-24  9:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-24  9:10 [PULL 00/11] s390x and qtest patches 2024-06-24 Thomas Huth
2024-06-24  9:10 ` [PULL 01/11] hw/s390x/ccw: Make s390_ccw_get_dev_info() return a bool Thomas Huth
2024-06-24  9:10 ` [PULL 02/11] s390x/css: Make CCWDeviceClass::realize return bool Thomas Huth
2024-06-24  9:10 ` [PULL 03/11] hw/s390x/ccw: Remove local Error variable from s390_ccw_realize() Thomas Huth
2024-06-24  9:10 ` [PULL 04/11] s390x/css: Make S390CCWDeviceClass::realize return bool Thomas Huth
2024-06-24  9:10 ` [PULL 05/11] vfio/ccw: Use the 'Error **errp' argument of vfio_ccw_realize() Thomas Huth
2024-06-24  9:10 ` Thomas Huth [this message]
2024-06-24  9:10 ` [PULL 07/11] vfio/{ap, ccw}: Use warn_report_err() for IRQ notifier registration errors Thomas Huth
2024-06-24  9:10 ` [PULL 08/11] tests/qtest/fuzz: fix memleak in qos_fuzz.c Thomas Huth
2024-06-24  9:10 ` [PULL 09/11] target/s390x/arch_dump: use correct byte order for pid Thomas Huth
2024-06-24  9:10 ` [PULL 10/11] MAINTAINERS: Cover all tests/qtest/migration-* files Thomas Huth
2024-06-24  9:10 ` [PULL 11/11] target/s390x: Add a CONFIG switch to disable legacy CPUs Thomas Huth
2025-03-07 15:27   ` Philippe Mathieu-Daudé
2025-03-07 15:33     ` Thomas Huth
2025-03-07 16:01       ` Philippe Mathieu-Daudé
2024-06-24 20:50 ` [PULL 00/11] s390x and qtest patches 2024-06-24 Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240624091043.177484-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=clg@redhat.com \
    --cc=farman@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=zhenzhong.duan@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).