From nobody Fri Dec 19 04:02:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1571153752; cv=none; d=zoho.com; s=zohoarc; b=hRNKnwVX3br4g64JbdH5cD5xPPr51sJrjLiEYulmbBIleixJ/COygF9XwPX5yqPmampgtgg6GV1G4EVykvDDjlWpOaw0p2bptGQtH4EyhY2wJb9m60rLvcGpl7zZJB9jyA2Vjq+YEpR08aRIpOzKhfSSaafuWJDuzWIbM8YdflI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571153752; 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=1gLq0CbqK2dgaPtk2GAOPADZnTPITeGTFKPeTfZa+n4=; b=Ng5TRHhlAqIMecTT7H6esn0Sk6PQq4byFM3G5nDlaRo9utCNAjDP8D/6b7ScEuEMQaSgYpit0LBbSjYtOc5lzwTrTDnTgrsJ7V3C3ttBVE6R1MR4m/AnTDaSQPf/jJAkvxSdMAc4iE2KBkWKDsbwh6gZen49KZZvMUFtJpFuh/o= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571153752806981.2351314017354; Tue, 15 Oct 2019 08:35:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC796C065121; Tue, 15 Oct 2019 15:35:50 +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 C4C9B5C1D4; Tue, 15 Oct 2019 15:35:50 +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 72FA66B49D; Tue, 15 Oct 2019 15:35:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FFZGQ0024659 for ; Tue, 15 Oct 2019 11:35:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5794A19C5B; Tue, 15 Oct 2019 15:35:16 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CFE9194BB for ; Tue, 15 Oct 2019 15:35:16 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 857D7101CDE; Tue, 15 Oct 2019 17:35:09 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:34:53 +0200 Message-Id: <20b93ba7e696423bbc84bef40d7dbdfc4eca68ad.1571152057.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 17/31] qemu: Split virQEMUCapsFetchCPUModels 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 15 Oct 2019 15:35:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Most of the code moved to a new virQEMUCapsFetchCPUDefinitions function and the existing virQEMUCapsFetchCPUModels just becomes a small wrapper around virQEMUCapsFetchCPUDefinitions and virQEMUCapsCPUDefsToModels. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 2: - new patch src/qemu/qemu_capabilities.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cdc3a2d4b0..436d65f578 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2487,15 +2487,15 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemu= Caps, } =20 =20 -int -virQEMUCapsFetchCPUModels(qemuMonitorPtr mon, - virArch arch, - virDomainCapsCPUModelsPtr *cpuModels) +static int +virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, + virArch arch, + qemuMonitorCPUDefsPtr *cpuDefs) { VIR_AUTOPTR(qemuMonitorCPUDefs) defs =3D NULL; size_t i; =20 - *cpuModels =3D NULL; + *cpuDefs =3D NULL; =20 if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0) return -1; @@ -2524,7 +2524,24 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon, } } =20 - if (!(*cpuModels =3D virQEMUCapsCPUDefsToModels(defs, NULL, NULL))) + VIR_STEAL_PTR(*cpuDefs, defs); + return 0; +} + + +int +virQEMUCapsFetchCPUModels(qemuMonitorPtr mon, + virArch arch, + virDomainCapsCPUModelsPtr *cpuModels) +{ + VIR_AUTOPTR(qemuMonitorCPUDefs) defs =3D NULL; + + *cpuModels =3D NULL; + + if (virQEMUCapsFetchCPUDefinitions(mon, arch, &defs) < 0) + return -1; + + if (defs && !(*cpuModels =3D virQEMUCapsCPUDefsToModels(defs, NULL, NU= LL))) return -1; =20 return 0; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list