From nobody Sun Feb 8 19:24:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 158020753933214.442882801184396; Tue, 28 Jan 2020 02:32:19 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-glmDlGCcOCCgBtj1Cm6eMw-1; Tue, 28 Jan 2020 05:32:14 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31936107B785; Tue, 28 Jan 2020 10:32:07 +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 0BFBB1001DDE; Tue, 28 Jan 2020 10:32:07 +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 B87D58596E; Tue, 28 Jan 2020 10:32:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVcS9014020 for ; Tue, 28 Jan 2020 05:31:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id B27545C21B; Tue, 28 Jan 2020 10:31:38 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D6AB5C3FA for ; Tue, 28 Jan 2020 10:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207538; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bdkpBMDl2ihJfuWH+W23qUopPnhtPr+Th8GzwiuxNV8=; b=DJ4vUgAfHRJU550RHUB+xK275t9kZcKGx87QObZJ6GaXhlk/BLipTzJi/14Tbq2dlahe3L YPqCuIdu0ad/gHeJpLBTLT5Fq8HTn6RoIvDXLwdJjt/1/0jZZjf6NLAqgPP0FM9TVo+pm4 sVGEx9OjGFPV+wxBZIT/lLFUYdRHQRE= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] qemu: eliminate ret in qemuExtDevicesStart Date: Tue, 28 Jan 2020 11:31:21 +0100 Message-Id: <1c01df220362966e8676eb2474c48011a1a5edd3.1580207305.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: glmDlGCcOCCgBtj1Cm6eMw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All the callees return either 0 or -1 so there is no need for propagating the value. And we bail on the first error. Remove the variable to make the function simpler. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_extdevice.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 1869a42f11..9c0c0fd573 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -156,7 +156,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, bool incomingMigration) { virDomainDefPtr def =3D vm->def; - int ret =3D 0; size_t i; =20 if (qemuExtDevicesInitPaths(driver, def) < 0) @@ -166,14 +165,13 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, virDomainVideoDefPtr video =3D def->videos[i]; =20 if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER)= { - ret =3D qemuExtVhostUserGPUStart(driver, vm, video); - if (ret < 0) - return ret; + if (qemuExtVhostUserGPUStart(driver, vm, video) < 0) + return -1; } } =20 - if (def->tpm) - ret =3D qemuExtTPMStart(driver, vm, incomingMigration); + if (def->tpm && qemuExtTPMStart(driver, vm, incomingMigration) < 0) + return -1; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -184,7 +182,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, return -1; } =20 - return ret; + return 0; } =20 =20 --=20 2.21.0