From nobody Tue Dec 16 16:41:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743581365; cv=none; d=zohomail.com; s=zohoarc; b=YtWuWo/t/r69PDOekKbAUMPfJvTRAvlMxKZerEGQUXaArNOLmlyxNgxv8Xrm8YgZuDy/qIZ177dXYGHM8EdMIZRaPWmBIPpMzkTa2wKdOWgPfJ+y8RQjvdORFUvFwlB5s49UhHEMIHnXNM1KuinTHIVLtEfrVvg7ylLzv8p1Vng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581365; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=J++Q4ADP6vLPf/VdewQ9v+9aruuXwrW0L5C4705h03k=; b=oA/FqJNfkayNaOrNHHkcQ73IKBgmNwm3AtNFUcvtpSU43R6KKGe3L8HxtDdsR+Oi+i9QiRecqKggQm4r0A0aHbqj6+G4IV/DFcnBj6rNfi4XUPrtmV/6jYONB4dGHlGRs+7SD2gs2cpCeYyVgZfcRMlzQh7FZ0CsqMM543T584c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743581365256259.25307238977393; Wed, 2 Apr 2025 01:09:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4D69412D6; Wed, 2 Apr 2025 04:09:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9485A13F7; Wed, 2 Apr 2025 04:08:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F2BD4E8A; Wed, 2 Apr 2025 04:08:35 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 78F48E90 for ; Wed, 2 Apr 2025 04:08:35 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-uWeG6Mj7PTyHaxGSkIZVvA-1; Wed, 02 Apr 2025 04:08:34 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49934195608D for ; Wed, 2 Apr 2025 08:08:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 739E3180A803 for ; Wed, 2 Apr 2025 08:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581315; h=from:from: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; bh=YfYbAm4DCffYFVyNFxwS7m2fEnnYanezXiJOZWwa1cw=; b=dxJR3IDf3tjzphs3Z9hL3y3R4i8i63Edax+A5ASDFOTKGfCe4bkYwlI+X4VXplbbjiN8PQ /fer5IfjDE99rq1Vu0qd+BuJZ+fmcJNFWpV2AfN7xS+fhz92bKeYgm7OS/KsDXyxjOTubw dCaOQmQ6mFrecl+UylICzRiM9VPNqn4= X-MC-Unique: uWeG6Mj7PTyHaxGSkIZVvA-1 X-Mimecast-MFC-AGG-ID: uWeG6Mj7PTyHaxGSkIZVvA_1743581313 To: devel@lists.libvirt.org Subject: [PATCH 1/6] qemu: domain: Don't check return value of 'virCPUDefCopy' Date: Wed, 2 Apr 2025 10:08:24 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1sooK9pqWhaXGjzUxNPskIhO4m3_OOcdpgjWnYaOEPQ_1743581313 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: B5IELMIJGFKHRVJSFZ35OEFUXATXUTOL X-Message-ID-Hash: B5IELMIJGFKHRVJSFZ35OEFUXATXUTOL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743581366205019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa As 'virCPUDefCopy' can't fail any more (without aborting) remove the last two return value checks. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e45eef4787..c3ca4b3040 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5321,8 +5321,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver, */ if (origCPU) { virCPUDefFree(def->cpu); - if (!(def->cpu =3D virCPUDefCopy(origCPU))) - return -1; + def->cpu =3D virCPUDefCopy(origCPU); } if (def->cpu && @@ -9354,8 +9353,8 @@ qemuDomainSaveCookieNew(virDomainObj *vm) if (!(cookie =3D virObjectNew(qemuDomainSaveCookieClass))) return NULL; - if (priv->origCPU && !(cookie->cpu =3D virCPUDefCopy(vm->def->cpu))) - return NULL; + if (priv->origCPU) + cookie->cpu =3D virCPUDefCopy(vm->def->cpu); cookie->slirpHelper =3D qemuDomainGetSlirpHelperOk(vm); --=20 2.49.0