From nobody Sun Feb 8 20:37:55 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=1677853732; cv=none; d=zohomail.com; s=zohoarc; b=iEP1IriskDLl2XQMRXoeEO7ARd8XNAfJJjqK4Ci4HaQMyFAmMXCiEZ2+R7UFNVMHtQjC0niUaAttScXmSTFmuEIFo3NC3ybiX355lrJJOP9ELcEOLomePXQYdc0wukq3mS9xJjv8srlu5LACWmerswI5XnCPEsR+Htpd3YZ+M8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853732; 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=lB8XwcepRJVjfnMCfZRyL3FK1hajnatB4J9bbeyKy6o=; b=DLGsRgm/B/+/oKngYuDSgvBRkq1sOCIuH3dIGyUPDd/aZpXhr7DKDwrleczSxhkvRG8UdixXIm5tqQboXXDu9QntHyIL0DkHXNePIHaEnrOLa+v35etRePD13xYebyzTTC/g1UXMNd6XEjg0lNHZjNMsILZ3fJb0KkHXmPL+aCI= 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 1677853732453281.8371754025975; Fri, 3 Mar 2023 06:28:52 -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-433-JMYBGW9AO6eOOwUERG0Mcw-1; Fri, 03 Mar 2023 09:28:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A59CB1802CE6; Fri, 3 Mar 2023 14:28:42 +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 92B4EC16027; Fri, 3 Mar 2023 14:28:42 +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 87C52194284D; Fri, 3 Mar 2023 14:28:21 +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 A1F491948672 for ; Fri, 3 Mar 2023 14:28:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 876FD40B3F12; Fri, 3 Mar 2023 14:28:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA4EF4011AC8 for ; Fri, 3 Mar 2023 14:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853731; 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=lB8XwcepRJVjfnMCfZRyL3FK1hajnatB4J9bbeyKy6o=; b=S/8wMaVuBO4eEzIpebUzmlt4CfcvGpUAqO6xibxIigcHaxmwpxCovb6fp/EtSPDpAZNRtR KbcmAO1U3DVNQLURchp+MePT/8HLFTxOltPlnyxwfEFAbs4eMYJwUo6QLPhQOmKRhbgNRE r3c7SHEL0JI/KtLH22RlfkJNXIUjYbE= X-MC-Unique: JMYBGW9AO6eOOwUERG0Mcw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/31] cpu: Remove return value from virCPUDefCopyModel(Filter) Date: Fri, 3 Mar 2023 15:27:48 +0100 Message-Id: <9264178d99a5ede8bb8e80536142c070ea02f518.1677853487.git.pkrempa@redhat.com> 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.8 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: 1677853732674100001 Content-Type: text/plain; charset="utf-8" The functions were always returning 0. Signed-off-by: Peter Krempa --- src/conf/cpu_conf.c | 11 ++++------- src/conf/cpu_conf.h | 4 ++-- src/cpu/cpu_arm.c | 3 +-- src/cpu/cpu_s390.c | 3 +-- src/cpu/cpu_x86.c | 11 +++++------ src/qemu/qemu_capabilities.c | 10 ++++------ src/qemu/qemu_domain.c | 10 ++++------ src/qemu/qemu_driver.c | 9 +++------ src/qemu/qemu_process.c | 8 ++++---- 9 files changed, 28 insertions(+), 41 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index a33f39ef31..1227db1201 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -140,16 +140,16 @@ virCPUDefFree(virCPUDef *def) } -int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +void ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) virCPUDefCopyModel(virCPUDef *dst, const virCPUDef *src, bool resetPolicy) { - return virCPUDefCopyModelFilter(dst, src, resetPolicy, NULL, NULL); + virCPUDefCopyModelFilter(dst, src, resetPolicy, NULL, NULL); } -int +void virCPUDefCopyModelFilter(virCPUDef *dst, const virCPUDef *src, bool resetPolicy, @@ -185,8 +185,6 @@ virCPUDefCopyModelFilter(virCPUDef *dst, dst->features[n].name =3D g_strdup(src->features[i].name); } - - return 0; } @@ -281,8 +279,7 @@ virCPUDefCopy(const virCPUDef *cpu) if (!(copy =3D virCPUDefCopyWithoutModel(cpu))) return NULL; - if (virCPUDefCopyModel(copy, cpu, false) < 0) - return NULL; + virCPUDefCopyModel(copy, cpu, false); return g_steal_pointer(©); } diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 113d349708..5d69b4d2e0 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -175,7 +175,7 @@ void virCPUDefFree(virCPUDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUDef, virCPUDefFree); -int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +void ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) virCPUDefCopyModel(virCPUDef *dst, const virCPUDef *src, bool resetPolicy); @@ -187,7 +187,7 @@ typedef bool (*virCPUDefFeatureFilter)(const char *name, virCPUFeaturePolicy policy, void *opaque); -int +void virCPUDefCopyModelFilter(virCPUDef *dst, const virCPUDef *src, bool resetPolicy, diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 3ec06edef4..a890ed6ba3 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -465,8 +465,7 @@ virCPUarmUpdate(virCPUDef *guest, return -1; updated->mode =3D VIR_CPU_MODE_CUSTOM; - if (virCPUDefCopyModel(updated, host, true) < 0) - return -1; + virCPUDefCopyModel(updated, host, true); virCPUDefStealModel(guest, updated, false); guest->mode =3D VIR_CPU_MODE_CUSTOM; diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 81a1513ecb..0f3b5c6820 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -72,8 +72,7 @@ virCPUs390Update(virCPUDef *guest, return -1; updated->mode =3D VIR_CPU_MODE_CUSTOM; - if (virCPUDefCopyModel(updated, host, true) < 0) - return -1; + virCPUDefCopyModel(updated, host, true); for (i =3D 0; i < guest->nfeatures; i++) { if (virCPUDefUpdateFeature(updated, diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index c6323ce8c7..2fede8e5fa 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2943,8 +2943,7 @@ x86UpdateHostModel(virCPUDef *guest, updated->type =3D VIR_CPU_TYPE_GUEST; updated->mode =3D VIR_CPU_MODE_CUSTOM; - if (virCPUDefCopyModel(updated, host, true) < 0) - return -1; + virCPUDefCopyModel(updated, host, true); if (guest->vendor_id) { g_free(updated->vendor_id); @@ -3257,7 +3256,9 @@ virCPUx86ExpandFeatures(virCPUDef *cpu) virCPUDefFreeModel(cpu); - return virCPUDefCopyModel(cpu, expanded, false); + virCPUDefCopyModel(cpu, expanded, false); + + return 0; } @@ -3282,9 +3283,7 @@ virCPUx86CopyMigratable(virCPUDef *cpu) if (!(copy =3D virCPUDefCopyWithoutModel(cpu))) return NULL; - if (virCPUDefCopyModelFilter(copy, cpu, false, - x86FeatureFilterMigratable, map) < 0) - return NULL; + virCPUDefCopyModelFilter(copy, cpu, false, x86FeatureFilterMigratable,= map); return g_steal_pointer(©); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 826293a879..9fe6579dfe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3852,13 +3852,11 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps, VIR_DEBUG("No host CPU model info from QEMU; probing host CPU dire= ctly"); cpuModels =3D virQEMUCapsGetCPUModels(qemuCaps, type, NULL, NULL); - hostCPU =3D virQEMUCapsProbeHostCPU(hostArch, cpuModels); - - if (!hostCPU || - virCPUDefCopyModelFilter(cpu, hostCPU, true, - virQEMUCapsCPUFilterFeatures, - &qemuCaps->arch) < 0) + if (!(hostCPU =3D virQEMUCapsProbeHostCPU(hostArch, cpuModels))) goto error; + + virCPUDefCopyModelFilter(cpu, hostCPU, true, virQEMUCapsCPUFilterF= eatures, + &qemuCaps->arch); } else if (rc =3D=3D 2) { VIR_DEBUG("QEMU does not provide CPU model for arch=3D%s virttype= =3D%s", virArchToString(qemuCaps->arch), diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 74e20c4edb..9791fa1dca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10781,9 +10781,8 @@ qemuDomainFixupCPUs(virDomainObj *vm, if (!fixedCPU) return -1; - if (virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false, - virQEMUCapsCPUFilterFeatures, &arch) = < 0) - return -1; + virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false, + virQEMUCapsCPUFilterFeatures, &arch); virCPUDefFree(vm->def->cpu); vm->def->cpu =3D g_steal_pointer(&fixedCPU); @@ -10795,9 +10794,8 @@ qemuDomainFixupCPUs(virDomainObj *vm, if (!fixedOrig) return -1; - if (virCPUDefCopyModelFilter(fixedOrig, *origCPU, false, - virQEMUCapsCPUFilterFeatures, &arch) = < 0) - return -1; + virCPUDefCopyModelFilter(fixedOrig, *origCPU, false, + virQEMUCapsCPUFilterFeatures, &arch); virCPUDefFree(*origCPU); *origCPU =3D g_steal_pointer(&fixedOrig); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d00eb1796f..146318c6db 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12196,10 +12196,8 @@ qemuConnectBaselineCPU(virConnectPtr conn G_GNUC_U= NUSED, if (!(cpu =3D virCPUDefCopyWithoutModel(baseline))) goto cleanup; - if (virCPUDefCopyModelFilter(cpu, baseline, false, - virQEMUCapsCPUFilterFeatures, - &cpus[0]->arch) < 0) - goto cleanup; + virCPUDefCopyModelFilter(cpu, baseline, false, virQEMUCapsCPUFilterFea= tures, + &cpus[0]->arch); if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && virCPUExpandFeatures(cpus[0]->arch, cpu) < 0) @@ -12295,8 +12293,7 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps, baseline =3D g_new0(virCPUDef, 1); - if (virCPUDefCopyModel(baseline, cpus[0], false) < 0) - return NULL; + virCPUDefCopyModel(baseline, cpus[0], false); for (i =3D 1; i < ncpus; i++) { if (qemuMonitorGetCPUModelBaseline(proc->mon, baseline, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 63d7e1138d..27973a2e03 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8853,12 +8853,12 @@ qemuProcessRefreshCPU(virQEMUDriver *driver, if (!(hostmig =3D virCPUCopyMigratable(host->arch, host))) return -1; - if (!(cpu =3D virCPUDefCopyWithoutModel(hostmig)) || - virCPUDefCopyModelFilter(cpu, hostmig, false, - virQEMUCapsCPUFilterFeatures, - &host->arch) < 0) + if (!(cpu =3D virCPUDefCopyWithoutModel(hostmig))) return -1; + virCPUDefCopyModelFilter(cpu, hostmig, false, virQEMUCapsCPUFilter= Features, + &host->arch); + if (virCPUUpdate(vm->def->os.arch, vm->def->cpu, cpu) < 0) return -1; --=20 2.39.2