From nobody Sun Feb 8 22:18:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1572960548; cv=none; d=zoho.com; s=zohoarc; b=c+LIRgqIuoOrA6RSVI3G8suwgtVCGjhjSRFeGurFM6YtbrgxX2yEyaKMN8njPu8z0jAL+LLO25Coq9/v5LHc8N5ql8JUuClEMq80vdhPXea0E2cpkTxGi3goIs3YhgP6L68zOGy51iuya8ZH+O1vDN+Y3a/8HtpodcMC8qocfsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960548; 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=9LxpGyoYNJOJPq2oH7QFe6jiGrRkHZqsBJm8uoQa+qA=; b=a8xyJQKWImzDnk+/VVIaj/I0iXjIioMKWPf7iwammJChyyqWd6bvh9IOS0Xc6GtdtuRazHCD26kA1G9tl1rzWSYma89qSSYUYjHnfKNdCp2h3VPHfNXOF/TP83XyWjB03A3byTlzOyGldn+3mQj+3BXpnmV0WS44wsz7OPa7Kew= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1572960548387247.12755186909385; Tue, 5 Nov 2019 05:29:08 -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-135-AxNOmVagOLq29E7xKumtbA-1; Tue, 05 Nov 2019 08:29:05 -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 7AAA3107ACC6; Tue, 5 Nov 2019 13:28:59 +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 44EB160C88; Tue, 5 Nov 2019 13:28:59 +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 E7F441802223; Tue, 5 Nov 2019 13:28:58 +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 xA5DS155004049 for ; Tue, 5 Nov 2019 08:28:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 20A4A5D726; Tue, 5 Nov 2019 13:28:01 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C57405D728 for ; Tue, 5 Nov 2019 13:28:00 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id EADCD105D7A; 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=1572960547; 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=9LxpGyoYNJOJPq2oH7QFe6jiGrRkHZqsBJm8uoQa+qA=; b=GDlbHgG/UlK15LzI/N4iroOaJmztrL9S1N2qLmTt3OEieWUJGJgaV/WV2h00avcUWc9kiz ZyL5KbuzUn0zX1Jj2UyHgIc72NqN1YZDLOwdrGk2rw0UIVUYZtJ1Qd1N23J1xmX4eXLZJ3 JyagQvfQ0Z0MfEYL1n3sNh6FD4zRvfg= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:30 +0100 Message-Id: <1991e478772aa77ca8bb329db4b48119b642ad39.1572958254.git.jdenemar@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 v3 32/52] qemu: Refactor probing of accelerator dependent data 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: AxNOmVagOLq29E7xKumtbA-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" To avoid duplicating code which selects the right virQEMUCapsAccel data to be filled during probing. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch src/qemu/qemu_capabilities.c | 51 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2dca1b353b..c66eef3e94 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2528,22 +2528,15 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon, =20 static int virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps, - qemuMonitorPtr mon, - bool tcg) + virQEMUCapsAccelPtr accel, + qemuMonitorPtr mon) { - qemuMonitorCPUDefsPtr defs =3D NULL; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS)) return 0; =20 - if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &defs) < 0) + if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuMod= els) < 0) return -1; =20 - if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) - qemuCaps->tcg.cpuModels =3D defs; - else - qemuCaps->kvm.cpuModels =3D defs; - return 0; } =20 @@ -2552,36 +2545,28 @@ int virQEMUCapsProbeCPUDefinitionsTest(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - return virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false); + return virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, &qemuCaps->kvm, mon= ); } =20 =20 static int virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps, + virQEMUCapsAccelPtr accel, qemuMonitorPtr mon, - bool tcg) + virDomainVirtType virtType) { + const char *model =3D virtType =3D=3D VIR_DOMAIN_VIRT_KVM ? "host" : "= max"; qemuMonitorCPUModelInfoPtr modelInfo =3D NULL; qemuMonitorCPUModelInfoPtr nonMigratable =3D NULL; virHashTablePtr hash =3D NULL; - const char *model; virCPUDefPtr cpu; qemuMonitorCPUModelExpansionType type; - virDomainVirtType virtType; bool fail_no_props =3D true; int ret =3D -1; =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) return 0; =20 - if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - virtType =3D VIR_DOMAIN_VIRT_QEMU; - model =3D "max"; - } else { - virtType =3D VIR_DOMAIN_VIRT_KVM; - model =3D "host"; - } - if (VIR_ALLOC(cpu) < 0) goto cleanup; =20 @@ -2646,8 +2631,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps, modelInfo->migratability =3D true; } =20 - virQEMUCapsSetCPUModelInfo(qemuCaps, virtType, modelInfo); - modelInfo =3D NULL; + accel->hostCPU.info =3D g_steal_pointer(&modelInfo); ret =3D 0; =20 cleanup: @@ -4563,6 +4547,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, { int major, minor, micro; g_autofree char *package =3D NULL; + virQEMUCapsAccelPtr accel; + virDomainVirtType type; =20 /* @mon is supposed to be locked by callee */ =20 @@ -4600,6 +4586,13 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0) return -1; =20 + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) + type =3D VIR_DOMAIN_VIRT_KVM; + else + type =3D VIR_DOMAIN_VIRT_QEMU; + + accel =3D virQEMUCapsGetAccel(qemuCaps, type); + if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0) @@ -4608,7 +4601,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, return -1; if (virQEMUCapsProbeQMPMachineProps(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false) < 0) + if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, accel, mon) < 0) return -1; if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0) return -1; @@ -4628,7 +4621,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, /* The following probes rely on other previously probed capabilities. * No capabilities bits should be set below this point. */ =20 - if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0) + if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, type) < 0) return -1; =20 return 0; @@ -4639,10 +4632,12 @@ int virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, true) < 0) + virQEMUCapsAccelPtr accel =3D virQEMUCapsGetAccel(qemuCaps, VIR_DOMAIN= _VIRT_QEMU); + + if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, accel, mon) < 0) return -1; =20 - if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, true) < 0) + if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, VIR_DOMAIN_VIRT_Q= EMU) < 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