From nobody Sun Feb 8 20:13:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1572960615; cv=none; d=zoho.com; s=zohoarc; b=DOn+ZptdSdQsUTH9CNake3ax5RvjA27pbp1WSquH/Nbn+CuxFlSw+RPNyGI+38TTECYMv4PYaRLoLCRGtEmfJg/R1jBs7PxhuNshvEXxGEjaHzP8iy0sVVfKRwqmPHQ6mJR8ww6lfDfU+YVWoEXFxn6cu5twIgIQaKkKyN6Wjro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960615; 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=6v4Ed3DUcClh2sNN1B6+nuxwz0vTukpagrdIOyuCJJ8=; b=KdVXsVav7zzVg0DhHpVQpWyJ11PvQe/upUI54+N/bfcUrIwP0QU89S8ZCcDp1TOes4ceiQ18fjykW+KKVdPZHuizZmYfpjPi6HcF3AhIkyJjaZiBK6Ul47lyovP36etiJVWsdZBGZ1Z4I2xelAubfOEHcSIY8JlRcqho5khLDGQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1572960615503447.3570043062431; Tue, 5 Nov 2019 05:30:15 -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-242-TuqQAVotNpCIdgcLQDO_Ig-1; Tue, 05 Nov 2019 08:29:00 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28A601005513; Tue, 5 Nov 2019 13:28:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02E0A5DA7E; Tue, 5 Nov 2019 13:28:54 +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 B54AA1802219; Tue, 5 Nov 2019 13:28:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA5DS0hr004009 for ; Tue, 5 Nov 2019 08:28:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id C3A0F608B7; Tue, 5 Nov 2019 13:28:00 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98D90608B6 for ; Tue, 5 Nov 2019 13:28:00 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id D8257105D77; Tue, 5 Nov 2019 14:27:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572960614; 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=6v4Ed3DUcClh2sNN1B6+nuxwz0vTukpagrdIOyuCJJ8=; b=YdD9920A3a0bIGpdlrJiWN6gfW0aeZ6ZYJBgn/SULD4vz+sW6OT6vfDcpkigbajva4xgvg 5t1suReCdBdhw5hxsMNjo9EzbDATGw1/tCTy83NP16knICnYb2OqTqQrVJNEUwFsPyy2eo F4bUSOJ9bwsmjIaGZK87N8qol707J4c= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:27 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 29/52] qemu: Refactor virQEMUCapsLoadAccel 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.14 X-MC-Unique: TuqQAVotNpCIdgcLQDO_Ig-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" And make it use virQEMUCapsGetAccel once rather than repeating the same code in all functions called from virQEMUCapsLoadAccel. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch src/qemu/qemu_capabilities.c | 40 ++++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 62667cb882..d19bcebdeb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3338,26 +3338,22 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps, =20 =20 static int -virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps, +virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccelPtr caps, xmlXPathContextPtr ctxt, - virDomainVirtType virtType) + const char *typeStr) { char *str =3D NULL; xmlNodePtr hostCPUNode; xmlNodePtr *nodes =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); qemuMonitorCPUModelInfoPtr hostCPU =3D NULL; + g_autofree char *xpath =3D g_strdup_printf("./hostCPU[@type=3D'%s']", = typeStr); int ret =3D -1; size_t i; int n; int val; =20 - if (virtType =3D=3D VIR_DOMAIN_VIRT_KVM) - hostCPUNode =3D virXPathNode("./hostCPU[@type=3D'kvm']", ctxt); - else - hostCPUNode =3D virXPathNode("./hostCPU[@type=3D'tcg']", ctxt); - - if (!hostCPUNode) { + if (!(hostCPUNode =3D virXPathNode(xpath, ctxt))) { ret =3D 0; goto cleanup; } @@ -3458,8 +3454,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCa= ps, } } =20 - virQEMUCapsSetCPUModelInfo(qemuCaps, virtType, hostCPU); - hostCPU =3D NULL; + caps->hostCPU.info =3D g_steal_pointer(&hostCPU); ret =3D 0; =20 cleanup: @@ -3471,22 +3466,18 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemu= Caps, =20 =20 static int -virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps, +virQEMUCapsLoadCPUModels(virQEMUCapsAccelPtr caps, xmlXPathContextPtr ctxt, - virDomainVirtType type) + const char *typeStr) { g_autoptr(qemuMonitorCPUDefs) defs =3D NULL; g_autofree xmlNodePtr * nodes =3D NULL; + g_autofree char *xpath =3D g_strdup_printf("./cpu[@type=3D'%s']", type= Str); size_t i; int n; xmlNodePtr node; =20 - if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - n =3D virXPathNodeSet("./cpu[@type=3D'kvm']", ctxt, &nodes); - else - n =3D virXPathNodeSet("./cpu[@type=3D'tcg']", ctxt, &nodes); - - if (n < 0) { + if ((n =3D virXPathNodeSet(xpath, ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu capabilities cpus")); return -1; @@ -3550,11 +3541,7 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps, } } =20 - if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - qemuCaps->kvm.cpuModels =3D g_steal_pointer(&defs); - else - qemuCaps->tcg.cpuModels =3D g_steal_pointer(&defs); - + caps->cpuModels =3D g_steal_pointer(&defs); return 0; } =20 @@ -3564,10 +3551,13 @@ virQEMUCapsLoadAccel(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt, virDomainVirtType type) { - if (virQEMUCapsLoadHostCPUModelInfo(qemuCaps, ctxt, type) < 0) + virQEMUCapsAccelPtr caps =3D virQEMUCapsGetAccel(qemuCaps, type); + const char *typeStr =3D type =3D=3D VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg= "; + + if (virQEMUCapsLoadHostCPUModelInfo(caps, ctxt, typeStr) < 0) return -1; =20 - if (virQEMUCapsLoadCPUModels(qemuCaps, ctxt, type) < 0) + if (virQEMUCapsLoadCPUModels(caps, ctxt, typeStr) < 0) 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