From nobody Mon Feb 9 16:35:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1677853742; cv=none; d=zohomail.com; s=zohoarc; b=DoOTc+2AM5KovJD7ODKP8A/kjgn3iIeSston4dpk1Bn6cSudLidNKJSw8ZAc69Cr+qMNkZ3UxpDpaIifP9mzzFH4YLUrrYduo2fPM+1dTZ6PZu39dqZ5HTtDBkDQDAyXt4zkiHjTzcbcUOOFrtQfxfXbMF9kdmu8wOqXixPM2Pg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853742; 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=0jmRyTDoYXBdG3bzxVAcyFDr+JT8Zz0o333TAePBKnQ=; b=hBCyY35rial04k5ct6aI4DUGaON7ZlbPUhwnRUdIegIfEi2Z/5x8VEFiGmNZhHX4OMkuGPSRvgvyGRCU5mZ2/3E7+azScn7Epzi1tJC7LeYzSVbUGewGcHrPKiPmNTFxyGAMtXT36bFSqMAPu1Uv6ScMGMql2nKZdcsavZe1i0Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1677853742894584.597821161143; Fri, 3 Mar 2023 06:29:02 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-515-ifJMiEzHMJ6Hv8zyn2YgVw-1; Fri, 03 Mar 2023 09:28:56 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8ED8C1C05AEE; Fri, 3 Mar 2023 14:28:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D894492C14; Fri, 3 Mar 2023 14:28:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 121AB1943433; Fri, 3 Mar 2023 14:28:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2BEEC1949752 for ; Fri, 3 Mar 2023 14:28:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 27454404BEC6; Fri, 3 Mar 2023 14:28:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3EE44051E4A for ; Fri, 3 Mar 2023 14:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853741; 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=0jmRyTDoYXBdG3bzxVAcyFDr+JT8Zz0o333TAePBKnQ=; b=dK0pq71HjqIQFZRRrcneTPgtkYuiDUWgAU9AjdyybC4Ny6eKEQJSukdf9rOtUfbj3qXGPn AKS8Kk3bgqhSlAKXlg3gKp1xlnhOIcxMNyoubXdeXy75j56KUrQeudB7qEpEhWdSmS+HzT zImWUrcXLhwbLNKFVRT2j9HiCQafRNY= X-MC-Unique: ifJMiEzHMJ6Hv8zyn2YgVw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/31] conf: cpu: Remove NULL check from virCPUDefCopy Date: Fri, 3 Mar 2023 15:27:50 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1677853744744100001 Content-Type: text/plain; charset="utf-8" Make all callers always pass a valid pointer which in turn allows us to remove return value check from the callers. Signed-off-by: Peter Krempa --- src/conf/cpu_conf.c | 7 +------ src/conf/cpu_conf.h | 3 ++- src/cpu/cpu_ppc64.c | 8 ++++++-- src/cpu/cpu_x86.c | 5 +---- src/qemu/qemu_capabilities.c | 20 +++++++++----------- src/qemu/qemu_migration_cookie.c | 3 +-- src/qemu/qemu_process.c | 3 +-- tests/testutilsqemu.c | 11 +++++------ 8 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 3b824e85d2..9f5e8cb848 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -271,12 +271,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) virCPUDef * virCPUDefCopy(const virCPUDef *cpu) { - g_autoptr(virCPUDef) copy =3D NULL; - - if (!cpu) - return NULL; - - copy =3D virCPUDefCopyWithoutModel(cpu); + g_autoptr(virCPUDef) copy =3D virCPUDefCopyWithoutModel(cpu); virCPUDefCopyModel(copy, cpu, false); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 560b597777..82083d668c 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -201,7 +201,8 @@ virCPUDefStealModel(virCPUDef *dst, bool keepVendor); virCPUDef * -virCPUDefCopy(const virCPUDef *cpu); +virCPUDefCopy(const virCPUDef *cpu) + ATTRIBUTE_NONNULL(1); virCPUDef * virCPUDefCopyWithoutModel(const virCPUDef *cpu) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 30db99cca1..a33e4da9a9 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -406,8 +406,12 @@ ppc64Compute(virCPUDef *host, size_t i; /* Ensure existing configurations are handled correctly */ - if (!(cpu =3D virCPUDefCopy(other)) || - virCPUppc64ConvertLegacy(cpu) < 0) + if (!other) + return VIR_CPU_COMPARE_ERROR; + + cpu =3D virCPUDefCopy(other); + + if (virCPUppc64ConvertLegacy(cpu) < 0) return VIR_CPU_COMPARE_ERROR; if (cpu->arch !=3D VIR_ARCH_NONE) { diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 6560b7a502..a8a537cbb6 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3206,7 +3206,7 @@ static int virCPUx86ExpandFeatures(virCPUDef *cpu) { virCPUx86Map *map; - g_autoptr(virCPUDef) expanded =3D NULL; + g_autoptr(virCPUDef) expanded =3D virCPUDefCopy(cpu); g_autoptr(virCPUx86Model) model =3D NULL; bool host =3D cpu->type =3D=3D VIR_CPU_TYPE_HOST; size_t i; @@ -3214,9 +3214,6 @@ virCPUx86ExpandFeatures(virCPUDef *cpu) if (!(map =3D virCPUx86GetMap())) return -1; - if (!(expanded =3D virCPUDefCopy(cpu))) - return -1; - virCPUDefFreeFeatures(expanded); if (!(model =3D x86ModelFind(map, cpu->model))) { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9fe6579dfe..94e6e2b914 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1857,17 +1857,14 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUData *= dst, !(dst->info =3D qemuMonitorCPUModelInfoCopy(src->info))) return -1; - if (src->reported && - !(dst->reported =3D virCPUDefCopy(src->reported))) - return -1; + if (src->reported) + dst->reported =3D virCPUDefCopy(src->reported); - if (src->migratable && - !(dst->migratable =3D virCPUDefCopy(src->migratable))) - return -1; + if (src->migratable) + dst->migratable =3D virCPUDefCopy(src->migratable); - if (src->full && - !(dst->full =3D virCPUDefCopy(src->full))) - return -1; + if (src->full) + dst->full =3D virCPUDefCopy(src->full); return 0; } @@ -3867,8 +3864,9 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps, if (!(fullCPU =3D virQEMUCapsProbeHostCPU(qemuCaps->arch, NULL))) goto error; - if (!(cpuExpanded =3D virCPUDefCopy(cpu)) || - virCPUExpandFeatures(qemuCaps->arch, cpuExpanded) < 0) + cpuExpanded =3D virCPUDefCopy(cpu); + + if (virCPUExpandFeatures(qemuCaps->arch, cpuExpanded) < 0) goto error; for (i =3D 0; i < cpuExpanded->nfeatures; i++) { diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index e151f33e99..26d07d1ad4 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -542,8 +542,7 @@ qemuMigrationCookieAddCPU(qemuMigrationCookie *mig, if (mig->cpu) return 0; - if (!(mig->cpu =3D virCPUDefCopy(vm->def->cpu))) - return -1; + mig->cpu =3D virCPUDefCopy(vm->def->cpu); if (qemuDomainMakeCPUMigratable(mig->cpu) < 0) return -1; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eb1797688c..d0ddf46e98 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4469,8 +4469,7 @@ qemuProcessUpdateLiveGuestCPU(virDomainObj *vm, !def->cpu->model)) return 0; - if (!(orig =3D virCPUDefCopy(def->cpu))) - return -1; + orig =3D virCPUDefCopy(def->cpu); if ((rc =3D virCPUUpdateLive(def->os.arch, def->cpu, enabled, disabled= )) < 0) { return -1; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index ef78616062..672316c848 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -577,12 +577,11 @@ int qemuTestDriverInit(virQEMUDriver *driver) memset(driver, 0, sizeof(*driver)); - if (!(cpuDefault =3D virCPUDefCopy(&cpuDefaultData)) || - !(cpuHaswell =3D virCPUDefCopy(&cpuHaswellData)) || - !(cpuPower8 =3D virCPUDefCopy(&cpuPower8Data)) || - !(cpuPower9 =3D virCPUDefCopy(&cpuPower9Data)) || - !(cpuPower10 =3D virCPUDefCopy(&cpuPower10Data))) - return -1; + cpuDefault =3D virCPUDefCopy(&cpuDefaultData); + cpuHaswell =3D virCPUDefCopy(&cpuHaswellData); + cpuPower8 =3D virCPUDefCopy(&cpuPower8Data); + cpuPower9 =3D virCPUDefCopy(&cpuPower9Data); + cpuPower10 =3D virCPUDefCopy(&cpuPower10Data); if (virMutexInit(&driver->lock) < 0) return -1; --=20 2.39.2