From nobody Mon Feb 9 01:00:58 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=1677853735; cv=none; d=zohomail.com; s=zohoarc; b=HNIyQb2vC9+Jp8JJEXmw5Sf0tL8se+ekcI1GEABcNLigzr2Qw9WckyvHTHQEuLb43Jb8+PcxPrBeYBoI0bvfAZQ+I0c71TonvTzTxUTvEJAh1bPLk6R7l2qYb/tm/c6P1GUnHJN/tUqkGt2a1B9W/tJMv7DbzI43cIYh6/m0sxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853735; 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=AUrhcwWIRVMFNtnytQ3oo+C5DT+Rg5jdtJY2yi0INKc=; b=GDxI8930LWmq3CPzLFWYXBfvrYqpxT6eanD2d5SUImg7mbyTZhqtbrt5X+hFM8vxIEL55+VV9LvTZ+kKVwK3xz8/+5j1UACnshGk/P7ZVe+2NnlsTLH4wPuUiuk8jGP0rdW5RIE2CFBzGNRpGrH+whPb52JzH8VBJfA8B1UnMJM= 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 1677853735419187.68216840641787; Fri, 3 Mar 2023 06:28:55 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-586-5I7--ZsSO7SPjYgjE8_WFQ-1; Fri, 03 Mar 2023 09:28:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A6E887A9E0; Fri, 3 Mar 2023 14:28:48 +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 175EE140EBF4; Fri, 3 Mar 2023 14:28:48 +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 CF20D1949758; Fri, 3 Mar 2023 14:28:22 +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 6129A194A2BB for ; Fri, 3 Mar 2023 14:28:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 593AD4035712; Fri, 3 Mar 2023 14:28:21 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2840403570C for ; Fri, 3 Mar 2023 14:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853734; 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=AUrhcwWIRVMFNtnytQ3oo+C5DT+Rg5jdtJY2yi0INKc=; b=cDAkFVVM4RxSHfQygAQR/JGgMKMPV9Kl7NyHXsBQpJhSIQYRbwluna83eOLc7AioYMBImb La9xMY+is1OFx7ejO4m1p1MkTQCOHr4+09dv2NlrnCIWRSfDH0SIViUt9gA5FKW0NtzM1G 5rmwiCvoNWjrlmCjXyyUbvToIZma20o= X-MC-Unique: 5I7--ZsSO7SPjYgjE8_WFQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/31] conf: cpu: Remove NULL check from virCPUDefCopyWithoutModel Date: Fri, 3 Mar 2023 15:27:49 +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.7 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: 1677853736712100009 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_arm.c | 5 +---- src/cpu/cpu_s390.c | 5 +---- src/cpu/cpu_x86.c | 13 ++++--------- src/qemu/qemu_domain.c | 6 ------ src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +-- 8 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 1227db1201..3b824e85d2 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -233,9 +233,6 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) { g_autoptr(virCPUDef) copy =3D NULL; - if (!cpu) - return NULL; - copy =3D virCPUDefNew(); copy->type =3D cpu->type; copy->mode =3D cpu->mode; @@ -276,9 +273,11 @@ virCPUDefCopy(const virCPUDef *cpu) { g_autoptr(virCPUDef) copy =3D NULL; - if (!(copy =3D virCPUDefCopyWithoutModel(cpu))) + if (!cpu) return NULL; + copy =3D virCPUDefCopyWithoutModel(cpu); + virCPUDefCopyModel(copy, cpu, false); return g_steal_pointer(©); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 5d69b4d2e0..560b597777 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -204,7 +204,8 @@ virCPUDef * virCPUDefCopy(const virCPUDef *cpu); virCPUDef * -virCPUDefCopyWithoutModel(const virCPUDef *cpu); +virCPUDefCopyWithoutModel(const virCPUDef *cpu) + ATTRIBUTE_NONNULL(1); int virCPUDefParseXMLString(const char *xml, diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index a890ed6ba3..8e562bd7a3 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -450,7 +450,7 @@ virCPUarmUpdate(virCPUDef *guest, const virCPUDef *host, bool relative) { - g_autoptr(virCPUDef) updated =3D NULL; + g_autoptr(virCPUDef) updated =3D virCPUDefCopyWithoutModel(guest); if (!relative || guest->mode !=3D VIR_CPU_MODE_HOST_MODEL) return 0; @@ -461,9 +461,6 @@ virCPUarmUpdate(virCPUDef *guest, return -1; } - if (!(updated =3D virCPUDefCopyWithoutModel(guest))) - return -1; - updated->mode =3D VIR_CPU_MODE_CUSTOM; virCPUDefCopyModel(updated, host, true); diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 0f3b5c6820..1de5251974 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -44,7 +44,7 @@ virCPUs390Update(virCPUDef *guest, const virCPUDef *host, bool relative) { - g_autoptr(virCPUDef) updated =3D NULL; + g_autoptr(virCPUDef) updated =3D virCPUDefCopyWithoutModel(guest); size_t i; if (!relative) @@ -68,9 +68,6 @@ virCPUs390Update(virCPUDef *guest, return -1; } - if (!(updated =3D virCPUDefCopyWithoutModel(guest))) - return -1; - updated->mode =3D VIR_CPU_MODE_CUSTOM; virCPUDefCopyModel(updated, host, true); diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 2fede8e5fa..6560b7a502 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2935,12 +2935,9 @@ static int x86UpdateHostModel(virCPUDef *guest, const virCPUDef *host) { - g_autoptr(virCPUDef) updated =3D NULL; + g_autoptr(virCPUDef) updated =3D virCPUDefCopyWithoutModel(host); size_t i; - if (!(updated =3D virCPUDefCopyWithoutModel(host))) - return -1; - updated->type =3D VIR_CPU_TYPE_GUEST; updated->mode =3D VIR_CPU_MODE_CUSTOM; virCPUDefCopyModel(updated, host, true); @@ -3169,7 +3166,7 @@ static int virCPUx86Translate(virCPUDef *cpu, virDomainCapsCPUModels *models) { - g_autoptr(virCPUDef) translated =3D NULL; + g_autoptr(virCPUDef) translated =3D virCPUDefCopyWithoutModel(cpu); virCPUx86Map *map; g_autoptr(virCPUx86Model) model =3D NULL; size_t i; @@ -3191,9 +3188,6 @@ virCPUx86Translate(virCPUDef *cpu, return -1; } - if (!(translated =3D virCPUDefCopyWithoutModel(cpu))) - return -1; - if (x86Decode(translated, &model->data, models, NULL, false) < 0) return -1; @@ -3280,9 +3274,10 @@ virCPUx86CopyMigratable(virCPUDef *cpu) if (!(map =3D virCPUx86GetMap())) return NULL; - if (!(copy =3D virCPUDefCopyWithoutModel(cpu))) + if (!cpu) return NULL; + copy =3D virCPUDefCopyWithoutModel(cpu); virCPUDefCopyModelFilter(copy, cpu, false, x86FeatureFilterMigratable,= map); return g_steal_pointer(©); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9791fa1dca..707fa92cf4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10778,9 +10778,6 @@ qemuDomainFixupCPUs(virDomainObj *vm, if (virCPUDefFindFeature(vm->def->cpu, "cmt")) { g_autoptr(virCPUDef) fixedCPU =3D virCPUDefCopyWithoutModel(vm->de= f->cpu); - if (!fixedCPU) - return -1; - virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false, virQEMUCapsCPUFilterFeatures, &arch); @@ -10791,9 +10788,6 @@ qemuDomainFixupCPUs(virDomainObj *vm, if (virCPUDefFindFeature(*origCPU, "cmt")) { g_autoptr(virCPUDef) fixedOrig =3D virCPUDefCopyWithoutModel(*orig= CPU); - if (!fixedOrig) - return -1; - virCPUDefCopyModelFilter(fixedOrig, *origCPU, false, virQEMUCapsCPUFilterFeatures, &arch); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 146318c6db..e64a061843 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12193,8 +12193,7 @@ qemuConnectBaselineCPU(virConnectPtr conn G_GNUC_UN= USED, !!(flags & VIR_CONNECT_BASELINE_CPU_MI= GRATABLE)))) goto cleanup; - if (!(cpu =3D virCPUDefCopyWithoutModel(baseline))) - goto cleanup; + cpu =3D virCPUDefCopyWithoutModel(baseline); virCPUDefCopyModelFilter(cpu, baseline, false, virQEMUCapsCPUFilterFea= tures, &cpus[0]->arch); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 27973a2e03..eb1797688c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8853,8 +8853,7 @@ qemuProcessRefreshCPU(virQEMUDriver *driver, if (!(hostmig =3D virCPUCopyMigratable(host->arch, host))) return -1; - if (!(cpu =3D virCPUDefCopyWithoutModel(hostmig))) - return -1; + cpu =3D virCPUDefCopyWithoutModel(hostmig); virCPUDefCopyModelFilter(cpu, hostmig, false, virQEMUCapsCPUFilter= Features, &host->arch); --=20 2.39.2