From nobody Sun Feb 8 21:41:32 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=1560937292; cv=none; d=zoho.com; s=zohoarc; b=ESnM1tmM706uuEtyRx9WVavPmAZwYnbb/k8wDQ2tbjuUQLd4M0T6l90ihS8AK24H3/bZyjt2P+3sti1whK7ZRBBwlu184JLCqLHTQG9GgpUaskoHw+8R8HXBOY/lKnoTewmjhGRFyWXlzZxa3G7Lc+ReP2HbNpXkOCQ5oqeSrxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560937292; 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=4exHF8//olgy/dSgTsb2JZqIRZnYSxIUGmYykM+hWWM=; b=LQoxURiSlHv3UoW6sR6MQQZ74ROlO4dtEdeJUDqf+iZNQxXdXpSmr1lvtM8s2LGqliIwOIl6YypUkF9fwLS27pxAPkLyjEE9Np392A+v7Lt+HKL9/9Uk3Xx8biaFrouOJ8YKrYRmJJVyIewAzL65SmkBqh9Yid/6oZn3jouNegU= 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 156093729265042.28747817219573; Wed, 19 Jun 2019 02:41:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13347821F1; Wed, 19 Jun 2019 09:41:31 +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 DBAC15D962; Wed, 19 Jun 2019 09:41:30 +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 A2548206D2; Wed, 19 Jun 2019 09:41:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5J9cTh8024338 for ; Wed, 19 Jun 2019 05:38:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC1651001B3C; Wed, 19 Jun 2019 09:38:29 +0000 (UTC) Received: from orkuz.int.mamuti.net (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E8FE1001B39 for ; Wed, 19 Jun 2019 09:38:25 +0000 (UTC) Received: by orkuz.int.mamuti.net (Postfix, from userid 500) id 7EC452A2147; Wed, 19 Jun 2019 11:38:23 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 19 Jun 2019 11:37:59 +0200 Message-Id: <14b693d165df9f842eca3117f44fa835b8c88097.1560936842.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/24] qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 19 Jun 2019 09:41:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_process.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1626796c19..144328c148 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5893,8 +5893,6 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, virCapsPtr caps, unsigned int flags) { - int ret =3D -1; - if (!def->cpu) return 0; =20 @@ -5943,17 +5941,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, if (virCPUUpdate(def->os.arch, def->cpu, virQEMUCapsGetHostModel(qemuCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_MIGRAT= ABLE)) < 0) - goto cleanup; + return -1; =20 if (virCPUTranslate(def->os.arch, def->cpu, virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtTy= pe)) < 0) - goto cleanup; + return -1; =20 def->cpu->fallback =3D VIR_CPU_FALLBACK_FORBID; - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.22.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list