From nobody Mon Feb 9 15:10:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1573543710; cv=none; d=zoho.com; s=zohoarc; b=G8vcdw7m2Ex1gONqNvG0VGgW5+EsLh1OnDxuWR7V9oUKlwlkTtQ5Y1VoC5t3NrFChkaFi1UxLQwlXqQ7ZaG6yxGxMA1R2HBdDcpqzKaVgLkja0FxVsOlVhQ9tJtYAhcuQfWEXjakjZ2LwBX72tNBklIb61P4hKQ6pUSW1xWAX9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573543710; 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=rvj63Pa74Vhc6+EU1QlxZ3rhG3Nf8dRLkyRn56Mg8es=; b=BcG4t82JXKun1F5EjTEgZEvPwvx4lC2ZMtxjTPqE4QYLky2SyBmAfCWmc2Z+GLBf473/k+gpKBg17zCHQK2oA0fBrUKw8/IUzHIAG5RKO/uonpMj/Dnc1wBag+seb/DKM60thisIK0YwDD+jwb3uMM1GPsE6XPLA5fTGQxEbYo8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1573543710617854.9774579210585; Mon, 11 Nov 2019 23:28:30 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-oUnRUvCvPXScGIsgsZxzcw-1; Tue, 12 Nov 2019 02:28:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BC408064DC; Tue, 12 Nov 2019 07:28:22 +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 D0A3E9F5C; Tue, 12 Nov 2019 07:28:21 +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 7E63A4BB65; Tue, 12 Nov 2019 07:28:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAC7RrBa011343 for ; Tue, 12 Nov 2019 02:27:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B90162671; Tue, 12 Nov 2019 07:27:53 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB5D2627DF for ; Tue, 12 Nov 2019 07:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573543709; 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=rvj63Pa74Vhc6+EU1QlxZ3rhG3Nf8dRLkyRn56Mg8es=; b=CYD8aErQM7KTrHH9WWIjfL0vnY9b2Gd1Omgmwuir5R9wxBJvIVlEnxiPKiDWO6ugTJawJQ JYv2uDl2GJFZL2E1T1DJAzGbYs/yB81vFnFWM+o5VXjFZaIaco2U0g6TFBPEv8r+Bycr/t BNhHTBMnn5VfpVSXYLmehkWekcx4tSM= From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 12 Nov 2019 08:27:39 +0100 Message-Id: <58ffc51647596745a3548ea236d3bd02f383b88f.1573543601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/10] qemu: caps: Make capability filler functions void 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: oUnRUvCvPXScGIsgsZxzcw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Most of them don't have anything to report so we can simplify the logic. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_capabilities.c | 66 ++++++++++++------------------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 02ac421067..0229d7b5f8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5250,7 +5250,7 @@ virQEMUCapsFillDomainOSCaps(virDomainCapsOSPtr os, } -static int +static void virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, virQEMUCapsPtr qemuCaps, virDomainCapsPtr domCaps) @@ -5287,23 +5287,19 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, } domCaps->cpu.custom =3D filtered; } - - return 0; } -static int +static void virQEMUCapsFillDomainIOThreadCaps(virQEMUCapsPtr qemuCaps, virDomainCapsPtr domCaps) { domCaps->iothreads =3D virTristateBoolFromBool( virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)); - - return 0; } -static int +static void virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, const char *machine, virDomainCapsDeviceDiskPtr disk) @@ -5348,12 +5344,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr = qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(disk->model, VIR_DOMAIN_DISK_MODEL_VIRTIO_NON_TRANSITI= ONAL); } - - return 0; } -static int +static void virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceGraphicsPtr dev) { @@ -5365,12 +5359,10 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps= Ptr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_VNC); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SPICE= ); - - return 0; } -static int +static void virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceVideoPtr dev) { @@ -5389,12 +5381,10 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr= qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIR= TIO); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY)) VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_BOC= HS); - - return 0; } -static int +static void virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceHostdevPtr hostd= ev) { @@ -5432,12 +5422,10 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsP= tr qemuCaps, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO); } - - return 0; } -static int +static void virQEMUCapsFillDomainDeviceRNGCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceRNGPtr rng) { @@ -5460,8 +5448,6 @@ virQEMUCapsFillDomainDeviceRNGCaps(virQEMUCapsPtr qem= uCaps, VIR_DOMAIN_CAPS_ENUM_SET(rng->backendModel, VIR_DOMAIN_RNG_BACKEND= _EGD); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_RANDOM)) VIR_DOMAIN_CAPS_ENUM_SET(rng->backendModel, VIR_DOMAIN_RNG_BACKEND= _RANDOM); - - return 0; } @@ -5523,10 +5509,8 @@ virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuCap= s, * and virtualization type. Moreover, a common format is used to store * information about enumerations in @domCaps, so further processing is * required. - * - * Returns: 0 on success, <0 on failure */ -static int +static void virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qemuCaps, virDomainCapsPtr domCaps) { @@ -5536,7 +5520,7 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qe= muCaps, gic->supported =3D VIR_TRISTATE_BOOL_NO; if (!qemuDomainMachineIsARMVirt(domCaps->machine, domCaps->arch)) - return 0; + return; for (version =3D VIR_GIC_VERSION_LAST - 1; version > VIR_GIC_VERSION_NONE; @@ -5551,8 +5535,6 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qe= muCaps, VIR_DOMAIN_CAPS_ENUM_SET(gic->version, version); } - - return 0; } @@ -5564,17 +5546,15 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr = qemuCaps, * Take the information about SEV capabilities that has been obtained * using the 'query-sev-capabilities' QMP command and stored in @qemuCaps * and convert it to a form suitable for @domCaps. - * - * Returns: 0 on success, -1 on failure */ -static int +static void virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr qemuCaps, virDomainCapsPtr domCaps) { virSEVCapability *cap =3D qemuCaps->sevCapabilities; if (!cap) - return 0; + return; domCaps->sev =3D g_new0(virSEVCapability, 1); @@ -5582,8 +5562,6 @@ virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr qe= muCaps, domCaps->sev->cert_chain =3D g_strdup(cap->cert_chain); domCaps->sev->cbitpos =3D cap->cbitpos; domCaps->sev->reduced_phys_bits =3D cap->reduced_phys_bits; - - return 0; } @@ -5623,19 +5601,19 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, domCaps->machine, domCaps->arch, privileged, - firmwares, nfirmwares) < 0 || - virQEMUCapsFillDomainCPUCaps(caps, qemuCaps, domCaps) < 0 || - virQEMUCapsFillDomainIOThreadCaps(qemuCaps, domCaps) < 0 || - virQEMUCapsFillDomainDeviceDiskCaps(qemuCaps, - domCaps->machine, disk) < 0 || - virQEMUCapsFillDomainDeviceGraphicsCaps(qemuCaps, graphics) < 0 || - virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, video) < 0 || - virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev) < 0 || - virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng) < 0 || - virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps) < 0 || - virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps) < 0) + firmwares, nfirmwares) < 0) return -1; + virQEMUCapsFillDomainCPUCaps(caps, qemuCaps, domCaps); + virQEMUCapsFillDomainIOThreadCaps(qemuCaps, domCaps); + virQEMUCapsFillDomainDeviceDiskCaps(qemuCaps, domCaps->machine, disk); + virQEMUCapsFillDomainDeviceGraphicsCaps(qemuCaps, graphics); + virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, video); + virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev); + virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng); + virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); + virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); + return 0; } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list