From nobody Sun Feb 8 18:18:57 2026 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.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; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491403131017854.7773701076482; Wed, 5 Apr 2017 07:38:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81B7BC04BD42; Wed, 5 Apr 2017 14:38:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5645B7EF5F; Wed, 5 Apr 2017 14:38:49 +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 00E2B5EC66; Wed, 5 Apr 2017 14:38:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v35EbRLc007315 for ; Wed, 5 Apr 2017 10:37:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4918A406A; Wed, 5 Apr 2017 14:37:27 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05A2BA860A; Wed, 5 Apr 2017 14:37:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 81B7BC04BD42 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 81B7BC04BD42 From: Martin Kletzander To: libvir-list@redhat.com Date: Wed, 5 Apr 2017 16:36:33 +0200 Message-Id: <719e9ba0cfffaf4946b5c90a37a76bd23127456d.1491402571.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Erik=20=C5=A0kult=C3=A9ty?= Subject: [libvirt] [PATCH v2 10/12] Init host cache info in drivers 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: , MIME-Version: 1.0 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 05 Apr 2017 14:38:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Added only in drivers that were already calling virCapabilitiesInitNUMA(). Instead of refactoring all the callers to behave the same way in case of error, just follow what the callers are doing for all the functions. Signed-off-by: Martin Kletzander --- src/lxc/lxc_conf.c | 3 +++ src/openvz/openvz_conf.c | 3 +++ src/phyp/phyp_driver.c | 3 +++ src/qemu/qemu_capabilities.c | 3 +++ src/uml/uml_conf.c | 3 +++ src/vbox/vbox_common.c | 3 +++ src/vmware/vmware_conf.c | 3 +++ src/vz/vz_driver.c | 2 ++ 8 files changed, 23 insertions(+) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index e47b667f582a..508b98ba21b3 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -81,6 +81,9 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) VIR_WARN("Failed to query host NUMA topology, disabling NUMA capab= ilities"); } + if (virCapabilitiesInitCaches(caps) < 0) + VIR_WARN("Failed to get host CPU cache info"); + /* Only probe for power management capabilities in the driver, * not in the emulator */ if (driver && virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 196fefb8de19..23a02d749e8b 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -168,6 +168,9 @@ virCapsPtr openvzCapsInit(void) if (virCapabilitiesInitNUMA(caps) < 0) goto no_memory; + if (virCapabilitiesInitCaches(caps) < 0) + goto no_memory; + if ((guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, caps->host.arch, diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 2123784f70da..0cc288f36d8e 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -340,6 +340,9 @@ phypCapsInit(void) ("Failed to query host NUMA topology, disabling NUMA capabilit= ies"); } + if (virCapabilitiesInitCaches(caps) < 0) + VIR_WARN("Failed to get host CPU cache info"); + if ((guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_LINUX, caps->host.arch, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a2f4f43e65bf..1a3072a5c834 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1109,6 +1109,9 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) VIR_WARN("Failed to query host NUMA topology, disabling NUMA capab= ilities"); } + if (virCapabilitiesInitCaches(caps) < 0) + VIR_WARN("Failed to get host CPU cache info"); + if (!(caps->host.cpu =3D virCPUProbeHost(caps->host.arch))) VIR_WARN("Failed to get host CPU"); diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 871653c5a64c..2be849a6c160 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -69,6 +69,9 @@ virCapsPtr umlCapsInit(void) VIR_WARN("Failed to query host NUMA topology, disabling NUMA capab= ilities"); } + if (virCapabilitiesInitCaches(caps) < 0) + VIR_WARN("Failed to get host CPU cache info"); + if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) VIR_WARN("Failed to get host power management capabilities"); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index d2b36ac0dfed..d6d363e456a7 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -79,6 +79,9 @@ vboxCapsInit(void) if (virCapabilitiesInitNUMA(caps) < 0) goto no_memory; + if (virCapabilitiesInitCaches(caps) < 0) + goto no_memory; + if ((guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, caps->host.arch, diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index bf4597c4748a..891d9a47f0b4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -68,6 +68,9 @@ vmwareCapsInit(void) if (virCapabilitiesInitNUMA(caps) < 0) goto error; + if (virCapabilitiesInitCaches(caps) < 0) + goto error; + /* i686 guests are always supported */ if ((guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index da83a8ff5ca7..b567c0a56a8f 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -118,6 +118,8 @@ vzBuildCapabilities(void) if (virCapabilitiesInitNUMA(caps) < 0) goto error; + if (virCapabilitiesInitCaches(caps) < 0) + goto error; verify(ARRAY_CARDINALITY(archs) =3D=3D ARRAY_CARDINALITY(emulators)); --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list