From nobody Mon Feb 9 10:30:30 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=1680183560; cv=none; d=zohomail.com; s=zohoarc; b=RJ29c6IVfAaADLp4XEgceomo4iz0PxsCQz9QpHMP2+YFNJAnvv0ZM/xVykXN96ECkc8++oUICz+qwjUZlZd4NFwD5OSc2tZEBdJL03V4iN6aVN4geicmMaX9mIXc2SG5GtzNkU8SgZeDRzJsFUGXIEgyeKSq+nV4/uGvjtVcN8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680183560; 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=vIyStmU/ZqndUzUg8zTFbfYSmTz48OH6CLoTbURF4YA=; b=WbORJuVgouOeV25eiy6mv3AJpR1rwxk0Cosvm1f6AEAm8Vfp3u06cTKu7EPG3bmLC+dwWIUSZWplTGvnnNVBiJAIjtnq9KCR/eoEQx03BGef9UWZZihM5obPxTDnad5s8HxGDsu5JXM9+X+m6DP+HLe4RkPoeiHmRXBe40YfmNU= 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 1680183560696987.6519540401185; Thu, 30 Mar 2023 06:39:20 -0700 (PDT) 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-358-oSpmZDhZNe2GGJN0rzs-ZA-1; Thu, 30 Mar 2023 09:39:14 -0400 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 AE2A129ABA18; Thu, 30 Mar 2023 13:39:11 +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 99CC2C15BB8; Thu, 30 Mar 2023 13:39:11 +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 B4615194658F; Thu, 30 Mar 2023 13:38:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 44F8D1946587 for ; Thu, 30 Mar 2023 13:38:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 363F22166B36; Thu, 30 Mar 2023 13:38:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC83D2166B35 for ; Thu, 30 Mar 2023 13:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680183559; 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=vIyStmU/ZqndUzUg8zTFbfYSmTz48OH6CLoTbURF4YA=; b=VWYREjz+PUOjd3S4IJuQzG+GaTj1DltlNDzcVk5WbZpPogIaDKbHtQcZltXzaLmsadcGSz eBQHkcGRMaeI1ydciFdr81myf0WPE57VIubxTmnF+qCt5iUbBLtRIN5+R67Vl/JsUTlBOH W6SBDoxf+ueOHBpXVqYaQIOnHIaIPCM= X-MC-Unique: oSpmZDhZNe2GGJN0rzs-ZA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/31] virQEMUCapsInitGuestFromBinary: Remove return value Date: Thu, 30 Mar 2023 15:38:00 +0200 Message-Id: <800cfe1337dde8e05f161421ec74646ff8610fbe.1680182808.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1680183561961100001 Content-Type: text/plain; charset="utf-8" The function always returns 0. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 11 ++++------- src/qemu/qemu_capabilities.h | 8 ++++---- tests/qemucaps2xmltest.c | 8 +------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 135455df63..72105a65a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1004,9 +1004,8 @@ virQEMUCapsInitGuest(virCaps *caps, } } - ret =3D virQEMUCapsInitGuestFromBinary(caps, - binary, qemuCaps, - guestarch); + virQEMUCapsInitGuestFromBinary(caps, binary, qemuCaps, guestarch); + ret =3D 0; VIR_FREE(binary); virObjectUnref(qemuCaps); @@ -1096,7 +1095,7 @@ virQEMUCapsGetMachineTypesCaps(virQEMUCaps *qemuCaps, } -int +void virQEMUCapsInitGuestFromBinary(virCaps *caps, const char *binary, virQEMUCaps *qemuCaps, @@ -1107,7 +1106,7 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps, size_t nmachines =3D 0; if (!binary) - return 0; + return; virQEMUCapsGetMachineTypesCaps(qemuCaps, &nmachines, &machines); @@ -1150,8 +1149,6 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps, virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_= PAE); virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_= NONPAE); } - - return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4881f41253..ca31e26f0d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -819,10 +819,10 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCaps *qemuC= aps, const char *virQEMUCapsGetPreferredMachine(virQEMUCaps *qemuCaps, virDomainVirtType virtType); -int virQEMUCapsInitGuestFromBinary(virCaps *caps, - const char *binary, - virQEMUCaps *qemuCaps, - virArch guestarch); +void virQEMUCapsInitGuestFromBinary(virCaps *caps, + const char *binary, + virQEMUCaps *qemuCaps, + virArch guestarch); int virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virArch hostarch, diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 2c5cb1b68b..192fb48450 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -102,13 +102,7 @@ testGetCaps(char *capsData, const testQemuData *data) return NULL; } - if (virQEMUCapsInitGuestFromBinary(caps, - binary, - qemuCaps, - arch) < 0) { - fprintf(stderr, "failed to create the capabilities from qemu"); - return NULL; - } + virQEMUCapsInitGuestFromBinary(caps, binary, qemuCaps, arch); return g_steal_pointer(&caps); } --=20 2.39.2