From nobody Mon May 6 15:18:30 2024 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 1490882640773635.7633832229704; Thu, 30 Mar 2017 07:04:00 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 2B19B31B330; Thu, 30 Mar 2017 14:03: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 EEEA4A09EA; Thu, 30 Mar 2017 14:03:58 +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 9DDA418521CB; Thu, 30 Mar 2017 14:03:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE3uX7027476 for ; Thu, 30 Mar 2017 10:03:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 591B65C547; Thu, 30 Mar 2017 14:03:56 +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 D4A9971CA3 for ; Thu, 30 Mar 2017 14:03:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2B19B31B330 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 2B19B31B330 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:33 +0200 Message-Id: <7b3ca048d753883ce62282a0b95291b604240c22.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/16] conf: Fix possible memleak in capabilities 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 30 Mar 2017 14:03:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If formatting NUMA topology fails, the function returns immediatelly, but the buffer structure allocated on the stack references lot of heap-allocated memory and that would get lost in such case. Signed-off-by: Martin Kletzander --- src/conf/capabilities.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 08907aced1b9..be95c50cfb67 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) if (caps->host.nnumaCell && virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell, caps->host.numaCell) < 0) - return NULL; + goto error; for (i =3D 0; i < caps->host.nsecModels; i++) { virBufferAddLit(&buf, "\n"); @@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps) return NULL; return virBufferContentAndReset(&buf); + + error: + virBufferFreeAndReset(&buf); + return NULL; } /* get the maximum ID of cpus in the host */ --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882645366622.8245699929066; Thu, 30 Mar 2017 07:04:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A9E5C0092D9; Thu, 30 Mar 2017 14:04:03 +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 0A1101710E; Thu, 30 Mar 2017 14:04:03 +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 9D07A18523CA; Thu, 30 Mar 2017 14:04:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE3vxg027483 for ; Thu, 30 Mar 2017 10:03:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9DB95C547; Thu, 30 Mar 2017 14:03:57 +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 4213E7DD40 for ; Thu, 30 Mar 2017 14:03:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3A9E5C0092D9 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 3A9E5C0092D9 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:34 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/16] util: Fix virDirRead() description 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 30 Mar 2017 14:04:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/util/virfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index a91c2c349501..c0f448d3437d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2861,11 +2861,11 @@ virDirOpenQuiet(DIR **dirp, const char *name) /** * virDirRead: * @dirp: directory to read - * @end: output one entry + * @ent: output one entry * @name: if non-NULL, the name related to @dirp for use in error reporting * * Wrapper around readdir. Typical usage: - * struct dirent ent; + * struct dirent *ent; * int rc; * DIR *dir; * if (virDirOpen(&dir, name) < 0) --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882645640443.6360861981839; Thu, 30 Mar 2017 07:04:05 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 01CC364DAC; Thu, 30 Mar 2017 14:04:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C278E82287; Thu, 30 Mar 2017 14:04:03 +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 6A23D5ED68; Thu, 30 Mar 2017 14:04:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE3xLq027491 for ; Thu, 30 Mar 2017 10:03:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 529445C547; Thu, 30 Mar 2017 14:03:59 +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 CF3187DA1F for ; Thu, 30 Mar 2017 14:03:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 01CC364DAC Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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 01CC364DAC From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:35 +0200 Message-Id: <518af0129750fc8d46d65e5b562ae72da544345c.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/16] virsysfs: Add comments to separate logical blocks of functions 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 30 Mar 2017 14:04:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/util/virsysfs.c | 15 +++++++++++++-- src/util/virsysfs.h | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 7a98b488e0ff..c482e188a301 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -40,6 +40,9 @@ VIR_LOG_INIT("util.sysfs"); static const char *sysfs_system_path =3D SYSFS_SYSTEM_PATH; +/* + * Private function that should only be called from tests + */ void virSysfsSetSystemPath(const char *path) { if (path) @@ -49,6 +52,9 @@ void virSysfsSetSystemPath(const char *path) } +/* + * Generic getters + */ const char * virSysfsGetSystemPath(void) { @@ -110,6 +116,9 @@ virSysfsGetValueBitmap(const char *file, return ret; } +/* + * Per-CPU getters + */ int virSysfsGetCpuValueInt(unsigned int cpu, const char *file, @@ -127,7 +136,6 @@ virSysfsGetCpuValueInt(unsigned int cpu, return ret; } - int virSysfsGetCpuValueUint(unsigned int cpu, const char *file, @@ -145,7 +153,6 @@ virSysfsGetCpuValueUint(unsigned int cpu, return ret; } - int virSysfsGetCpuValueString(unsigned int cpu, const char *file, @@ -187,6 +194,10 @@ virSysfsGetCpuValueBitmap(unsigned int cpu, return ret; } + +/* + * Per-NUMA node getters + */ int virSysfsGetNodeValueString(unsigned int node, const char *file, diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h index cd871ff11dd1..1b24fc193a16 100644 --- a/src/util/virsysfs.h +++ b/src/util/virsysfs.h @@ -24,6 +24,9 @@ # include "internal.h" # include "virbitmap.h" +/* + * Generic getters + */ const char * virSysfsGetSystemPath(void); int @@ -38,6 +41,10 @@ int virSysfsGetValueBitmap(const char *file, virBitmapPtr *value); + +/* + * Per-CPU getters + */ int virSysfsGetCpuValueInt(unsigned int cpu, const char *file, @@ -57,6 +64,10 @@ virSysfsGetCpuValueBitmap(unsigned int cpu, const char *file, virBitmapPtr *value); + +/* + * Per-NUMA node getters + */ int virSysfsGetNodeValueString(unsigned int node, const char *file, --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882645830264.70886320012244; Thu, 30 Mar 2017 07:04:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA8497573C; Thu, 30 Mar 2017 14:04:03 +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 BB1FAB06B7; Thu, 30 Mar 2017 14:04:03 +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 5C91318523CA; Thu, 30 Mar 2017 14:04:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE402p027501 for ; Thu, 30 Mar 2017 10:04:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 568CA87645; Thu, 30 Mar 2017 14:04:00 +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 D304B5C8AA for ; Thu, 30 Mar 2017 14:03:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EA8497573C Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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 EA8497573C From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:36 +0200 Message-Id: <588754dac8d33601addbbeacdc3dcae912e606ab.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/16] util: Add virStringTrimOptionalNewline 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 30 Mar 2017 14:04:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/util/virstring.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virstring.h b/src/util/virstring.h index a5550e30d2e2..603650aa1588 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -288,4 +288,12 @@ bool virStringBufferIsPrintable(const uint8_t *buf, si= ze_t buflen); char *virStringEncodeBase64(const uint8_t *buf, size_t buflen); +static inline void +virStringTrimOptionalNewline(char *str) +{ + char *tmp =3D str + strlen(str) - 1; + if (*tmp =3D=3D '\n') + *tmp =3D '\0'; +} + #endif /* __VIR_STRING_H__ */ --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882649965616.0267936295929; Thu, 30 Mar 2017 07:04:09 -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 3D75E8F28E; Thu, 30 Mar 2017 14:04:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBC9987668; Thu, 30 Mar 2017 14:04:07 +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 840875ED6B; Thu, 30 Mar 2017 14:04:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE410f027514 for ; Thu, 30 Mar 2017 10:04:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id DFD1E5C8AA; Thu, 30 Mar 2017 14:04:01 +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 6871B87659 for ; Thu, 30 Mar 2017 14:04:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3D75E8F28E Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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 3D75E8F28E From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:37 +0200 Message-Id: <472d46f70a4460d37e4325067b0261387b9099a3.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/16] util: Add virFileReadValueScaledInt 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 30 Mar 2017 14:04:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 1 + src/util/virfile.c | 28 ++++++++++++++++++++++++++++ src/util/virfile.h | 1 + 3 files changed, 30 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b551cb86a68e..9e61accda3fc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1631,6 +1631,7 @@ virFileReadLimFD; virFileReadLink; virFileReadValueBitmap; virFileReadValueInt; +virFileReadValueScaledInt; virFileReadValueUint; virFileRelLinkPointsTo; virFileRemove; diff --git a/src/util/virfile.c b/src/util/virfile.c index c0f448d3437d..93fc81f2cfab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3880,6 +3880,34 @@ virFileReadValueUint(const char *path, unsigned int = *value) * fine. */ int +virFileReadValueScaledInt(const char *path, unsigned long long *value) +{ + char *str =3D NULL; + char *endp =3D NULL; + int ret =3D -1; + + if (!virFileExists(path)) + return -2; + + if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0) + return -1; + + virStringTrimOptionalNewline(str); + + if (virStrToLong_ullp(str, &endp, 10, value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid unsigned scaled integer value '%s' in fi= le '%s'"), + str, path); + goto cleanup; + } + + ret =3D virScaleInteger(value, endp, 1024, ULLONG_MAX); + cleanup: + VIR_FREE(str); + return ret; +} + +int virFileReadValueBitmap(const char *path, int maxlen, virBitmapPtr *value) diff --git a/src/util/virfile.h b/src/util/virfile.h index ba1c57c06a8e..406569bdb7e9 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -338,6 +338,7 @@ int virFileComparePaths(const char *p1, const char *p2); int virFileReadValueInt(const char *path, int *value); int virFileReadValueUint(const char *path, unsigned int *value); +int virFileReadValueScaledInt(const char *path, unsigned long long *value); int virFileReadValueBitmap(const char *path, int maxlen, virBitmapPtr *val= ue); #endif /* __VIR_FILE_H */ --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882653987611.6417133476142; Thu, 30 Mar 2017 07:04:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B0596AF4; Thu, 30 Mar 2017 14:04:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4033C90A7C; Thu, 30 Mar 2017 14:04:12 +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 BF0CE5ED6D; Thu, 30 Mar 2017 14:04:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE450h027543 for ; Thu, 30 Mar 2017 10:04:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9F9C487650; Thu, 30 Mar 2017 14:04:05 +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 23EFB8765B for ; Thu, 30 Mar 2017 14:04:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B0596AF4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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 7B0596AF4 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:38 +0200 Message-Id: <709cf1eeb7afcf11b4377c0f67ab55f55ec99406.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/16] util: Add virSysfsDirOpen 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 30 Mar 2017 14:04:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 1 + src/util/virsysfs.c | 17 ++++++++++++++++- src/util/virsysfs.h | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9e61accda3fc..3965ef3f89c9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2621,6 +2621,7 @@ virVasprintfInternal; # util/virsysfs.h +virSysfsDirOpen; virSysfsGetCpuValueBitmap; virSysfsGetCpuValueInt; virSysfsGetCpuValueString; diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index c482e188a301..6686d8ddbfcb 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -25,7 +25,6 @@ #include "virsysfspriv.h" #include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "virstring.h" @@ -120,6 +119,22 @@ virSysfsGetValueBitmap(const char *file, * Per-CPU getters */ int +virSysfsDirOpen(const char *file, + DIR **dirp) +{ + char *path =3D NULL; + + if (virAsprintf(&path, "%s/%s", sysfs_system_path, file) < 0) + return -1; + + if (!virFileIsDir(path)) + return -2; + + return virDirOpen(dirp, path); +} + + +int virSysfsGetCpuValueInt(unsigned int cpu, const char *file, int *value) diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h index 1b24fc193a16..ff5012d62747 100644 --- a/src/util/virsysfs.h +++ b/src/util/virsysfs.h @@ -23,6 +23,8 @@ # include "internal.h" # include "virbitmap.h" +# include "virfile.h" + /* * Generic getters @@ -41,6 +43,10 @@ int virSysfsGetValueBitmap(const char *file, virBitmapPtr *value); +int +virSysfsDirOpen(const char *file, + DIR **dirp); + /* * Per-CPU getters --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882700840182.67320791536224; Thu, 30 Mar 2017 07:05:00 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 6837180F9E; Thu, 30 Mar 2017 14:04:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37F9D17AF6; Thu, 30 Mar 2017 14:04: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 8EEEA5ED77; Thu, 30 Mar 2017 14:04:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE46Z3027554 for ; Thu, 30 Mar 2017 10:04:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECE1D87650; Thu, 30 Mar 2017 14:04:06 +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 754A65C897 for ; Thu, 30 Mar 2017 14:04:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6837180F9E Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 6837180F9E From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:39 +0200 Message-Id: <0bc4ebb92ec69d73a30928ca310e6809c4545408.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/16] util: Add virSysfsCpuDirOpen 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 14:05:00 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 1 + src/util/virsysfs.c | 14 ++++++++++++++ src/util/virsysfs.h | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3965ef3f89c9..bcd2506ef7c9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2621,6 +2621,7 @@ virVasprintfInternal; # util/virsysfs.h +virSysfsCpuDirOpen; virSysfsDirOpen; virSysfsGetCpuValueBitmap; virSysfsGetCpuValueInt; diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 6686d8ddbfcb..7403ae20ba17 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -214,6 +214,20 @@ virSysfsGetCpuValueBitmap(unsigned int cpu, * Per-NUMA node getters */ int +virSysfsCpuDirOpen(unsigned int cpu, + const char *file, + DIR **dirp) +{ + char *path =3D NULL; + + if (virAsprintf(&path, "cpu/cpu%u/%s", cpu, file) < 0) + return -1; + + return virSysfsDirOpen(path, dirp); +} + + +int virSysfsGetNodeValueString(unsigned int node, const char *file, char **value) diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h index ff5012d62747..25bd100ea9cb 100644 --- a/src/util/virsysfs.h +++ b/src/util/virsysfs.h @@ -70,6 +70,11 @@ virSysfsGetCpuValueBitmap(unsigned int cpu, const char *file, virBitmapPtr *value); +int +virSysfsCpuDirOpen(unsigned int cpu, + const char *file, + DIR **dirp); + /* * Per-NUMA node getters --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882715808215.80819560078976; Thu, 30 Mar 2017 07:05:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DEB3B31A333; Thu, 30 Mar 2017 14:05:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C61390EC4; Thu, 30 Mar 2017 14:05:13 +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 2D4825ED69; Thu, 30 Mar 2017 14:04:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4A4C027569 for ; Thu, 30 Mar 2017 10:04:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id A2F727DD40; Thu, 30 Mar 2017 14:04:10 +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 297F787660 for ; Thu, 30 Mar 2017 14:04:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DEB3B31A333 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 DEB3B31A333 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:40 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/16] util: Use virStringTrimOptionalNewline in virFileRead* 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 30 Mar 2017 14:05:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/util/virfile.c | 18 +++++++----------- src/util/virhostcpu.c | 4 ++-- src/util/virsysfs.c | 2 ++ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 93fc81f2cfab..001ea9b37b2d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3811,7 +3811,6 @@ int virFileReadValueInt(const char *path, int *value) { char *str =3D NULL; - char *endp =3D NULL; if (!virFileExists(path)) return -2; @@ -3819,8 +3818,9 @@ virFileReadValueInt(const char *path, int *value) if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0) return -1; - if (virStrToLong_i(str, &endp, 10, value) < 0 || - (endp && !c_isspace(*endp))) { + virStringTrimOptionalNewline(str); + + if (virStrToLong_i(str, NULL, 10, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid integer value '%s' in file '%s'"), str, path); @@ -3847,7 +3847,6 @@ int virFileReadValueUint(const char *path, unsigned int *value) { char *str =3D NULL; - char *endp =3D NULL; if (!virFileExists(path)) return -2; @@ -3855,8 +3854,9 @@ virFileReadValueUint(const char *path, unsigned int *= value) if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0) return -1; - if (virStrToLong_uip(str, &endp, 10, value) < 0 || - (endp && !c_isspace(*endp))) { + virStringTrimOptionalNewline(str); + + if (virStrToLong_uip(str, NULL, 10, value)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid unsigned integer value '%s' in file '%s'= "), str, path); @@ -3914,7 +3914,6 @@ virFileReadValueBitmap(const char *path, { char *buf =3D NULL; int ret =3D -1; - char *tmp =3D NULL; if (!virFileExists(path)) return -2; @@ -3922,10 +3921,7 @@ virFileReadValueBitmap(const char *path, if (virFileReadAll(path, maxlen, &buf) < 0) goto cleanup; - /* trim optinoal newline at the end */ - tmp =3D buf + strlen(buf) - 1; - if (*tmp =3D=3D '\n') - *tmp =3D '\0'; + virStringTrimOptionalNewline(buf); *value =3D virBitmapParseUnlimited(buf); if (!*value) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 02b9fc8eb94f..a660e3f4dbe5 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -847,13 +847,13 @@ virHostCPUParseCountLinux(void) tmp =3D str; do { if (virStrToLong_i(tmp, &tmp, 10, &ret) < 0 || - !strchr(",-\n", *tmp)) { + !strchr(",-", *tmp)) { virReportError(VIR_ERR_NO_SUPPORT, _("failed to parse %s"), str); ret =3D -1; goto cleanup; } - } while (*tmp++ !=3D '\n'); + } while (*tmp++ && *tmp); ret++; cleanup: diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 7403ae20ba17..8d3665377e8c 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -94,6 +94,8 @@ virSysfsGetValueString(const char *file, if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0) goto cleanup; + virStringTrimOptionalNewline(*value); + ret =3D 0; cleanup: VIR_FREE(path); --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882659986875.4841002787264; Thu, 30 Mar 2017 07:04:19 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 3C1517FD68; Thu, 30 Mar 2017 14:04:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10CA4B23F8; Thu, 30 Mar 2017 14:04:18 +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 B50DE5ED64; Thu, 30 Mar 2017 14:04:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4Gjl027588 for ; Thu, 30 Mar 2017 10:04:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F83971CB3; Thu, 30 Mar 2017 14:04:16 +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 CB81587667 for ; Thu, 30 Mar 2017 14:04:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3C1517FD68 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 3C1517FD68 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:41 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/16] util: Unify behaviour of the functions in sysfs.c 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 14:04:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Make virSysfsGet*ValueString() functions use virSysfsGetValueString() then we have one more allocation, but the code is cleaner and it's easier to make sure the behaviour (e.g. return -2 on missing file) isn't changed by mistake. Signed-off-by: Martin Kletzander --- src/util/virsysfs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 8d3665377e8c..a8550bbfbc26 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -178,19 +178,11 @@ virSysfsGetCpuValueString(unsigned int cpu, char *path =3D NULL; int ret =3D -1; - if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file= ) < 0) + if (virAsprintf(&path, "cpu/cpu%u/%s", cpu, file) < 0) return -1; - if (!virFileExists(path)) { - ret =3D -2; - goto cleanup; - } + ret =3D virSysfsGetValueString(path, value); - if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0) - goto cleanup; - - ret =3D 0; - cleanup: VIR_FREE(path); return ret; } --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882671150240.88690104654654; Thu, 30 Mar 2017 07:04:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A49898A054; Thu, 30 Mar 2017 14:04:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B18051C8D; Thu, 30 Mar 2017 14:04:29 +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 37DB25ED70; Thu, 30 Mar 2017 14:04:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4I0k027601 for ; Thu, 30 Mar 2017 10:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2FC225C897; Thu, 30 Mar 2017 14:04:18 +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 A675A8765E for ; Thu, 30 Mar 2017 14:04:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A49898A054 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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 A49898A054 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:42 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/16] util: Add virSysfsGetCPUCache* functions 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 30 Mar 2017 14:04:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 5 +++ src/util/virsysfs.c | 102 +++++++++++++++++++++++++++++++++++++++++++= ++++ src/util/virsysfs.h | 34 ++++++++++++++++ 3 files changed, 141 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bcd2506ef7c9..0b3b41516fe6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2623,6 +2623,11 @@ virVasprintfInternal; # util/virsysfs.h virSysfsCpuDirOpen; virSysfsDirOpen; +virSysfsGetCpuCacheValueBitmap; +virSysfsGetCpuCacheValueInt; +virSysfsGetCpuCacheValueScaledInt; +virSysfsGetCpuCacheValueString; +virSysfsGetCpuCacheValueUint; virSysfsGetCpuValueBitmap; virSysfsGetCpuValueInt; virSysfsGetCpuValueString; diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index a8550bbfbc26..2a64be4f5f73 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -221,6 +221,108 @@ virSysfsCpuDirOpen(unsigned int cpu, } +/* + * Per-CPU/cache getters + */ +int +virSysfsGetCpuCacheValueInt(unsigned int cpu, + const char *cache, + const char *file, + int *value) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/cpu/cpu%u/cache/%s/%s", + sysfs_system_path, cpu, cache, file) < 0) + return -1; + + ret =3D virFileReadValueInt(path, value); + + VIR_FREE(path); + return ret; +} + + +int +virSysfsGetCpuCacheValueUint(unsigned int cpu, + const char *cache, + const char *file, + unsigned int *value) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/cpu/cpu%u/cache/%s/%s", + sysfs_system_path, cpu, cache, file) < 0) + return -1; + + ret =3D virFileReadValueUint(path, value); + + VIR_FREE(path); + return ret; +} + +int +virSysfsGetCpuCacheValueScaledInt(unsigned int cpu, + const char *cache, + const char *file, + unsigned long long *value) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/cpu/cpu%u/cache/%s/%s", + sysfs_system_path, cpu, cache, file) < 0) + return -1; + + ret =3D virFileReadValueScaledInt(path, value); + + VIR_FREE(path); + return ret; +} + + +int +virSysfsGetCpuCacheValueString(unsigned int cpu, + const char *cache, + const char *file, + char **value) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "cpu/cpu%u/cache/%s/%s", cpu, cache, file) < 0) + return -1; + + ret =3D virSysfsGetValueString(path, value); + + VIR_FREE(path); + return ret; +} + +int +virSysfsGetCpuCacheValueBitmap(unsigned int cpu, + const char *cache, + const char *file, + virBitmapPtr *value) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/cpu/cpu%u/cache/%s/%s", + sysfs_system_path, cpu, cache, file) < 0) + return -1; + + ret =3D virFileReadValueBitmap(path, VIR_SYSFS_VALUE_MAXLEN, value); + VIR_FREE(path); + return ret; +} + + +/* + * Per-NUMA node getters + */ int virSysfsGetNodeValueString(unsigned int node, const char *file, diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h index 25bd100ea9cb..92f9111b069f 100644 --- a/src/util/virsysfs.h +++ b/src/util/virsysfs.h @@ -77,6 +77,40 @@ virSysfsCpuDirOpen(unsigned int cpu, /* + * Per-CPU/cache getters + */ +int +virSysfsGetCpuCacheValueInt(unsigned int cpu, + const char *cache, + const char *file, + int *value); + +int +virSysfsGetCpuCacheValueUint(unsigned int cpu, + const char *cache, + const char *file, + unsigned int *value); + +int +virSysfsGetCpuCacheValueScaledInt(unsigned int cpu, + const char *cache, + const char *file, + unsigned long long *value); + +int +virSysfsGetCpuCacheValueString(unsigned int cpu, + const char *cache, + const char *file, + char **value); + +int +virSysfsGetCpuCacheValueBitmap(unsigned int cpu, + const char *cache, + const char *file, + virBitmapPtr *value); + + +/* * Per-NUMA node getters */ int --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882693986488.56713598232477; Thu, 30 Mar 2017 07:04:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C61B67971A; Thu, 30 Mar 2017 14:04:51 +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 8EB88831BB; Thu, 30 Mar 2017 14:04:51 +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 928C418523CF; Thu, 30 Mar 2017 14:04:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4OfI027627 for ; Thu, 30 Mar 2017 10:04:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5ACC35C897; Thu, 30 Mar 2017 14:04:24 +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 D6D7371CB3 for ; Thu, 30 Mar 2017 14:04:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C61B67971A Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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 C61B67971A From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:43 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/16] tests: Test capability XMLs in vircaps2xmldata 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 30 Mar 2017 14:04:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- tests/virschematest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index 4f194804afb3..c98625d412e2 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -215,7 +215,8 @@ mymain(void) } = \ } while (0) - DO_TEST_DIR("capability.rng", "capabilityschemadata", "xencapsdata"); + DO_TEST_DIR("capability.rng", "capabilityschemadata", "xencapsdata", + "vircaps2xmldata"); DO_TEST_DIR("domain.rng", "domainschemadata", "qemuargv2xmldata", "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882697709702.84729534638; Thu, 30 Mar 2017 07:04:57 -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 EF90267ED4; Thu, 30 Mar 2017 14:04:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEAEC19E98; Thu, 30 Mar 2017 14:04:55 +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 C21E85ED6D; Thu, 30 Mar 2017 14:04:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4R83027649 for ; Thu, 30 Mar 2017 10:04:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E3768765B; Thu, 30 Mar 2017 14:04: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 AE2E887668 for ; Thu, 30 Mar 2017 14:04:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EF90267ED4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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 EF90267ED4 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:44 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/16] Add RNG schema for host cache information in capabilities 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.38]); Thu, 30 Mar 2017 14:04:56 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- docs/schemas/capability.rng | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 88e08d299ac9..208095302a63 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -45,6 +45,9 @@ + + + @@ -248,6 +251,37 @@ + + + + + + + + + + + + + unified + instruction + data + + + + + + + + + + + + + + + + --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882682787671.7508810022243; Thu, 30 Mar 2017 07:04:42 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 34A8B7FD56; Thu, 30 Mar 2017 14:04:41 +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 02C5917C04; Thu, 30 Mar 2017 14:04:41 +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 A978918523CC; Thu, 30 Mar 2017 14:04:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4dtD027688 for ; Thu, 30 Mar 2017 10:04:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB04587653; Thu, 30 Mar 2017 14:04:39 +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 2C44A87665 for ; Thu, 30 Mar 2017 14:04:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 34A8B7FD56 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 34A8B7FD56 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:45 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/16] Add host cache information into capabilities 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 14:04:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/conf/capabilities.c | 156 +++++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/capabilities.h | 29 +++++++++ src/libvirt_private.syms | 1 + 3 files changed, 186 insertions(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index be95c50cfb67..c07c64e7d73c 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -31,6 +31,7 @@ #include #include "capabilities.h" +#include "c-ctype.h" #include "count-one-bits.h" #include "cpu_conf.h" #include "domain_conf.h" @@ -238,6 +239,10 @@ virCapabilitiesDispose(void *object) virCapabilitiesClearSecModel(&caps->host.secModels[i]); VIR_FREE(caps->host.secModels); + for (i =3D 0; i < caps->host.ncaches; i++) + virCapsHostCacheBankFree(caps->host.caches[i]); + VIR_FREE(caps->host.caches); + VIR_FREE(caps->host.netprefix); VIR_FREE(caps->host.pagesSize); virCPUDefFree(caps->host.cpu); @@ -861,6 +866,49 @@ virCapabilitiesFormatNUMATopology(virBufferPtr buf, return 0; } +static int +virCapabilitiesFormatCaches(virBufferPtr buf, + size_t ncaches, + virCapsHostCacheBankPtr *caches) +{ + size_t i =3D 0; + + if (!ncaches) + return 0; + + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + + for (i =3D 0; i < ncaches; i++) { + virCapsHostCacheBankPtr bank =3D caches[i]; + char *cpus_str =3D virBitmapFormat(bank->cpus); + bool kilos =3D !(bank->size % 1024); + + if (!cpus_str) + return -1; + + /* + * Let's just *hope* the size is aligned to KiBs so that it does n= ot + * bite is back in the future + */ + virBufferAsprintf(buf, + "\n", + bank->id, bank->level, + virCacheTypeToString(bank->type), + bank->size >> (kilos * 10), + kilos ? "KiB" : "B", + cpus_str); + + VIR_FREE(cpus_str); + } + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + + return 0; +} + /** * virCapabilitiesFormatXML: * @caps: capabilities to format @@ -957,6 +1005,10 @@ virCapabilitiesFormatXML(virCapsPtr caps) caps->host.numaCell) < 0) goto error; + if (virCapabilitiesFormatCaches(&buf, caps->host.ncaches, + caps->host.caches) < 0) + goto error; + for (i =3D 0; i < caps->host.nsecModels; i++) { virBufferAddLit(&buf, "\n"); virBufferAdjustIndent(&buf, 2); @@ -1439,3 +1491,107 @@ virCapabilitiesInitPages(virCapsPtr caps) VIR_FREE(pages_size); return ret; } + + +VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST, + "unified", + "instruction", + "data") + +bool +virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, + virCapsHostCacheBankPtr b) +{ + return (a->id =3D=3D b->id && + a->level =3D=3D b->level && + a->type =3D=3D b->type && + a->size =3D=3D b->size && + virBitmapEqual(a->cpus, b->cpus)); +} + +void +virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) +{ + if (!ptr) + return; + + virBitmapFree(ptr->cpus); + VIR_FREE(ptr); +} + +int +virCapabilitiesInitCaches(virCapsPtr caps) +{ + size_t i =3D 0; + virBitmapPtr cpus =3D NULL; + ssize_t pos =3D -1; + DIR *dirp =3D NULL; + int ret =3D -1; + char *type =3D NULL; + struct dirent *ent =3D NULL; + virCapsHostCacheBankPtr bank =3D NULL; + + /* offline CPUs don't provide cache info */ + if (virSysfsGetValueBitmap("cpu/online", &cpus) < 0) + return -1; + + while ((pos =3D virBitmapNextSetBit(cpus, pos)) >=3D 0) { + int rv =3D virSysfsCpuDirOpen(pos, "cache/", &dirp); + + if (rv =3D=3D -2) + continue; + + while ((rv =3D virDirRead(dirp, &ent, "cache/")) > 0) { + int tmp_i; + char *tmp_c; + + if (!STRPREFIX(ent->d_name, "index")) + continue; + + if (VIR_ALLOC(bank) < 0) + goto cleanup; + + if (virSysfsGetCpuCacheValueUint(pos, ent->d_name, "id", &bank= ->id) < 0 || + virSysfsGetCpuCacheValueUint(pos, ent->d_name, "level", &b= ank->level) < 0 || + virSysfsGetCpuCacheValueString(pos, ent->d_name, "type", &= type) < 0 || + virSysfsGetCpuCacheValueScaledInt(pos, ent->d_name, "size"= , &bank->size) < 0 || + virSysfsGetCpuCacheValueBitmap(pos, ent->d_name, "shared_c= pu_list", &bank->cpus) < 0) + goto cleanup; + + for (tmp_c =3D type; tmp_c !=3D '\0'; tmp_c++) + *tmp_c =3D c_tolower(*tmp_c); + + tmp_i =3D virCacheTypeFromString(type); + if (tmp_i < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown cache type '%s'"), type); + VIR_FREE(type); + goto cleanup; + } + bank->type =3D tmp_i; + + for (i =3D 0; i < caps->host.ncaches; i++) { + if (virCapsHostCacheBankEquals(bank, caps->host.caches[i])) + break; + } + if (i =3D=3D caps->host.ncaches) { + if (VIR_APPEND_ELEMENT(caps->host.caches, + caps->host.ncaches, + bank) < 0) { + goto cleanup; + } + bank =3D NULL; + continue; + } + + } + if (rv < 0) + goto cleanup; + } + + ret =3D 0; + cleanup: + virDirClose(&dirp); + virCapsHostCacheBankFree(bank); + return ret; +} diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index d10eef3afdea..e099cccf6d39 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -138,6 +138,26 @@ struct _virCapsHostSecModel { virCapsHostSecModelLabelPtr labels; }; +typedef enum { + VIR_CACHE_TYPE_DATA, + VIR_CACHE_TYPE_INSTRUCTION, + VIR_CACHE_TYPE_UNIFIED, + + VIR_CACHE_TYPE_LAST +} virCacheType; + +VIR_ENUM_DECL(virCache); + +typedef struct _virCapsHostCacheBank virCapsHostCacheBank; +typedef virCapsHostCacheBank *virCapsHostCacheBankPtr; +struct _virCapsHostCacheBank { + unsigned int id; + unsigned int level; /* 1=3DL1, 2=3DL2, 3=3DL3, etc. */ + unsigned long long size; /* B */ + virCacheType type; /* Data, Instruction or Unified */ + virBitmapPtr cpus; /* All CPUs that share this bank */ +}; + typedef struct _virCapsHost virCapsHost; typedef virCapsHost *virCapsHostPtr; struct _virCapsHost { @@ -157,6 +177,9 @@ struct _virCapsHost { size_t nnumaCell_max; virCapsHostNUMACellPtr *numaCell; + size_t ncaches; + virCapsHostCacheBankPtr *caches; + size_t nsecModels; virCapsHostSecModelPtr secModels; @@ -303,4 +326,10 @@ int virCapabilitiesInitPages(virCapsPtr caps); int virCapabilitiesInitNUMA(virCapsPtr caps); +bool virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, + virCapsHostCacheBankPtr b); +void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr); + +int virCapabilitiesInitCaches(virCapsPtr caps); + #endif /* __VIR_CAPABILITIES_H */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0b3b41516fe6..5eb8c1ae962b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -59,6 +59,7 @@ virCapabilitiesFreeNUMAInfo; virCapabilitiesGetCpusForNodemask; virCapabilitiesGetNodeInfo; virCapabilitiesHostSecModelAddBaseLabel; +virCapabilitiesInitCaches; virCapabilitiesInitNUMA; virCapabilitiesInitPages; virCapabilitiesNew; --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 14908827295557.5455123733237315; Thu, 30 Mar 2017 07:05:29 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id C120E65403; Thu, 30 Mar 2017 14:05:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A9C478C36; Thu, 30 Mar 2017 14:05:26 +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 33F885ED80; Thu, 30 Mar 2017 14:04:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4oQ1027712 for ; Thu, 30 Mar 2017 10:04:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id A3C068764B; Thu, 30 Mar 2017 14:04:50 +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 D14935C897 for ; Thu, 30 Mar 2017 14:04:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C120E65403 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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 C120E65403 From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:46 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/16] tests: Add missing cache data for vircaps2xmltest 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 30 Mar 2017 14:05:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit a0fdd2f6f9a0cc77ae285c289e2c16d314b6a907 added some data from the system but forgot 3 files for each cache. Signed-off-by: Martin Kletzander --- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id | = 1 + tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id | = 1 + .../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map | = 2 +- tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id | = 1 + 80 files changed, 80 insertions(+), 48 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index= 3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index= 0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index= 1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index= 2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index= 3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/share= d_cpu_list index d41d18ba0096..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared= _cpu_map index b4de39476753..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -11 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/share= d_cpu_list index d41d18ba0096..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared= _cpu_map index b4de39476753..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -11 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/share= d_cpu_list index d41d18ba0096..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared= _cpu_map index b4de39476753..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -11 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/share= d_cpu_list index cf141eb99931..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared= _cpu_map index 2bd5a0a98a36..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -22 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/share= d_cpu_list index cf141eb99931..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared= _cpu_map index 2bd5a0a98a36..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -22 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/share= d_cpu_list index cf141eb99931..8b0fab869c1d 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +0-1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared= _cpu_map index 2bd5a0a98a36..75016ea36252 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -22 +03 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/share= d_cpu_list index 62188ed84ff3..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared= _cpu_map index c739b42c4d2c..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -44 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/share= d_cpu_list index 62188ed84ff3..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared= _cpu_map index c739b42c4d2c..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -44 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/share= d_cpu_list index 62188ed84ff3..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared= _cpu_map index c739b42c4d2c..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -44 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/share= d_cpu_list index 62dcd5976571..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared= _cpu_map index d22307c427b8..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -88 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/share= d_cpu_list index 62dcd5976571..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared= _cpu_map index d22307c427b8..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -88 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/share= d_cpu_list index 62dcd5976571..7a9857542a65 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +2-3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared= _cpu_map index d22307c427b8..8ac4b4ca54c5 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -88 +0c diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/share= d_cpu_list index d41d18ba0096..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared= _cpu_map index b4de39476753..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -11 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/share= d_cpu_list index d41d18ba0096..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared= _cpu_map index b4de39476753..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -11 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/share= d_cpu_list index d41d18ba0096..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -0,4 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared= _cpu_map index b4de39476753..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -11 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/share= d_cpu_list index cf141eb99931..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared= _cpu_map index 2bd5a0a98a36..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -22 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/share= d_cpu_list index cf141eb99931..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared= _cpu_map index 2bd5a0a98a36..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -22 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/share= d_cpu_list index cf141eb99931..e66d883ade72 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -1,5 +4-5 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared= _cpu_map index 2bd5a0a98a36..64bb6b746dce 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -22 +30 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/share= d_cpu_list index 62188ed84ff3..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared= _cpu_map index c739b42c4d2c..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -44 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/share= d_cpu_list index 62188ed84ff3..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared= _cpu_map index c739b42c4d2c..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -44 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/share= d_cpu_list index 62188ed84ff3..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -2,6 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared= _cpu_map index c739b42c4d2c..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -44 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/share= d_cpu_list index 62dcd5976571..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared= _cpu_map index d22307c427b8..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_m= ap @@ -1 +1 @@ -88 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/share= d_cpu_list index 62dcd5976571..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared= _cpu_map index d22307c427b8..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_m= ap @@ -1 +1 @@ -88 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/share= d_cpu_list b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/share= d_cpu_list index 62dcd5976571..fdd9f375177b 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_l= ist +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_l= ist @@ -1 +1 @@ -3,7 +6-7 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/share= d_cpu_map b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared= _cpu_map index d22307c427b8..caecf05cdbb0 100644 --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_m= ap +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_m= ap @@ -1 +1 @@ -88 +c0 diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id b/= tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id @@ -0,0 +1 @@ +0 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882733001966.8653551093364; Thu, 30 Mar 2017 07:05:33 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 8E6938051B; Thu, 30 Mar 2017 14:05:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F950B23F0; Thu, 30 Mar 2017 14:05:31 +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 112545ED75; Thu, 30 Mar 2017 14:04:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4uTt027745 for ; Thu, 30 Mar 2017 10:04:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 009DD171FB; Thu, 30 Mar 2017 14:04:56 +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 7E8C88765F for ; Thu, 30 Mar 2017 14:04:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8E6938051B Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 8E6938051B From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:47 +0200 Message-Id: <1e38c1103c2fc7d9a5f74470d249acb2588029e0.1490882550.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/16] tests: Add tests for caches into vircaps2xmltest 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 14:05:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/conf/capabilities.c | 2 +- tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 15 +++++++++++++++ tests/vircaps2xmltest.c | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c07c64e7d73c..73431ee14237 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1558,7 +1558,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) virSysfsGetCpuCacheValueBitmap(pos, ent->d_name, "shared_c= pu_list", &bank->cpus) < 0) goto cleanup; - for (tmp_c =3D type; tmp_c !=3D '\0'; tmp_c++) + for (tmp_c =3D type; *tmp_c !=3D '\0'; tmp_c++) *tmp_c =3D c_tolower(*tmp_c); tmp_i =3D virCacheTypeFromString(type); diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircap= s2xmldata/vircaps-x86_64-caches.xml index 88f2ec62277e..c3defd686418 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml @@ -28,6 +28,21 @@ + + + + + + + + + + + + + + + diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ffbe9a783811..dda0757766a8 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -58,7 +58,8 @@ test_virCapabilities(const void *opaque) if (!caps) goto cleanup; - if (virCapabilitiesInitNUMA(caps) < 0) + if (virCapabilitiesInitNUMA(caps) < 0 || + virCapabilitiesInitCaches(caps) < 0) goto cleanup; virSysfsSetSystemPath(NULL); --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 15:18:30 2024 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 1490882738397301.81074257539683; Thu, 30 Mar 2017 07:05:38 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 23D0A64D9A; Thu, 30 Mar 2017 14:05:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E8E58800C2; Thu, 30 Mar 2017 14:05:35 +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 DE05F5ED89; Thu, 30 Mar 2017 14:05:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UE4xid027772 for ; Thu, 30 Mar 2017 10:04:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8FF0F171FB; Thu, 30 Mar 2017 14:04:59 +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 196318764F for ; Thu, 30 Mar 2017 14:04:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 23D0A64D9A Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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 23D0A64D9A From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 16:03:48 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/16] 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 30 Mar 2017 14:05:37 +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 1803aa53b744..abf05a5b8771 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 f51141b99062..2ae8c816d64d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1105,6 +1105,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 b71506ae5dc3..aef62e6d7e3a 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 88f1960eb178..4fef9411048c 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