From nobody Sun Feb 8 18:31:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567693219; cv=none; d=zoho.com; s=zohoarc; b=LixmmJWDY14HZmTDOrsshbvaYdSvhIoyuOPiy/Kh27QdaIJD5SGpba2GCxpi4MS+El1juetUT2NhJyLwcGXv7du3idUvT0CbwRNMfjs1XFjpynTQcVCvGU2Ne+M0Dibl3Wijpcxb+arWOnNybKRYWZXrg6YEZ1ynG4yDqO9UiK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567693219; h=Content-Type:Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=KuGsw0PlQWTS4ypgbtEoyFTaV/F0boND30r8mODIzrI=; b=HsYM70DSB2ybV0kv+01o30CWaMt0UK+qZKs7GKYOQmG0zR944EyyM3YrgiFeRBA+J7f+l2tBZRqT3pT0KbjqRqiJd5Zjzp+hrE/o/YKIZtJG+8m/kLXTS+g0qUuNj8C6TexWU/QLEdQV4veJVr3F7PiJRSllC7gRzlKQLGF+xuA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567693219844912.6915816767489; Thu, 5 Sep 2019 07:20:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED345307D915; Thu, 5 Sep 2019 14:20:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C05E619C6A; Thu, 5 Sep 2019 14:20:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 797992551E; Thu, 5 Sep 2019 14:20:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x85EKEq8006247 for ; Thu, 5 Sep 2019 10:20:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7374B60127; Thu, 5 Sep 2019 14:20:14 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E688960167 for ; Thu, 5 Sep 2019 14:20:13 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 5 Sep 2019 16:20:04 +0200 Message-Id: <2e560ad05c09be2ced2ac0899c95a8082873d55d.1567693128.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemu: hotplug: Simplify cleanup in qemuDomainChangeMediaLegacy X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 05 Sep 2019 14:20:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Switch to using VIR_AUTOFREE and remove the cleanup label. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63acb9c451..c91dfc9f6b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -258,48 +258,48 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, virStorageSourcePtr newsrc, bool force) { - int ret =3D -1, rc; - char *driveAlias =3D NULL; + int rc; + VIR_AUTOFREE(char *) driveAlias =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); const char *format =3D NULL; - char *sourcestr =3D NULL; + VIR_AUTOFREE(char *) sourcestr =3D NULL; if (!disk->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing disk device alias name for %s"), disk->d= st); - goto cleanup; + return -1; } if (!(driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) - goto cleanup; + return -1; qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, force); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; /* If the tray is present wait for it to open. */ if (!force && diskPriv->tray) { rc =3D qemuHotplugWaitForTrayEject(vm, disk); if (rc < 0) - goto cleanup; + return -1; /* re-issue ejection command to pop out the media */ qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, false); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - goto cleanup; + return -1; } else { /* otherwise report possible errors from the attempt to eject the = media*/ if (rc < 0) - goto cleanup; + return -1; } if (!virStorageSourceIsEmpty(newsrc)) { if (qemuGetDriveSourceString(newsrc, NULL, &sourcestr) < 0) - goto cleanup; + return -1; if (virStorageSourceGetActualType(newsrc) !=3D VIR_STORAGE_TYPE_DI= R) format =3D virStorageFileFormatTypeToString(newsrc->format); @@ -310,18 +310,13 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, sourcestr, format); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; } if (rc < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - VIR_FREE(driveAlias); - VIR_FREE(sourcestr); - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list