From nobody Sun Feb 8 20:13:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1635776217; cv=none; d=zohomail.com; s=zohoarc; b=kPKTpw0dmBIlDYI0ObhF7IlMrxlSSf0T7dQ7CNYPb9Np55YELNSqaXJHyGDrXSuy9IDiGsINDrc41N69hq8ISZh7FqvOWGXeYrXM5tBFVYVKZnK0T1OsJv4HGyopqNbj41sUaZ1x1AJqrJ9GU2VOZoPefCMN1TVtL9+IDPhphf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635776217; 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; bh=4huTf3CVnTDiiw8zqDfo9kBnAzJrTo0OwCCe/4cMIug=; b=YVlNKDLQo93lw2cKu9hVheqafiMK4I9Fyj/pM6cVGTujQg9MYIgHWoR9Cs0y3UNeqqiY9X7cCXQ8YfXxepzzgQajkMBQ5hgXDWMDxb5clU0BjhCf78CflCNxxJgFEuiRL1CmnWGTqys9XeHjL4luaeNprzHqjlhlfaWzZRcFfgI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635776217918981.1437663281354; Mon, 1 Nov 2021 07:16:57 -0700 (PDT) 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-396-3Bnrx3u8MZy5-pCUAcFkng-1; Mon, 01 Nov 2021 10:16:55 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F64118125CD; Mon, 1 Nov 2021 14:16:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 565F299C1; Mon, 1 Nov 2021 14:16:48 +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 260A0180BAD2; Mon, 1 Nov 2021 14:16:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A1EGVt1023091 for ; Mon, 1 Nov 2021 10:16:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id B6D3A60C17; Mon, 1 Nov 2021 14:16:31 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F72860C0F for ; Mon, 1 Nov 2021 14:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635776216; 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=4huTf3CVnTDiiw8zqDfo9kBnAzJrTo0OwCCe/4cMIug=; b=AE7pnj0qjFaLqKmQeJDEMZQHEHEbyAwza1Spt+9vwwH2HTHfhUQwoWPOri94OFWPE6Ykoa 3wUomDIZ9PMCPknyf1wyPx9DcCzI/1jNXkLDojfRQ8AwwNsareesnz8ipmnSRBFNqiOlzW pHmurtRly5Bm86M+c7oQuaQUCM05+KU= X-MC-Unique: 3Bnrx3u8MZy5-pCUAcFkng-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/7] qemuConnectStealCPUModelFromInfo: Drop needless 'cleanup' label Date: Mon, 1 Nov 2021 15:16:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635776218398100001 Content-Type: text/plain; charset="utf-8" Previous commit rendered 'cleanup' label and @ret variable redundant. The same result can be achieved by returning 0/-1 directly. Signed-off-by: Michal Privoznik --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index eac64bce70..4c32d969c7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12397,7 +12397,6 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst, { g_autoptr(qemuMonitorCPUModelInfo) info =3D NULL; size_t i; - int ret =3D -1; =20 virCPUDefFreeModel(dst); =20 @@ -12412,13 +12411,10 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst, continue; =20 if (virCPUDefAddFeature(dst, name, VIR_CPU_FEATURE_REQUIRE) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.32.0