From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333921; cv=none; d=zohomail.com; s=zohoarc; b=TSJRiU/7a6MBy/0WQAhhkgrpd++Stg8t4NkxApZLRU/RoFmQZdoM/kodfxpnO27SvXi8bawwEapwVYge9PVryp1Emw4GrWB9qr4hHaLTKeqVmHUtVucPPs1vPCCrY4rF7n6+JW281MAD/hQ7ryBd7dAYl1wQR+UaoNkFg4OeodM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333921; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xHUcrZx4J7wfLWcnVUqWwK26sqAao+GWML+Iqphardo=; b=n+CJpRP+NP4tdG2+1XU+TM/IshEfHQQm1y7qR7M8SjzA9FyTZMX+RnnBzz/FZT5prT0GTIG3Tc7v3xiYbeNRp2xaVxI0G7J1sHLaP7H+ggjEdNvJTSo+Bc8ZDsWa1I1gy1Rk7XlrPqVTi3PrEpW3nOhljQhulM9lAMCD72kvq0Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623333921442902.5192697508681; Thu, 10 Jun 2021 07:05:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-82CY8oe_NN-zHL0bfuwxuA-1; Thu, 10 Jun 2021 10:03:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A2D41084F4C; Thu, 10 Jun 2021 14:03:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0607660C04; Thu, 10 Jun 2021 14:03:45 +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 C16D146F5D; Thu, 10 Jun 2021 14:03:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvQrl005289 for ; Thu, 10 Jun 2021 09:57:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FB3E19C45; Thu, 10 Jun 2021 13:57:26 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9743419C46 for ; Thu, 10 Jun 2021 13:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333833; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xHUcrZx4J7wfLWcnVUqWwK26sqAao+GWML+Iqphardo=; b=Y8oiDZOGAOhohjqbF/izIGzczIhHRbL10++eWjyHhjhU50UaTlQ37yY+JFvKrUUhgN7GGb bjn9XxsM4fcIvGLr4a5073naW5lWJUH5gRX9ltUJdnKxP/9scn7/AmkXyUYGLCyyL3S3at P9WsK5EEiQWCbOm09Ah5Pnee2+4x7n0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333920; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xHUcrZx4J7wfLWcnVUqWwK26sqAao+GWML+Iqphardo=; b=P84PtvVMBM6WnQ56QWNC+n2AHYRCcsq1GELsl4O8DygM2yHVebmog/JtI0DLCYPFG0jM1P m051M8RfgE22/EyeiYPwbGJ15L9k0oOKHTb8laKYq8ygTFXIEAbCnQx6anEyVUkfF9TCQj b7T9gu2ksBDXIoQQ+2WyD8kkb+U9q0k= X-MC-Unique: 82CY8oe_NN-zHL0bfuwxuA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 01/10] tests: glib-ify vircaps2xmltest Date: Thu, 10 Jun 2021 15:57:10 +0200 Message-Id: <684477689a9f3461b9a6d0efc0cff01aaaa15f4a.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Ideally, turning pointers into g_auto* would be done in one step and dropping cleanup label and unused @ret variable in second step, but since this is a test we don't care that much, do we? Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- tests/vircaps2xmltest.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 5b1b60124a..1e6c113c77 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -38,12 +38,11 @@ test_virCapabilities(const void *opaque) { struct virCapabilitiesData *data =3D (struct virCapabilitiesData *) op= aque; const char *archStr =3D virArchToString(data->arch); - virCaps *caps =3D NULL; - char *capsXML =3D NULL; - char *path =3D NULL; - char *system =3D NULL; - char *resctrl =3D NULL; - int ret =3D -1; + g_autoptr(virCaps) caps =3D NULL; + g_autofree char *capsXML =3D NULL; + g_autofree char *path =3D NULL; + g_autofree char *system =3D NULL; + g_autofree char *resctrl =3D NULL; =20 system =3D g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_s= rcdir, data->filename); @@ -56,34 +55,26 @@ test_virCapabilities(const void *opaque) caps =3D virCapabilitiesNew(data->arch, data->offlineMigrate, data->li= veMigrate); =20 if (!caps) - goto cleanup; + return -1; =20 if (!(caps->host.numa =3D virCapabilitiesHostNUMANewHost())) - goto cleanup; + return -1; =20 if (virCapabilitiesInitCaches(caps) < 0) - goto cleanup; + return -1; =20 virFileWrapperClearPrefixes(); =20 if (!(capsXML =3D virCapabilitiesFormatXML(caps))) - goto cleanup; + return -1; =20 path =3D g_strdup_printf("%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_s= rcdir, archStr, data->filename); =20 if (virTestCompareToFile(capsXML, path) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - VIR_FREE(system); - VIR_FREE(resctrl); - VIR_FREE(path); - VIR_FREE(capsXML); - virObjectUnref(caps); - return ret; + return 0; } =20 static int --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333839; cv=none; d=zohomail.com; s=zohoarc; b=ZUqwqWD5nG5emkocUZbsugaui/bt+L39hJ3yQ5aWn3ilhQgFEeA5yBuckxLfcL18MQ69RNRgbJ4tU5GpW1OHGTgyCg4oXl+oJBeVc4sIfVpmT3BRwTezyNuKvHyQeL+HgexNjk0ptMhgLOZubw79sJvg6Yw88g1Q/kGHpHl72BY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333839; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bxSp24BOGYoFSyZXEXKLycH8yz/NUcAEMIRJ9ZbDTcw=; b=lfU1881MDMWHRT//lMKGv9kZN53iAh+zVpYBRMSINu8Z4LpMJwEs/4hbsR/m+Si6mwetyobiZJ5pyMY7xR7lCw6G0JYCLVWv9h6BXmOmvE82RopxzaDPo0uQx5e6tB6ku7o9xizkLu84FLvjoWbJX1dT1fsfdSurSLYNPXBy+lo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623333839018879.7506568791621; Thu, 10 Jun 2021 07:03:59 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-Uy7oPZqEPoS3tqnOCh7iNw-1; Thu, 10 Jun 2021 10:03:56 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E401F8042B6; Thu, 10 Jun 2021 14:03:49 +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 BCFAB687C2; Thu, 10 Jun 2021 14:03:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 79DA31806D0C; Thu, 10 Jun 2021 14:03:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvQeG005297 for ; Thu, 10 Jun 2021 09:57:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE5DE19D7C; Thu, 10 Jun 2021 13:57:26 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7191419C45 for ; Thu, 10 Jun 2021 13:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333838; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bxSp24BOGYoFSyZXEXKLycH8yz/NUcAEMIRJ9ZbDTcw=; b=fQbTQJ3h34RlXt76oPZ8lQqXNwIY84QBASAqYm/Eyd06JmEoQ3KnMdGsBAPkfrjGtLateC uzo2cjQKPspiC/jXJBPxUdiJuborssyeBfaGz3vXxqdUcNm6SXAeKygdHQ+8bJoxDgU/gC LeViR3sFvYQoDjiwfPz+FJQm6r5I3zY= X-MC-Unique: Uy7oPZqEPoS3tqnOCh7iNw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 02/10] schemas: Allow zero for capabilities Date: Thu, 10 Jun 2021 15:57:11 +0200 Message-Id: <1276f6e68326a743e2dee8d89aac9177eccb3998.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It may happen that a NUMA node has no CPUs associated with it. We allow this for domains since v6.6.0-rc1~250. Let's update our capabilities schema to match that. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- docs/schemas/capability.rng | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index fb8203ad6d..fcc262ae1a 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -168,9 +168,9 @@ - + - + --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333845; cv=none; d=zohomail.com; s=zohoarc; b=jvU+wNzETodqmQMZS+QUukfUW1EqkwGmu5P1g0XEnBLgV0Y6LwDJCjLIE9IPyLwCV0tWdU0SFcGR2Jeh7N+acolfZPz7MTG3114TsnAafJGOFheTOgPl2CkDmTT+SnPdfiFpCW38D0eYL/BXozxWBOAaQss4Fk3AxtbduVuJvyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333845; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qI756UGXYvagIcEWQNJGPs5pk1NaCiRoZb5yOXHFrtE=; b=EFZbkVaWMQQGGSPSG/STkrHybEG65lZwufq14yjOUZtr9IijDtNiZ9CELMpZSMswonOU9cUT3VUOpz9cyIDe4jVRTcRkC1vZmO7KCl5tHIYET86ImK7ARwA5g3u8MmOVOyOA7UbLJ40nm2vRy7/H3nPOTrGN+y4fw0Rcj/JRP6M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623333845845855.2720829632158; Thu, 10 Jun 2021 07:04:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-MPtUdg7zNo6I1pOTP1j2kg-1; Thu, 10 Jun 2021 10:04:00 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BCBC1084F5A; Thu, 10 Jun 2021 14:03:55 +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 095C319813; Thu, 10 Jun 2021 14:03: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 B97931800BB8; Thu, 10 Jun 2021 14:03:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvRlh005304 for ; Thu, 10 Jun 2021 09:57:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C9BD819D7C; Thu, 10 Jun 2021 13:57:27 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C26819C45 for ; Thu, 10 Jun 2021 13:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333842; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qI756UGXYvagIcEWQNJGPs5pk1NaCiRoZb5yOXHFrtE=; b=XtiRnp/d8Db6u75zSK3o9/KnRtqbEuGhsvmMKX+KAB9MIWFlbqYIB5PWVNPmWKpvAhVSFj q3rQD8uCq/3Ifb6X8uASEsxPFh4tu4keMflaM3KkrJFYvRpO3etI0qhZujyNW6HwkBPmGt l3U4MuOvVYyesdetVBBoyqIK4oTssEg= X-MC-Unique: MPtUdg7zNo6I1pOTP1j2kg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 03/10] capabilities: Separate formatting into a function Date: Thu, 10 Jun 2021 15:57:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The way we format element for capabilities is not ideal, because if there are no CPUs, i.e. no child elements, we still output opening and closing element. To solve this, virXMLFormatElement() could be used but that would introduce more variables into the loop. Therefore, move the formatter into a separate function and use virXMLFormatElement(). Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/capabilities.c | 58 ++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 2f9a1e7d1f..9332daf6a6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -802,6 +802,41 @@ virCapabilitiesAddStoragePool(virCaps *caps, } =20 =20 +static int +virCapsHostNUMACellCPUFormat(virBuffer *buf, + const virCapsHostNUMACellCPU *cpus, + int ncpus) +{ + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + size_t j; + + virBufferAsprintf(&attrBuf, " num=3D'%d'", ncpus); + + for (j =3D 0; j < ncpus; j++) { + virBufferAsprintf(&childBuf, "\n"); + } + + virXMLFormatElement(buf, "cpus", &attrBuf, &childBuf); + return 0; +} + + static int virCapabilitiesHostNUMAFormat(virBuffer *buf, virCapsHostNUMA *caps) @@ -835,28 +870,9 @@ virCapabilitiesHostNUMAFormat(virBuffer *buf, =20 virNumaDistanceFormat(buf, cell->distances, cell->ndistances); =20 - virBufferAsprintf(buf, "\n", cell->ncpus); - virBufferAdjustIndent(buf, 2); - for (j =3D 0; j < cell->ncpus; j++) { - virBufferAsprintf(buf, "cpus[j].id); + if (virCapsHostNUMACellCPUFormat(buf, cell->cpus, cell->ncpus) < 0) + return -1; =20 - if (cell->cpus[j].siblings) { - g_autofree char *siblings =3D NULL; - - if (!(siblings =3D virBitmapFormat(cell->cpus[j].siblings)= )) - return -1; - - virBufferAsprintf(buf, - " socket_id=3D'%d' die_id=3D'%d' core_id= =3D'%d' siblings=3D'%s'", - cell->cpus[j].socket_id, - cell->cpus[j].die_id, - cell->cpus[j].core_id, - siblings); - } - virBufferAddLit(buf, "/>\n"); - } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); } --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333584; cv=none; d=zohomail.com; s=zohoarc; b=B+34fVARB0zcyFMpGDM+rQ4myqwVm55lUCIpUTtZWxzGdEeNud/O7PqhRNwOXpdtnoWrvgYI0Ad7nKQBs76wZTtEKJVGdwVGJpQ/njOdKEmdgwbahYlyAdrH21YP7z33XvX8TUo0rS/ZPhIuA8hVSftdVxFz9MBFzaTRl9+r+5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333584; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ic3JV3ArkliDwjRF+bi0r7d+GGCa3VTN80kKZodUnNQ=; b=dlelaXIJHR0zxs1EFWmDs1a/tfsmNtHsiP6U2BBvrlLIGME5f/+WYARfnfSBsAdjWU82lSxbnkLqakkHIipbWxPpQzR8fa0Nf9F/1cwFsyQl01YvNnW3QfT/xbR/zT81BIZebvlQM4erqExN6PJ/hJU5kTDaxXwvUVdyKzV82x8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623333584001149.4801325493354; Thu, 10 Jun 2021 06:59:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-VU-vsYpnPIqQL_K8gK77bQ-1; Thu, 10 Jun 2021 09:59:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B27E107ACF6; Thu, 10 Jun 2021 13:59:36 +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 60E5F100238C; Thu, 10 Jun 2021 13:59: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 926D21809CAC; Thu, 10 Jun 2021 13:59:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvSP6005314 for ; Thu, 10 Jun 2021 09:57:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4F4E19C46; Thu, 10 Jun 2021 13:57:28 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 282AD19C45 for ; Thu, 10 Jun 2021 13:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333582; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ic3JV3ArkliDwjRF+bi0r7d+GGCa3VTN80kKZodUnNQ=; b=gcAIYjijWdy8bSfW72Yri2tz+O9n0cJpeADf+TM01l8h1jbwBANtr/ShHmwuPqu+0hHT1Y fmdroTG/ixxHpN4+CM9yKN2BBwGN34QBEyGqkVfOTLKCbhkl4BE39i0FcsM/6N25+3Z/xu VViIaGcUI05mSZJ1DzdfEB0TvtnxaRU= X-MC-Unique: VU-vsYpnPIqQL_K8gK77bQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 04/10] numa_conf: Rename virDomainCache* to virNumaCache* Date: Thu, 10 Jun 2021 15:57:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's nothing domain specific about NUMA memory caches. Rename the virDomainCache* structures and enums to virNumaCache*. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/numa_conf.c | 40 ++++++++++++++++++++-------------------- src/conf/numa_conf.h | 28 ++++++++++++++-------------- src/libvirt_private.syms | 8 ++++---- src/qemu/qemu_command.c | 20 ++++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 8fd5635aca..2a32b4ca06 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -60,15 +60,15 @@ VIR_ENUM_IMPL(virDomainMemoryAccess, "private", ); =20 -VIR_ENUM_IMPL(virDomainCacheAssociativity, - VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST, +VIR_ENUM_IMPL(virNumaCacheAssociativity, + VIR_NUMA_CACHE_ASSOCIATIVITY_LAST, "none", "direct", "full", ); =20 -VIR_ENUM_IMPL(virDomainCachePolicy, - VIR_DOMAIN_CACHE_POLICY_LAST, +VIR_ENUM_IMPL(virNumaCachePolicy, + VIR_NUMA_CACHE_POLICY_LAST, "none", "writeback", "writethrough", @@ -82,7 +82,7 @@ VIR_ENUM_IMPL(virDomainMemoryLatency, "write" ); =20 -typedef struct _virDomainNumaCache virDomainNumaCache; +typedef struct _virNumaCache virNumaCache; =20 typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect; =20 @@ -107,12 +107,12 @@ struct _virDomainNuma { virNumaDistance *distances; /* remote node distances */ size_t ndistances; =20 - struct _virDomainNumaCache { + struct _virNumaCache { unsigned int level; /* cache level */ unsigned int size; /* cache size */ unsigned int line; /* line size, !!! in bytes !!! */ - virDomainCacheAssociativity associativity; /* cache associativ= ity */ - virDomainCachePolicy policy; /* cache policy */ + virNumaCacheAssociativity associativity; /* cache associativit= y */ + virNumaCachePolicy policy; /* cache policy */ } *caches; size_t ncaches; } *mem_nodes; /* guest node configuration */ @@ -845,11 +845,11 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, if ((n =3D virXPathNodeSet("./cache", ctxt, &nodes)) < 0) return -1; =20 - def->mem_nodes[cur_cell].caches =3D g_new0(virDomainNumaCache, n); + def->mem_nodes[cur_cell].caches =3D g_new0(virNumaCache, n); =20 for (i =3D 0; i < n; i++) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - virDomainNumaCache *cache =3D &def->mem_nodes[cur_cell].caches[i]; + virNumaCache *cache =3D &def->mem_nodes[cur_cell].caches[i]; g_autofree char *tmp =3D NULL; unsigned int level; int associativity; @@ -883,7 +883,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, return -1; } =20 - if ((associativity =3D virDomainCacheAssociativityTypeFromString(t= mp)) < 0) { + if ((associativity =3D virNumaCacheAssociativityTypeFromString(tmp= )) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cache associativity '%s'"), tmp); @@ -898,7 +898,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, cur_cell); } =20 - if ((policy =3D virDomainCachePolicyTypeFromString(tmp)) < 0) { + if ((policy =3D virNumaCachePolicyTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cache policy '%s'"), tmp); @@ -915,7 +915,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, ctxt, &line, 1, ULLONG_MAX, true) < 0) return -1; =20 - *cache =3D (virDomainNumaCache){level, size, line, associativity, = policy}; + *cache =3D (virNumaCache){level, size, line, associativity, policy= }; def->mem_nodes[cur_cell].ncaches++; } =20 @@ -1132,17 +1132,17 @@ virDomainNumaDefFormatXML(virBuffer *buf, def->mem_nodes[i].ndistances); =20 for (j =3D 0; j < def->mem_nodes[i].ncaches; j++) { - virDomainNumaCache *cache =3D &def->mem_nodes[i].caches[j]; + virNumaCache *cache =3D &def->mem_nodes[i].caches[j]; =20 virBufferAsprintf(&childBuf, "lev= el); if (cache->associativity) { virBufferAsprintf(&childBuf, " associativity=3D'%s'", - virDomainCacheAssociativityTypeToString(= cache->associativity)); + virNumaCacheAssociativityTypeToString(ca= che->associativity)); } =20 if (cache->policy) { virBufferAsprintf(&childBuf, " policy=3D'%s'", - virDomainCachePolicyTypeToString(cache->= policy)); + virNumaCachePolicyTypeToString(cache->po= licy)); } virBufferAddLit(&childBuf, ">\n"); =20 @@ -1226,7 +1226,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) g_autoptr(virBitmap) levelsSeen =3D virBitmapNew(0); =20 for (j =3D 0; j < node->ncaches; j++) { - const virDomainNumaCache *cache =3D &node->caches[j]; + const virNumaCache *cache =3D &node->caches[j]; =20 /* Relax this if there's ever fourth layer of cache */ if (cache->level > 3) { @@ -1270,7 +1270,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) =20 if (l->cache > 0) { for (j =3D 0; j < def->mem_nodes[l->target].ncaches; j++) { - const virDomainNumaCache *cache =3D &def->mem_nodes[l->tar= get].caches[j]; + const virNumaCache *cache =3D &def->mem_nodes[l->target].c= aches[j]; =20 if (l->cache =3D=3D cache->level) break; @@ -1712,8 +1712,8 @@ virDomainNumaGetNodeCache(const virDomainNuma *numa, unsigned int *level, unsigned int *size, unsigned int *line, - virDomainCacheAssociativity *associativity, - virDomainCachePolicy *policy) + virNumaCacheAssociativity *associativity, + virNumaCachePolicy *policy) { const virDomainNumaNode *cell; =20 diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 6682580ded..1ef6455fb5 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -51,22 +51,22 @@ typedef enum { VIR_ENUM_DECL(virDomainMemoryAccess); =20 typedef enum { - VIR_DOMAIN_CACHE_ASSOCIATIVITY_NONE, /* No associativity */ - VIR_DOMAIN_CACHE_ASSOCIATIVITY_DIRECT, /* Direct mapped cache */ - VIR_DOMAIN_CACHE_ASSOCIATIVITY_FULL, /* Fully associative cache */ + VIR_NUMA_CACHE_ASSOCIATIVITY_NONE, /* No associativity */ + VIR_NUMA_CACHE_ASSOCIATIVITY_DIRECT, /* Direct mapped cache */ + VIR_NUMA_CACHE_ASSOCIATIVITY_FULL, /* Fully associative cache */ =20 - VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST -} virDomainCacheAssociativity; -VIR_ENUM_DECL(virDomainCacheAssociativity); + VIR_NUMA_CACHE_ASSOCIATIVITY_LAST +} virNumaCacheAssociativity; +VIR_ENUM_DECL(virNumaCacheAssociativity); =20 typedef enum { - VIR_DOMAIN_CACHE_POLICY_NONE, /* No policy */ - VIR_DOMAIN_CACHE_POLICY_WRITEBACK, /* Write-back policy */ - VIR_DOMAIN_CACHE_POLICY_WRITETHROUGH, /* Write-through policy */ + VIR_NUMA_CACHE_POLICY_NONE, /* No policy */ + VIR_NUMA_CACHE_POLICY_WRITEBACK, /* Write-back policy */ + VIR_NUMA_CACHE_POLICY_WRITETHROUGH, /* Write-through policy */ =20 - VIR_DOMAIN_CACHE_POLICY_LAST -} virDomainCachePolicy; -VIR_ENUM_DECL(virDomainCachePolicy); + VIR_NUMA_CACHE_POLICY_LAST +} virNumaCachePolicy; +VIR_ENUM_DECL(virNumaCachePolicy); =20 typedef enum { VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY, @@ -233,8 +233,8 @@ int virDomainNumaGetNodeCache(const virDomainNuma *numa, unsigned int *level, unsigned int *size, unsigned int *line, - virDomainCacheAssociativity *associativity, - virDomainCachePolicy *policy); + virNumaCacheAssociativity *associativity, + virNumaCachePolicy *policy); =20 ssize_t virDomainNumaGetNodeInitiator(const virDomainNuma *numa, size_t node); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0ced2a7990..9e9171a6d9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -861,10 +861,6 @@ virNodeDeviceDeleteVport; virNodeDeviceGetParentName; =20 # conf/numa_conf.h -virDomainCacheAssociativityTypeFromString; -virDomainCacheAssociativityTypeToString; -virDomainCachePolicyTypeFromString; -virDomainCachePolicyTypeToString; virDomainMemoryAccessTypeFromString; virDomainMemoryAccessTypeToString; virDomainMemoryLatencyTypeFromString; @@ -913,6 +909,10 @@ virDomainNumatunePlacementTypeFromString; virDomainNumatunePlacementTypeToString; virDomainNumatuneSet; virDomainNumatuneSpecifiedMaxNode; +virNumaCacheAssociativityTypeFromString; +virNumaCacheAssociativityTypeToString; +virNumaCachePolicyTypeFromString; +virNumaCachePolicyTypeToString; virNumaDistanceFormat; =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834fc2130..c3523c25c7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7198,8 +7198,8 @@ qemuBuilNumaCellCache(virCommand *cmd, unsigned int level; unsigned int size; unsigned int line; - virDomainCacheAssociativity associativity; - virDomainCachePolicy policy; + virNumaCacheAssociativity associativity; + virNumaCachePolicy policy; =20 if (virDomainNumaGetNodeCache(def->numa, cell, i, &level, &size, &line, @@ -7214,30 +7214,30 @@ qemuBuilNumaCellCache(virCommand *cmd, cell, size, level); =20 switch (associativity) { - case VIR_DOMAIN_CACHE_ASSOCIATIVITY_NONE: + case VIR_NUMA_CACHE_ASSOCIATIVITY_NONE: virBufferAddLit(&buf, ",associativity=3Dnone"); break; - case VIR_DOMAIN_CACHE_ASSOCIATIVITY_DIRECT: + case VIR_NUMA_CACHE_ASSOCIATIVITY_DIRECT: virBufferAddLit(&buf, ",associativity=3Ddirect"); break; - case VIR_DOMAIN_CACHE_ASSOCIATIVITY_FULL: + case VIR_NUMA_CACHE_ASSOCIATIVITY_FULL: virBufferAddLit(&buf, ",associativity=3Dcomplex"); break; - case VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST: + case VIR_NUMA_CACHE_ASSOCIATIVITY_LAST: break; } =20 switch (policy) { - case VIR_DOMAIN_CACHE_POLICY_NONE: + case VIR_NUMA_CACHE_POLICY_NONE: virBufferAddLit(&buf, ",policy=3Dnone"); break; - case VIR_DOMAIN_CACHE_POLICY_WRITEBACK: + case VIR_NUMA_CACHE_POLICY_WRITEBACK: virBufferAddLit(&buf, ",policy=3Dwrite-back"); break; - case VIR_DOMAIN_CACHE_POLICY_WRITETHROUGH: + case VIR_NUMA_CACHE_POLICY_WRITETHROUGH: virBufferAddLit(&buf, ",policy=3Dwrite-through"); break; - case VIR_DOMAIN_CACHE_POLICY_LAST: + case VIR_NUMA_CACHE_POLICY_LAST: break; } =20 --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333905; cv=none; d=zohomail.com; s=zohoarc; b=XyJksG9V4P3W93HSQHt439K2KNCT0q0nnFqzOcmsDOWmLrxdSwAdBwzUxyK9OMwucquN5PJ+HcT5JZCJHJDKJulRwKs2Tk5DtrKA+b5YTuS4y9cDHMh+aJEZZhmMW4+LzmhKdFsbXO//WjlsFVMdx4QZdKaLFALhxcwdrOjGl54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333905; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bA2Wa6cdHpQxAc+e3Gc+TUEy8p1nAs1V3idZ0EbEtuw=; b=dFBdAVlXkbssfezdhMskdzj/U1IXbj8WzUKXqv76fkLpvoyXIYJXQ/Ifxl2Ml9BgxY9H7oW6kJ1UqFUhpzAMA75s9kmrKHHMyh9vgmbz+8413+z88EMiuto1jSv2Bfvlj5A5wTIvzKf2E35ZnJSRL5HdyI98MUfQFYWOyLK7/wY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623333905040279.41126684805715; Thu, 10 Jun 2021 07:05:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-108-PgZ1bBRXPt-YOBXe3PuDxw-1; Thu, 10 Jun 2021 10:04:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8F031084F48; Thu, 10 Jun 2021 14:04:00 +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 84F3860FC2; Thu, 10 Jun 2021 14:04:00 +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 490651800FF2; Thu, 10 Jun 2021 14:04:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvT7t005328 for ; Thu, 10 Jun 2021 09:57:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E94319C46; Thu, 10 Jun 2021 13:57:29 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0271419C45 for ; Thu, 10 Jun 2021 13:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333848; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bA2Wa6cdHpQxAc+e3Gc+TUEy8p1nAs1V3idZ0EbEtuw=; b=U+kkj4V5DU6Afh//MjLmtjbyZyUMNdb219bTTOgFu1wNIs7gbH6CgOTVyd7VimELZmKkGN fMjVOEzFdAyizhlBAWWzuBX9ND6+/PEw9YywpoXtpPnysylTAtPqOlpvPv9rcygrd8gul4 Df+iV0F+/0iejiHtM9BHLsDRRyiFrPQ= X-MC-Unique: PgZ1bBRXPt-YOBXe3PuDxw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 05/10] numa_conf: Expose virNumaCache formatter Date: Thu, 10 Jun 2021 15:57:14 +0200 Message-Id: <3c7e20584b8c0cd022e899d285db846f6f69d436.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Expose virNumaCache XML formatter so that it can be re-used by other parts of the code. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/numa_conf.c | 81 +++++++++++++++++++++------------------- src/conf/numa_conf.h | 13 +++++++ src/libvirt_private.syms | 1 + 3 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 2a32b4ca06..c4f2ef10c1 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -82,8 +82,6 @@ VIR_ENUM_IMPL(virDomainMemoryLatency, "write" ); =20 -typedef struct _virNumaCache virNumaCache; - typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect; =20 typedef struct _virDomainNumaNode virDomainNumaNode; @@ -107,13 +105,7 @@ struct _virDomainNuma { virNumaDistance *distances; /* remote node distances */ size_t ndistances; =20 - struct _virNumaCache { - unsigned int level; /* cache level */ - unsigned int size; /* cache size */ - unsigned int line; /* line size, !!! in bytes !!! */ - virNumaCacheAssociativity associativity; /* cache associativit= y */ - virNumaCachePolicy policy; /* cache policy */ - } *caches; + virNumaCache *caches; size_t ncaches; } *mem_nodes; /* guest node configuration */ size_t nmem_nodes; @@ -1102,7 +1094,6 @@ virDomainNumaDefFormatXML(virBuffer *buf, virBitmap *cpumask =3D virDomainNumaGetNodeCpumask(def, i); g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); - size_t j; =20 memAccess =3D virDomainNumaGetNodeMemoryAccessMode(def, i); discard =3D virDomainNumaGetNodeDiscard(def, i); @@ -1131,35 +1122,9 @@ virDomainNumaDefFormatXML(virBuffer *buf, def->mem_nodes[i].distances, def->mem_nodes[i].ndistances); =20 - for (j =3D 0; j < def->mem_nodes[i].ncaches; j++) { - virNumaCache *cache =3D &def->mem_nodes[i].caches[j]; - - virBufferAsprintf(&childBuf, "lev= el); - if (cache->associativity) { - virBufferAsprintf(&childBuf, " associativity=3D'%s'", - virNumaCacheAssociativityTypeToString(ca= che->associativity)); - } - - if (cache->policy) { - virBufferAsprintf(&childBuf, " policy=3D'%s'", - virNumaCachePolicyTypeToString(cache->po= licy)); - } - virBufferAddLit(&childBuf, ">\n"); - - virBufferAdjustIndent(&childBuf, 2); - virBufferAsprintf(&childBuf, - "\n", - cache->size); - - if (cache->line) { - virBufferAsprintf(&childBuf, - "\n", - cache->line); - } - - virBufferAdjustIndent(&childBuf, -2); - virBufferAddLit(&childBuf, "\n"); - } + virNumaCacheFormat(&childBuf, + def->mem_nodes[i].caches, + def->mem_nodes[i].ncaches); =20 virXMLFormatElement(buf, "cell", &attrBuf, &childBuf); } @@ -1839,3 +1804,41 @@ virNumaDistanceFormat(virBuffer *buf, =20 virXMLFormatElement(buf, "distances", NULL, &childBuf); } + + +void +virNumaCacheFormat(virBuffer *buf, + const virNumaCache *caches, + size_t ncaches) +{ + size_t i; + + for (i =3D 0; i < ncaches; i++) { + const virNumaCache *cache =3D &caches[i]; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + + virBufferAsprintf(&attrBuf, " level=3D'%u'", cache->level); + if (cache->associativity) { + virBufferAsprintf(&attrBuf, " associativity=3D'%s'", + virNumaCacheAssociativityTypeToString(cache-= >associativity)); + } + + if (cache->policy) { + virBufferAsprintf(&attrBuf, " policy=3D'%s'", + virNumaCachePolicyTypeToString(cache->policy= )); + } + + virBufferAsprintf(&childBuf, + "\n", + cache->size); + + if (cache->line) { + virBufferAsprintf(&childBuf, + "\n", + cache->line); + } + + virXMLFormatElement(buf, "cache", &attrBuf, &childBuf); + } +} diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 1ef6455fb5..9dee4f3a40 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -259,3 +259,16 @@ struct _virNumaDistance { void virNumaDistanceFormat(virBuffer *buf, const virNumaDistance *distances, size_t ndistances); + +typedef struct _virNumaCache virNumaCache; +struct _virNumaCache { + unsigned int level; /* cache level */ + unsigned int size; /* cache size */ + unsigned int line; /* line size, !!! in bytes !!! */ + virNumaCacheAssociativity associativity; /* cache associativity */ + virNumaCachePolicy policy; /* cache policy */ +}; + +void virNumaCacheFormat(virBuffer *buf, + const virNumaCache *caches, + size_t ncaches); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9e9171a6d9..abe4525163 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -911,6 +911,7 @@ virDomainNumatuneSet; virDomainNumatuneSpecifiedMaxNode; virNumaCacheAssociativityTypeFromString; virNumaCacheAssociativityTypeToString; +virNumaCacheFormat; virNumaCachePolicyTypeFromString; virNumaCachePolicyTypeToString; virNumaDistanceFormat; --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333863; cv=none; d=zohomail.com; s=zohoarc; b=g+5TBrQLmPlAvqh2odIO6biKFMGO1LLXK54ns7hcys7Ph7gkgFG5TfL3jkXFWoNecWRdh3FAh9L3+Ihxn30JjlDMMmoolBZj8F9AoTgWcu2A+lsUNpTjL8HhSqGKxfstc68UlKcisfwhImjc7Qn1M8V1TYEOBlH/omYTVHr10yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333863; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p52nxZlaS8zz/90UgRujdR748TdVmZy4mgvALcTJUVY=; b=lzjjPGwGPn+QfDC0Dxs8TQXRUKg7+TrKGdoiWc0vMRtZ90Wpl3NDuyV4vtbdAfPjZ9ylUiKpOyQttG/du9j7etEoIr/se309jtadBM8oY4i9d0tsHVFC+XY5YSpXW4YUhUmnvQApjxxQXLeq6CscFSkKIwoSaTKT2Vt4LQRhXu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623333862937406.89816348263616; Thu, 10 Jun 2021 07:04:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-0KA7enE0Mz-LHJhi7NDZpw-1; Thu, 10 Jun 2021 10:04:12 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05F66801B16; Thu, 10 Jun 2021 14:04:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D91E19CA0; Thu, 10 Jun 2021 14:04:05 +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 9FEAD46F5B; Thu, 10 Jun 2021 14:04:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvUu2005343 for ; Thu, 10 Jun 2021 09:57:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A48A19C46; Thu, 10 Jun 2021 13:57:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id D169D19C45 for ; Thu, 10 Jun 2021 13:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333853; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p52nxZlaS8zz/90UgRujdR748TdVmZy4mgvALcTJUVY=; b=TCTnJRTrytYb+d8KH5SGnOgPsAwsJtLa8KHvPga5pOzhZMypa5JenToxhXIMpRVifqxJxh Of/lDhGVs4FOVSlLMziwQJg0jwiAaNX6qUGjCws5Mc9T2KWw1OdwcLIs/rxuNYRjlMQatA c2tEyeDzRKh8Pcj31mi2yKT7nPfQvoc= X-MC-Unique: 0KA7enE0Mz-LHJhi7NDZpw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 06/10] capabilities: Expose NUMA memory side cache Date: Thu, 10 Jun 2021 15:57:15 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Memory on a NUMA node can have a side caches. Configuring these for a domain was implemented in v6.6.0-rc1~249 and friends. However, up until now mgmt applications did not really know what values to pass because we were not exposing caches of the host. With recent enough kernel these are exposed under sysfs and with a bit of parsing we can extend our capabilities XML. The sysfs structure is documented in kernel's Documentation/admin-guide/mm/numaperf.rst and basically maps in 1:1 fashion to our virNumaCache structure. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- docs/schemas/capability.rng | 4 + src/conf/capabilities.c | 149 ++++++++++++++++++++++++++++++++- src/conf/capabilities.h | 4 +- src/libxl/libxl_capabilities.c | 3 +- src/test/test_driver.c | 3 +- tests/testutils.c | 3 +- 6 files changed, 158 insertions(+), 8 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index fcc262ae1a..5c1fb3607c 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -163,6 +163,10 @@ =20 + + + + diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 9332daf6a6..6be2d0d791 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -121,6 +121,8 @@ virCapabilitiesFreeHostNUMACell(virCapsHostNUMACell *ce= ll) g_free(cell->cpus); g_free(cell->distances); g_free(cell->pageinfo); + if (cell->caches) + g_array_unref(cell->caches); g_free(cell); } =20 @@ -335,6 +337,7 @@ virCapabilitiesSetNetPrefix(virCaps *caps, * @distances: NUMA distances to other nodes * @npageinfo: number of pages at node @num * @pageinfo: info on each single memory page + * @caches: info on memory side caches * * Registers a new NUMA cell for a host, passing in a array of * CPU IDs belonging to the cell, distances to other NUMA nodes @@ -351,7 +354,8 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps, int ndistances, virNumaDistance **distances, int npageinfo, - virCapsHostNUMACellPageInfo **pageinfo) + virCapsHostNUMACellPageInfo **pageinfo, + GArray **caches) { virCapsHostNUMACell *cell =3D g_new0(virCapsHostNUMACell, 1); =20 @@ -369,6 +373,9 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps, cell->npageinfo =3D npageinfo; cell->pageinfo =3D g_steal_pointer(pageinfo); } + if (caches) { + cell->caches =3D g_steal_pointer(caches); + } =20 g_ptr_array_add(caps->cells, cell); } @@ -870,6 +877,11 @@ virCapabilitiesHostNUMAFormat(virBuffer *buf, =20 virNumaDistanceFormat(buf, cell->distances, cell->ndistances); =20 + if (cell->caches) { + virNumaCache *caches =3D &g_array_index(cell->caches, virNumaC= ache, 0); + virNumaCacheFormat(buf, caches, cell->caches->len); + } + if (virCapsHostNUMACellCPUFormat(buf, cell->cpus, cell->ncpus) < 0) return -1; =20 @@ -1535,6 +1547,129 @@ virCapabilitiesGetNUMAPagesInfo(int node, } =20 =20 +static int +virCapabilitiesGetNodeCacheReadFile(const char *prefix, + const char *dir, + const char *file, + unsigned int *value) +{ + g_autofree char *path =3D g_build_filename(prefix, dir, file, NULL); + int rv =3D virFileReadValueUint(value, "%s", path); + + if (rv < 0) { + if (rv =3D=3D -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("File '%s' does not exist"), + path); + } + return -1; + } + + return 0; +} + + +static int +virCapsHostNUMACellCacheComparator(const void *a, + const void *b) +{ + const virNumaCache *aa =3D a; + const virNumaCache *bb =3D b; + + return aa->level - bb->level; +} + + +static int +virCapabilitiesGetNodeCache(int node, + GArray **cachesRet) +{ + g_autoptr(DIR) dir =3D NULL; + int direrr =3D 0; + struct dirent *entry; + g_autofree char *path =3D NULL; + g_autoptr(GArray) caches =3D g_array_new(FALSE, FALSE, sizeof(virNumaC= ache)); + + path =3D g_strdup_printf(SYSFS_SYSTEM_PATH "/node/node%d/memory_side_c= ache", node); + + if (virDirOpenIfExists(&dir, path) < 0) + return -1; + + while (dir && (direrr =3D virDirRead(dir, &entry, path)) > 0) { + const char *dname =3D STRSKIP(entry->d_name, "index"); + virNumaCache cache =3D { 0 }; + unsigned int indexing; + unsigned int write_policy; + + if (!dname) + continue; + + if (virStrToLong_ui(dname, NULL, 10, &cache.level) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse %s"), + entry->d_name); + return -1; + } + + if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, + "size", &cache.size) < 0) + return -1; + + cache.size >>=3D 10; /* read in bytes but stored in kibibytes */ + + if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, + "line_size", &cache.line) = < 0) + return -1; + + if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, + "indexing", &indexing) < 0) + return -1; + + /* see enum cache_indexing in kernel */ + switch (indexing) { + case 0: cache.associativity =3D VIR_NUMA_CACHE_ASSOCIATIVITY_DIREC= T; break; + case 1: cache.associativity =3D VIR_NUMA_CACHE_ASSOCIATIVITY_FULL;= break; + case 2: cache.associativity =3D VIR_NUMA_CACHE_ASSOCIATIVITY_NONE;= break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown indexing value '%u'"), + indexing); + return -1; + } + + if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, + "write_policy", &write_pol= icy) < 0) + return -1; + + /* see enum cache_write_policy in kernel */ + switch (write_policy) { + case 0: cache.policy =3D VIR_NUMA_CACHE_POLICY_WRITEBACK; break; + case 1: cache.policy =3D VIR_NUMA_CACHE_POLICY_WRITETHROUGH; break; + case 2: cache.policy =3D VIR_NUMA_CACHE_POLICY_NONE; break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown write_policy value '%u'"), + write_policy); + return -1; + } + + g_array_append_val(caches, cache); + } + + if (direrr < 0) + return -1; + + if (caches->len > 0) { + g_array_sort(caches, virCapsHostNUMACellCacheComparator); + *cachesRet =3D g_steal_pointer(&caches); + } else { + *cachesRet =3D NULL; + } + + return 0; +} + + static int virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) { @@ -1586,7 +1721,8 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) nodeinfo.memory, cid, &cpus, 0, NULL, - 0, NULL); + 0, NULL, + NULL); } =20 return 0; @@ -1616,8 +1752,9 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) g_autofree virNumaDistance *distances =3D NULL; int ndistances =3D 0; g_autofree virCapsHostNUMACellPageInfo *pageinfo =3D NULL; - int npageinfo; + int npageinfo =3D 0; unsigned long long memory; + g_autoptr(GArray) caches =3D NULL; int cpu; size_t i; =20 @@ -1644,6 +1781,9 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0) goto cleanup; =20 + if (virCapabilitiesGetNodeCache(n, &caches) < 0) + goto cleanup; + /* Detect the amount of memory in the numa cell in KiB */ virNumaGetNodeMemory(n, &memory, NULL); memory >>=3D 10; @@ -1651,7 +1791,8 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) virCapabilitiesHostNUMAAddCell(caps, n, memory, ncpus, &cpus, ndistances, &distances, - npageinfo, &pageinfo); + npageinfo, &pageinfo, + &caches); } =20 ret =3D 0; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 4d4ac476ea..334b361e7a 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -108,6 +108,7 @@ struct _virCapsHostNUMACell { virNumaDistance *distances; int npageinfo; virCapsHostNUMACellPageInfo *pageinfo; + GArray *caches; /* virNumaCache */ }; =20 struct _virCapsHostNUMA { @@ -253,7 +254,8 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps, int ndistances, virNumaDistance **distances, int npageinfo, - virCapsHostNUMACellPageInfo **pageinfo); + virCapsHostNUMACellPageInfo **pageinfo, + GArray **caches); =20 virCapsGuestMachine ** virCapabilitiesAllocMachines(const char *const *names, diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b8600ca479..7385ad0d38 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -332,7 +332,8 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps) numa_info[i].size / 1024, nr_cpus_node[i], &cpus[i], nr_distances, &distances, - 0, NULL); + 0, NULL, + NULL); =20 /* This is safe, as the CPU list is now stored in the NUMA cell */ cpus[i] =3D NULL; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ea5a5005e7..1b36c67eb2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -331,7 +331,8 @@ testBuildCapabilities(virConnectPtr conn) i, privconn->cells[i].mem, privconn->cells[i].numCpus, &cpu_ce= lls, 0, NULL, - nPages, &pages); + nPages, &pages, + NULL); } =20 for (i =3D 0; i < G_N_ELEMENTS(guest_types); i++) { diff --git a/tests/testutils.c b/tests/testutils.c index eb3bd48b6a..7d87e30a5c 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -947,7 +947,8 @@ virTestCapsBuildNUMATopology(int seq) MAX_MEM_IN_CELL, MAX_CPUS_IN_CELL, &cell_cpus, 0, NULL, - 0, NULL); + 0, NULL, + NULL); =20 cell_cpus =3D NULL; } --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333593; cv=none; d=zohomail.com; s=zohoarc; b=U1saEA+464jeq77AuhSiH6ajnU97Ni8u2Lx/oZ2Ku4+3tcxGGW52+vrGirJWJtf/Qwg/u0MshKSVBgpIhic6HzBTaeC9vIYnsNCynmbAPNFPH5eXGKtmDQaR1cv21Mvre/MZqVFozj7+n1mV9cxxmXMaBXh56cmYtnuEHa41tI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333593; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=whiUnpd8XTTDxMS+PK/u/rdj1y2dng+MLTf1Ny1Ypr8=; b=T1yqzge8GDQJow/rW6Aukl5Oc8zGABpJTa9Pp9CGgUdFCvqpNHZMy74zTO4VawfX+G9LfkrADzcLBAPzCmbUvaP8J20mNabKxn/yuPIdp5avVqOL3gk6aLJGRzTdJ0ereR5KcO64jfmCR4LDDxABwHAELkvvy8xKbO+0RqVNJ30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623333592993349.29643465043785; Thu, 10 Jun 2021 06:59:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-316-JiVLAlTQMBe9-CAp1XiZyQ-1; Thu, 10 Jun 2021 09:59:50 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95C991850605; Thu, 10 Jun 2021 13:59:45 +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 738069CA0; Thu, 10 Jun 2021 13:59:45 +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 32B131809CBD; Thu, 10 Jun 2021 13:59:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvVTJ005348 for ; Thu, 10 Jun 2021 09:57:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3527219C46; Thu, 10 Jun 2021 13:57:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACA5D19C45 for ; Thu, 10 Jun 2021 13:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333591; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=whiUnpd8XTTDxMS+PK/u/rdj1y2dng+MLTf1Ny1Ypr8=; b=B7JH8x35e85UtozgutSpD3IWDDDJRfKKsQfEmge9Duqvq2KoUP0HeqOzZfmzN/16D4C86b r/Kpt1pEvUqDoj0UOzSiiZxW+yCbaYTlvCwLDwymyFkdTKCzh9gYGwikKKcB3si1FgtxbJ 09MQIxGEnnDRwPzTQhnwXTBrYMh4tbw= X-MC-Unique: JiVLAlTQMBe9-CAp1XiZyQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 07/10] numa_conf: Rename virDomainNumaInterconnect* to virNumaInterconnect* Date: Thu, 10 Jun 2021 15:57:16 +0200 Message-Id: <687ab798091ccf60aa2f4671a3160b32126bed84.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's nothing domain specific about NUMA interconnects. Rename the virDomainNumaInterconnect* structures and enums to virNumaInterconnect*. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/numa_conf.c | 56 ++++++++++++++++++++-------------------- src/conf/numa_conf.h | 24 ++++++++--------- src/libvirt_private.syms | 4 +-- src/qemu/qemu_command.c | 10 +++---- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index c4f2ef10c1..c8b3212e5c 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -74,15 +74,15 @@ VIR_ENUM_IMPL(virNumaCachePolicy, "writethrough", ); =20 -VIR_ENUM_IMPL(virDomainMemoryLatency, - VIR_DOMAIN_MEMORY_LATENCY_LAST, +VIR_ENUM_IMPL(virMemoryLatency, + VIR_MEMORY_LATENCY_LAST, "none", "access", "read", "write" ); =20 -typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect; +typedef struct _virNumaInterconnect virNumaInterconnect; =20 typedef struct _virDomainNumaNode virDomainNumaNode; =20 @@ -110,14 +110,14 @@ struct _virDomainNuma { } *mem_nodes; /* guest node configuration */ size_t nmem_nodes; =20 - struct _virDomainNumaInterconnect { - virDomainNumaInterconnectType type; /* whether structure describe= s latency - or bandwidth */ + struct _virNumaInterconnect { + virNumaInterconnectType type; /* whether structure describes late= ncy + or bandwidth */ unsigned int initiator; /* the initiator NUMA node */ unsigned int target; /* the target NUMA node */ unsigned int cache; /* the target cache on @target; if 0 then = the memory on @target */ - virDomainMemoryLatency accessType; /* what type of access is defi= ned */ + virMemoryLatency accessType; /* what type of access is defined */ unsigned long value; /* value itself */ } *interconnects; size_t ninterconnects; @@ -1021,24 +1021,24 @@ virDomainNumaDefParseXML(virDomainNuma *def, &interconnect)) < 0) return -1; =20 - def->interconnects =3D g_new0(virDomainNumaInterconnect, n); + def->interconnects =3D g_new0(virNumaInterconnect, n); for (i =3D 0; i < n; i++) { - virDomainNumaInterconnectType type; + virNumaInterconnectType type; unsigned int initiator; unsigned int target; unsigned int cache =3D 0; - virDomainMemoryLatency accessType; + virMemoryLatency accessType; unsigned long long value; =20 if (virXMLNodeNameEqual(interconnect[i], "latency")) { - type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY; + type =3D VIR_NUMA_INTERCONNECT_TYPE_LATENCY; =20 if (virXMLPropULongLong(interconnect[i], "value", 10, VIR_XML_PROP_REQUIRED, &value) < 0) return -1; } else if (virXMLNodeNameEqual(interconnect[i], "bandwidth")) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH; + type =3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH; =20 ctxt->node =3D interconnect[i]; =20 @@ -1062,13 +1062,13 @@ virDomainNumaDefParseXML(virDomainNuma *def, return -1; =20 if (virXMLPropEnum(interconnect[i], "type", - virDomainMemoryLatencyTypeFromString, + virMemoryLatencyTypeFromString, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &accessType) < 0) return -1; =20 - def->interconnects[i] =3D (virDomainNumaInterconnect) {type, initi= ator, target, - cache, access= Type, value}; + def->interconnects[i] =3D (virNumaInterconnect) {type, initiator, = target, + cache, accessType, = value}; def->ninterconnects++; } =20 @@ -1135,13 +1135,13 @@ virDomainNumaDefFormatXML(virBuffer *buf, } =20 for (i =3D 0; i < def->ninterconnects; i++) { - virDomainNumaInterconnect *l =3D &def->interconnects[i]; + virNumaInterconnect *l =3D &def->interconnects[i]; =20 switch (l->type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: virBufferAddLit(buf, "accessType= ), + virMemoryLatencyTypeToString(l->accessType), l->value); =20 - if (l->type =3D=3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH) + if (l->type =3D=3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH) virBufferAddLit(buf, " unit=3D'KiB'"); virBufferAddLit(buf, "/>\n"); } @@ -1213,7 +1213,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) } =20 for (i =3D 0; i < def->ninterconnects; i++) { - const virDomainNumaInterconnect *l =3D &def->interconnects[i]; + const virNumaInterconnect *l =3D &def->interconnects[i]; =20 if (l->initiator >=3D def->nmem_nodes) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -1249,7 +1249,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) } =20 for (j =3D 0; j < i; j++) { - const virDomainNumaInterconnect *ll =3D &def->interconnects[j]; + const virNumaInterconnect *ll =3D &def->interconnects[j]; =20 if (l->type =3D=3D ll->type && l->initiator =3D=3D ll->initiator && @@ -1720,20 +1720,20 @@ virDomainNumaGetNodeInitiator(const virDomainNuma *= numa, /* For the rest, "NUMA node that has best performance (the lowest * latency or largest bandwidth) to this NUMA node." */ for (i =3D 0; i < numa->ninterconnects; i++) { - const virDomainNumaInterconnect *l =3D &numa->interconnects[i]; + const virNumaInterconnect *l =3D &numa->interconnects[i]; =20 if (l->target !=3D node) continue; =20 switch (l->type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: if (l->value < minLatency) { minLatency =3D l->value; candidateLatency =3D l->initiator; } break; =20 - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH: + case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH: if (l->value > maxBandwidth) { maxBandwidth =3D l->value; candidateBandwidth =3D l->initiator; @@ -1762,14 +1762,14 @@ virDomainNumaGetInterconnectsCount(const virDomainN= uma *numa) int virDomainNumaGetInterconnect(const virDomainNuma *numa, size_t i, - virDomainNumaInterconnectType *type, + virNumaInterconnectType *type, unsigned int *initiator, unsigned int *target, unsigned int *cache, - virDomainMemoryLatency *accessType, + virMemoryLatency *accessType, unsigned long *value) { - const virDomainNumaInterconnect *l; + const virNumaInterconnect *l; =20 if (!numa || i >=3D numa->ninterconnects) return -1; diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 9dee4f3a40..5baf68348c 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -69,19 +69,19 @@ typedef enum { VIR_ENUM_DECL(virNumaCachePolicy); =20 typedef enum { - VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY, - VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH, -} virDomainNumaInterconnectType; + VIR_NUMA_INTERCONNECT_TYPE_LATENCY, + VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH, +} virNumaInterconnectType; =20 typedef enum { - VIR_DOMAIN_MEMORY_LATENCY_NONE =3D 0, /* No memory latency defined */ - VIR_DOMAIN_MEMORY_LATENCY_ACCESS, /* Access latency */ - VIR_DOMAIN_MEMORY_LATENCY_READ, /* Read latency */ - VIR_DOMAIN_MEMORY_LATENCY_WRITE, /* Write latency */ + VIR_MEMORY_LATENCY_NONE =3D 0, /* No memory latency defined */ + VIR_MEMORY_LATENCY_ACCESS, /* Access latency */ + VIR_MEMORY_LATENCY_READ, /* Read latency */ + VIR_MEMORY_LATENCY_WRITE, /* Write latency */ =20 - VIR_DOMAIN_MEMORY_LATENCY_LAST -} virDomainMemoryLatency; -VIR_ENUM_DECL(virDomainMemoryLatency); + VIR_MEMORY_LATENCY_LAST +} virMemoryLatency; +VIR_ENUM_DECL(virMemoryLatency); =20 =20 virDomainNuma *virDomainNumaNew(void); @@ -243,11 +243,11 @@ size_t virDomainNumaGetInterconnectsCount(const virDo= mainNuma *numa); =20 int virDomainNumaGetInterconnect(const virDomainNuma *numa, size_t i, - virDomainNumaInterconnectType *type, + virNumaInterconnectType *type, unsigned int *initiator, unsigned int *target, unsigned int *cache, - virDomainMemoryLatency *accessType, + virMemoryLatency *accessType, unsigned long *value); =20 typedef struct _virNumaDistance virNumaDistance; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index abe4525163..d7f6dfd534 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -863,8 +863,6 @@ virNodeDeviceGetParentName; # conf/numa_conf.h virDomainMemoryAccessTypeFromString; virDomainMemoryAccessTypeToString; -virDomainMemoryLatencyTypeFromString; -virDomainMemoryLatencyTypeToString; virDomainNumaCheckABIStability; virDomainNumaEquals; virDomainNumaFillCPUsInNode; @@ -909,6 +907,8 @@ virDomainNumatunePlacementTypeFromString; virDomainNumatunePlacementTypeToString; virDomainNumatuneSet; virDomainNumatuneSpecifiedMaxNode; +virMemoryLatencyTypeFromString; +virMemoryLatencyTypeToString; virNumaCacheAssociativityTypeFromString; virNumaCacheAssociativityTypeToString; virNumaCacheFormat; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c3523c25c7..ef964a855e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7273,11 +7273,11 @@ qemuBuildNumaHMATCommandLine(virCommand *cmd, nlatencies =3D virDomainNumaGetInterconnectsCount(def->numa); for (i =3D 0; i < nlatencies; i++) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virDomainNumaInterconnectType type; + virNumaInterconnectType type; unsigned int initiator; unsigned int target; unsigned int cache; - virDomainMemoryLatency accessType; + virMemoryLatency accessType; unsigned long value; const char *hierarchyStr; const char *accessStr; @@ -7288,16 +7288,16 @@ qemuBuildNumaHMATCommandLine(virCommand *cmd, return -1; =20 hierarchyStr =3D qemuDomainMemoryHierarchyTypeToString(cache); - accessStr =3D virDomainMemoryLatencyTypeToString(accessType); + accessStr =3D virMemoryLatencyTypeToString(accessType); virBufferAsprintf(&buf, "hmat-lb,initiator=3D%u,target=3D%u,hierarchy=3D= %s,data-type=3D%s-", initiator, target, hierarchyStr, accessStr); =20 switch (type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: virBufferAsprintf(&buf, "latency,latency=3D%lu", value); break; - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH: + case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH: virBufferAsprintf(&buf, "bandwidth,bandwidth=3D%luK", value); break; } --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333862; cv=none; d=zohomail.com; s=zohoarc; b=jhJqsTvIwDxbsvnebk4M5EejJr++59mhwmWKdQohaV0ollDXjVFuiVGFS07Kx/yQr2+bh7tsbw7MqQpJsJc59N5d5R5E1G1OuwwULKPsRolaA8OkIMzBnrBcm54hxpcWughMNskAA4Y+DpSFjEHRGmbtfCi1JKvfinH8yyopsBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333862; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KdsFv8iYSHhU7MfN0wL9uyZYKBQxjZr+deJV+fsNEOQ=; b=Fuqoy73NerFFoeG+hKj1c+kC0ns1VCpv3QrnqT/C7f8u6gZJQ0+JOFQhl6MEF9i8Wb1Xq8KHKTuetIesHLqW0mM4iWnTD8rZAszuFjxyl/CZOohddaFNGi8qfq2oJLyjJ3w5FtpIhU0kXm2T2Mrtnaa4WO/CpCAfAHYQyHsK+uo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623333862448856.5146667225893; Thu, 10 Jun 2021 07:04:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-511-yC6ZY5w1PiCVerkO3hIK6A-1; Thu, 10 Jun 2021 10:04:17 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6291E9F941; Thu, 10 Jun 2021 14:04:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 34D585B4A6; Thu, 10 Jun 2021 14:04:11 +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 EA7EE46F5E; Thu, 10 Jun 2021 14:04:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvWnG005354 for ; Thu, 10 Jun 2021 09:57:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0F4F419C46; Thu, 10 Jun 2021 13:57:32 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8650019C45 for ; Thu, 10 Jun 2021 13:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333859; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=KdsFv8iYSHhU7MfN0wL9uyZYKBQxjZr+deJV+fsNEOQ=; b=ftTcJQWbIwmgOLlUeq9si6zLHq8Oc651hginuhjfgQ/aJ/lgqF12g0GLlAy6gEteeHEorf zRCZkehBF7bQcovkvIGQ8JUlMSMSeh2k6Nr7748qQJmGZBvbGX25ZQrPHAZyqAfsqpLKJm /TtvFfRuhM3lAvzcF9+uWlo8puONMr8= X-MC-Unique: yC6ZY5w1PiCVerkO3hIK6A-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 08/10] numa_conf: Expose virNumaInterconnect formatter Date: Thu, 10 Jun 2021 15:57:17 +0200 Message-Id: <4a58ba4ddcb78ae5deb31f47e1c69a7497346894.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Expose virNumaInterconnect XML formatter so that it can be re-used by other parts of the code. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/numa_conf.c | 101 +++++++++++++++++++-------------------- src/conf/numa_conf.h | 16 +++++++ src/libvirt_private.syms | 1 + 3 files changed, 66 insertions(+), 52 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index c8b3212e5c..9a9b5f4b60 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -82,8 +82,6 @@ VIR_ENUM_IMPL(virMemoryLatency, "write" ); =20 -typedef struct _virNumaInterconnect virNumaInterconnect; - typedef struct _virDomainNumaNode virDomainNumaNode; =20 struct _virDomainNuma { @@ -110,16 +108,7 @@ struct _virDomainNuma { } *mem_nodes; /* guest node configuration */ size_t nmem_nodes; =20 - struct _virNumaInterconnect { - virNumaInterconnectType type; /* whether structure describes late= ncy - or bandwidth */ - unsigned int initiator; /* the initiator NUMA node */ - unsigned int target; /* the target NUMA node */ - unsigned int cache; /* the target cache on @target; if 0 then = the - memory on @target */ - virMemoryLatency accessType; /* what type of access is defined */ - unsigned long value; /* value itself */ - } *interconnects; + virNumaInterconnect *interconnects; size_t ninterconnects; =20 /* Future NUMA tuning related stuff should go here. */ @@ -1129,46 +1118,7 @@ virDomainNumaDefFormatXML(virBuffer *buf, virXMLFormatElement(buf, "cell", &attrBuf, &childBuf); } =20 - if (def->ninterconnects) { - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); - } - - for (i =3D 0; i < def->ninterconnects; i++) { - virNumaInterconnect *l =3D &def->interconnects[i]; - - switch (l->type) { - case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: - virBufferAddLit(buf, "initiator, l->target); - - if (l->cache > 0) { - virBufferAsprintf(buf, - " cache=3D'%u'", - l->cache); - } - - virBufferAsprintf(buf, - " type=3D'%s' value=3D'%lu'", - virMemoryLatencyTypeToString(l->accessType), - l->value); - - if (l->type =3D=3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH) - virBufferAddLit(buf, " unit=3D'KiB'"); - virBufferAddLit(buf, "/>\n"); - } - - if (def->ninterconnects) { - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } + virNumaInterconnectFormat(buf, def->interconnects, def->ninterconnects= ); =20 virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); @@ -1842,3 +1792,50 @@ virNumaCacheFormat(virBuffer *buf, virXMLFormatElement(buf, "cache", &attrBuf, &childBuf); } } + + +void +virNumaInterconnectFormat(virBuffer *buf, + const virNumaInterconnect *interconnects, + size_t ninterconnects) +{ + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + size_t i; + + for (i =3D 0; i < ninterconnects; i++) { + const virNumaInterconnect *l =3D &interconnects[i]; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + const char *elem =3D NULL; + + switch (l->type) { + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: + elem =3D "latency"; + break; + case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH: + elem =3D "bandwidth"; + break; + } + + virBufferAsprintf(&attrBuf, + " initiator=3D'%u' target=3D'%u'", + l->initiator, l->target); + + if (l->cache > 0) { + virBufferAsprintf(&attrBuf, + " cache=3D'%u'", + l->cache); + } + + virBufferAsprintf(&attrBuf, + " type=3D'%s' value=3D'%lu'", + virMemoryLatencyTypeToString(l->accessType), + l->value); + + if (l->type =3D=3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH) + virBufferAddLit(&attrBuf, " unit=3D'KiB'"); + + virXMLFormatElement(&childBuf, elem, &attrBuf, NULL); + } + + virXMLFormatElement(buf, "interconnects", NULL, &childBuf); +} diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 5baf68348c..1d1e816870 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -272,3 +272,19 @@ struct _virNumaCache { void virNumaCacheFormat(virBuffer *buf, const virNumaCache *caches, size_t ncaches); + +typedef struct _virNumaInterconnect virNumaInterconnect; +struct _virNumaInterconnect { + virNumaInterconnectType type; /* whether structure describes latency + or bandwidth */ + unsigned int initiator; /* the initiator NUMA node */ + unsigned int target; /* the target NUMA node */ + unsigned int cache; /* the target cache on @target; if 0 then the + memory on @target */ + virMemoryLatency accessType; /* what type of access is defined */ + unsigned long value; /* value itself */ +}; + +void virNumaInterconnectFormat(virBuffer *buf, + const virNumaInterconnect *interconnects, + size_t ninterconnects); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d7f6dfd534..8f0945f581 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -915,6 +915,7 @@ virNumaCacheFormat; virNumaCachePolicyTypeFromString; virNumaCachePolicyTypeToString; virNumaDistanceFormat; +virNumaInterconnectFormat; =20 =20 # conf/nwfilter_conf.h --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333599; cv=none; d=zohomail.com; s=zohoarc; b=lXFrZrM7lZHCjnByJG45ekMjhWDzxhlqCthLEzLOLdAz23gWBd7qGlxumDVvl3dIZOWha3LUZjPz46rYz4IdqPYmhkubjjYSh9nchqIpoEhyt2/OuMfhXgxwuxzkGYDSWzB3Jk62o5hECQIQc8rmBeVi+/gceemGarWPonvkwDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333599; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pGyvJr8Pqod6s/JG66954g8MgUUNVDXPSAxaM5jp2OY=; b=mpzQEoOo5XAFpa7S0fB45boHO1EoNd5z0iCHPMElTb1eoUdMnHN7LAwXPxjONKFCGxkNMzNCF2EaflXEtvHdfY8bZGpjByF2EkRjw9AHJHTlQC4VZ8Vr/p6uSqh7btD7warppzqx3dxW2e1lEMdFyKrwEE61ExxNGRR0kfE/Wyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623333599344657.5295283944279; Thu, 10 Jun 2021 06:59:59 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-233-uBJaDr7PO6Scu03E7RY9Rg-1; Thu, 10 Jun 2021 09:59:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 738E31084F52; Thu, 10 Jun 2021 13:59:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C2371007623; Thu, 10 Jun 2021 13:59:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D152C46F82; Thu, 10 Jun 2021 13:59:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvWsH005363 for ; Thu, 10 Jun 2021 09:57:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDCA819C46; Thu, 10 Jun 2021 13:57:32 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60AF219C45 for ; Thu, 10 Jun 2021 13:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333598; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pGyvJr8Pqod6s/JG66954g8MgUUNVDXPSAxaM5jp2OY=; b=RQDgnNuglhpefZb6NahcXCqNITLGgK707YsYscWgotYURCcXlmYFTFJDm1S8ND1vBbx1B2 ss6rmt7nIpse4WKCYKkwcYkf+YmCkzpVpKQqMSdjOY8rHpebuS45GLm9qpQe3/qE1pd0bW fm1j8WKIGgmp28BtzjF6VdIxe7u4kTA= X-MC-Unique: uBJaDr7PO6Scu03E7RY9Rg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 09/10] capabilities: Expose NUMA interconnects Date: Thu, 10 Jun 2021 15:57:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Links between NUMA nodes can have different latencies and bandwidths. This info is newly defined in ACPI 6.2 under Heterogeneous Memory Attribute Table (HMAT) table. Linux kernel learned how to report these values under sysfs and thus we can expose them in our capabilities XML. The sysfs interface is documented in kernel's Documentation/admin-guide/mm/numaperf.rst. Long story short, two nodes can be in initiator-target relationship. A node can be initiator if it has a CPU or a device that's capable of initiating memory transfer. Therefore a node that has just memory can only be target. An initiator-target link can then have any combination of {bandwidth, latency} - {access, read, write} attribute (6 in total). However, the standard says access is applicable iff read and write values are the same. Therefore, we really have just four combinations of attributes: bandwidth-read, bandwidth-write, latency-read, latency-write. This is the combination that kernel reports anyway. Then, under /sys/system/devices/node/nodeX/acccessN/initiators we find values for those 4 attributes and also symlinks named "nodeN" which then represent initiators to nodeX. For instance: /sys/system/node/node1/access1/initiators/node0 -> ../../node0 /sys/system/node/node1/access1/initiators/read_bandwidth /sys/system/node/node1/access1/initiators/read_latency /sys/system/node/node1/access1/initiators/write_bandwidth /sys/system/node/node1/access1/initiators/write_latency This means that node0 is initiator and node1 is target and values of the interconnect can be read. In theory, there can be separate links to memory side caches too (e.g. one link from node X to node Y's main memory, another from node X to node Y's L1 cache, another one to L2 cache and so on). But sysfs does not express this relationship just yet. The "accessN" means either "access0" or "access1". The difference is that while the former expresses the best interconnect between two nodes including CPUS and I/O devices (such as GPUs and NICs), the latter includes only CPUs and thus is what we need. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1786309 Signed-off-by: Michal Privoznik --- docs/schemas/capability.rng | 3 + src/conf/capabilities.c | 188 +++++++++++++++++++++++++++++++++++- src/conf/capabilities.h | 1 + 3 files changed, 191 insertions(+), 1 deletion(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 5c1fb3607c..66dba829a8 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -138,6 +138,9 @@ + + + =20 diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 6be2d0d791..6cb42a12e1 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -191,7 +191,8 @@ virCapabilitiesHostNUMAUnref(virCapsHostNUMA *caps) =20 if (g_atomic_int_dec_and_test(&caps->refs)) { g_ptr_array_unref(caps->cells); - + if (caps->interconnects) + g_array_unref(caps->interconnects); g_free(caps); } } @@ -890,6 +891,13 @@ virCapabilitiesHostNUMAFormat(virBuffer *buf, } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); + + if (caps->interconnects) { + const virNumaInterconnect *interconnects; + interconnects =3D &g_array_index(caps->interconnects, virNumaInter= connect, 0); + virNumaInterconnectFormat(buf, interconnects, caps->interconnects-= >len); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); return 0; @@ -1735,6 +1743,181 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *ca= ps) } =20 =20 +static void +virCapabilitiesHostInsertHMAT(GArray *interconnects, + unsigned int initiator, + unsigned int target, + unsigned int read_bandwidth, + unsigned int write_bandwidth, + unsigned int read_latency, + unsigned int write_latency) +{ + virNumaInterconnect ni; + + ni =3D (virNumaInterconnect) { VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH, + initiator, target, 0, VIR_MEMORY_LATENCY_READ, read_bandwidth}; + g_array_append_val(interconnects, ni); + + ni =3D (virNumaInterconnect) { VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH, + initiator, target, 0, VIR_MEMORY_LATENCY_WRITE, write_bandwidth}; + g_array_append_val(interconnects, ni); + + ni =3D (virNumaInterconnect) { VIR_NUMA_INTERCONNECT_TYPE_LATENCY, + initiator, target, 0, VIR_MEMORY_LATENCY_READ, read_latency}; + g_array_append_val(interconnects, ni); + + ni =3D (virNumaInterconnect) { VIR_NUMA_INTERCONNECT_TYPE_LATENCY, + initiator, target, 0, VIR_MEMORY_LATENCY_WRITE, write_latency}; + g_array_append_val(interconnects, ni); +} + + +static int +virCapabilitiesHostNUMAInitInterconnectsNode(GArray *interconnects, + unsigned int node) +{ + g_autofree char *path =3D NULL; + g_autofree char *initPath =3D NULL; + g_autoptr(DIR) dir =3D NULL; + int direrr =3D 0; + struct dirent *entry; + unsigned int read_bandwidth; + unsigned int write_bandwidth; + unsigned int read_latency; + unsigned int write_latency; + + /* Unfortunately, kernel does not expose full HMAT table. I mean it do= es, + * in its binary form under /sys/firmware/acpi/tables/HMAT but we don't + * want to parse that. But some important info is still exposed, under + * "access0" and "access1" directories. The former contains the best + * interconnect to given node including CPUs and devices that might do= I/O + * (such as GPUs and NICs). The latter contains the best interconnect = to + * given node but only CPUs are considered. Stick with access1 until s= ysfs + * exposes the full table in a sensible way. + * NB on most system access0 and access1 contain the same values. */ + path =3D g_strdup_printf(SYSFS_SYSTEM_PATH "/node/node%d/access1", nod= e); + + if (!virFileExists(path)) + return 0; + + if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", + "read_bandwidth", + &read_bandwidth) < 0) + return -1; + if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", + "write_bandwidth", + &write_bandwidth) < 0) + return -1; + + /* Bandwidths are read in MiB but stored in KiB */ + read_bandwidth <<=3D 10; + write_bandwidth <<=3D 10; + + if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", + "read_latency", + &read_latency) < 0) + return -1; + if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", + "write_latency", + &write_latency) < 0) + return -1; + + initPath =3D g_strdup_printf("%s/initiators", path); + + if (virDirOpen(&dir, initPath) < 0) + return -1; + + while ((direrr =3D virDirRead(dir, &entry, path)) > 0) { + const char *dname =3D STRSKIP(entry->d_name, "node"); + unsigned int initNode; + + if (!dname) + continue; + + if (virStrToLong_ui(dname, NULL, 10, &initNode) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse %s"), + entry->d_name); + return -1; + } + + virCapabilitiesHostInsertHMAT(interconnects, + initNode, node, + read_bandwidth, + write_bandwidth, + read_latency, + write_latency); + } + + return 0; +} + + +static int +virCapsHostNUMAInterconnectComparator(const void *a, + const void *b) +{ + const virNumaInterconnect *aa =3D a; + const virNumaInterconnect *bb =3D b; + + if (aa->type !=3D bb->type) + return aa->type - bb->type; + + if (aa->initiator !=3D bb->initiator) + return aa->initiator - bb->initiator; + + if (aa->target !=3D bb->target) + return aa->target - bb->target; + + if (aa->cache !=3D bb->cache) + return aa->cache - bb->cache; + + if (aa->accessType !=3D bb->accessType) + return aa->accessType - bb->accessType; + + return aa->value - bb->value; +} + + +static int +virCapabilitiesHostNUMAInitInterconnects(virCapsHostNUMA *caps) +{ + g_autoptr(DIR) dir =3D NULL; + int direrr =3D 0; + struct dirent *entry; + const char *path =3D SYSFS_SYSTEM_PATH "/node/"; + g_autoptr(GArray) interconnects =3D g_array_new(FALSE, FALSE, sizeof(v= irNumaInterconnect)); + + if (virDirOpenIfExists(&dir, path) < 0) + return -1; + + while (dir && (direrr =3D virDirRead(dir, &entry, path)) > 0) { + const char *dname =3D STRSKIP(entry->d_name, "node"); + unsigned int node; + + if (!dname) + continue; + + if (virStrToLong_ui(dname, NULL, 10, &node) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse %s"), + entry->d_name); + return -1; + } + + if (virCapabilitiesHostNUMAInitInterconnectsNode(interconnects, no= de) < 0) + return -1; + } + + if (interconnects->len > 0) { + g_array_sort(interconnects, virCapsHostNUMAInterconnectComparator); + caps->interconnects =3D g_steal_pointer(&interconnects); + } + + return 0; +} + + static int virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) { @@ -1795,6 +1978,9 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) &caches); } =20 + if (virCapabilitiesHostNUMAInitInterconnects(caps) < 0) + goto cleanup; + ret =3D 0; =20 cleanup: diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 334b361e7a..1b99202c9b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -114,6 +114,7 @@ struct _virCapsHostNUMACell { struct _virCapsHostNUMA { gint refs; GPtrArray *cells; + GArray *interconnects; /* virNumaInterconnect */ }; =20 struct _virCapsHostSecModelLabel { --=20 2.31.1 From nobody Tue Apr 30 22:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623333759; cv=none; d=zohomail.com; s=zohoarc; b=cIw6EH9yoo8636w5YYNxSonOQOguUlCT4QasDkug7koCblawsJyXGz/3jUsejeh2lghrSdw41GPiACa9w7hGp038a87RRSE0hRvbVJPpgL0BMvUr79JN/ulJV6JJucaW8O+AR3XKCCSgqSBBk42ehuM5F6o4cWg3asM/stX0bn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333759; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ii9Y0i78VSCKtNGE0JG4cJ1hsARC7VjDdkhHq1lP9IQ=; b=Kgkur+YYWuscgGKjHD5x7ZA84flB706UiK4znFHqqsx3q+1iK1nZM8OK7EXGoMVUPttvRb8/9WfWqCbXU7FL7F1f6vlBQVIzEL8tl8N283kUxzwEmpX0UQUdXEC/Djw1g67X8jKJmVvs0iKP9SBTTrlO8oW1M4qpAZmdO0mKsmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162333375897440.87252075981587; Thu, 10 Jun 2021 07:02:38 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-z6Iiu0v2MjC-W_GnjS5xog-1; Thu, 10 Jun 2021 10:02:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49A17100C668; Thu, 10 Jun 2021 14:02:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1CDEE100238C; Thu, 10 Jun 2021 14:02:25 +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 D4C8946F59; Thu, 10 Jun 2021 14:02:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvbwv005404 for ; Thu, 10 Jun 2021 09:57:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E72619D7C; Thu, 10 Jun 2021 13:57:37 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 605E319C46 for ; Thu, 10 Jun 2021 13:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333757; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ii9Y0i78VSCKtNGE0JG4cJ1hsARC7VjDdkhHq1lP9IQ=; b=YZUFCo+OldjvyQ4U5TtvXdsze9kIQr7WH9I+kFAeWdc5/gTRYj6bL8QuZLNdwPwDYN8GFj HTjn+cKv9vbRvWTeAgppm2jC9Cy4YerPu/PPIP8YWPtWVTWt0lQ5h+3+nLwEgzqVgtcnms DgTJExtnQzEtks+LgvgysK3G2RnW814= X-MC-Unique: z6Iiu0v2MjC-W_GnjS5xog-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 10/10] vircaps2xmltest: Introduce HMAT test case Date: Thu, 10 Jun 2021 15:57:19 +0200 Message-Id: <9f2f9c93ea8bd4a042cf665f00fbc03c109e9b43.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This test was generated on a guest with the following NUMA configuration: The sysfs content was also copied over from the VM but only those files which are accessed in the test are stored in the repo. Signed-off-by: Michal Privoznik --- build-aux/syntax-check.mk | 2 +- .../system/cpu/cpu0/cache/index0/level | 1 + .../system/cpu/cpu0/cache/index1/level | 1 + .../system/cpu/cpu0/cache/index2/level | 1 + .../system/cpu/cpu0/cache/index3/id | 1 + .../system/cpu/cpu0/cache/index3/level | 1 + .../cpu/cpu0/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index3/size | 1 + .../system/cpu/cpu0/cache/index3/type | 1 + .../system/cpu/cpu0/topology/core_id | 1 + .../system/cpu/cpu0/topology/die_id | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../system/cpu/cpu1/cache/index0/level | 1 + .../system/cpu/cpu1/cache/index1/level | 1 + .../system/cpu/cpu1/cache/index2/level | 1 + .../system/cpu/cpu1/cache/index3/id | 1 + .../system/cpu/cpu1/cache/index3/level | 1 + .../cpu/cpu1/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu1/cache/index3/size | 1 + .../system/cpu/cpu1/cache/index3/type | 1 + .../system/cpu/cpu1/topology/core_id | 1 + .../system/cpu/cpu1/topology/die_id | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../system/cpu/cpu10/cache/index0/level | 1 + .../system/cpu/cpu10/cache/index1/level | 1 + .../system/cpu/cpu10/cache/index2/level | 1 + .../system/cpu/cpu10/cache/index3/id | 1 + .../system/cpu/cpu10/cache/index3/level | 1 + .../cpu/cpu10/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu10/cache/index3/size | 1 + .../system/cpu/cpu10/cache/index3/type | 1 + .../system/cpu/cpu10/topology/core_id | 1 + .../system/cpu/cpu10/topology/die_id | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings_list | 1 + .../system/cpu/cpu11/cache/index0/level | 1 + .../system/cpu/cpu11/cache/index1/level | 1 + .../system/cpu/cpu11/cache/index2/level | 1 + .../system/cpu/cpu11/cache/index3/id | 1 + .../system/cpu/cpu11/cache/index3/level | 1 + .../cpu/cpu11/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu11/cache/index3/size | 1 + .../system/cpu/cpu11/cache/index3/type | 1 + .../system/cpu/cpu11/topology/core_id | 1 + .../system/cpu/cpu11/topology/die_id | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings_list | 1 + .../system/cpu/cpu12/cache/index0/level | 1 + .../system/cpu/cpu12/cache/index1/level | 1 + .../system/cpu/cpu12/cache/index2/level | 1 + .../system/cpu/cpu12/cache/index3/id | 1 + .../system/cpu/cpu12/cache/index3/level | 1 + .../cpu/cpu12/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu12/cache/index3/size | 1 + .../system/cpu/cpu12/cache/index3/type | 1 + .../system/cpu/cpu12/topology/core_id | 1 + .../system/cpu/cpu12/topology/die_id | 1 + .../cpu/cpu12/topology/physical_package_id | 1 + .../cpu/cpu12/topology/thread_siblings_list | 1 + .../system/cpu/cpu13/cache/index0/level | 1 + .../system/cpu/cpu13/cache/index1/level | 1 + .../system/cpu/cpu13/cache/index2/level | 1 + .../system/cpu/cpu13/cache/index3/id | 1 + .../system/cpu/cpu13/cache/index3/level | 1 + .../cpu/cpu13/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu13/cache/index3/size | 1 + .../system/cpu/cpu13/cache/index3/type | 1 + .../system/cpu/cpu13/topology/core_id | 1 + .../system/cpu/cpu13/topology/die_id | 1 + .../cpu/cpu13/topology/physical_package_id | 1 + .../cpu/cpu13/topology/thread_siblings_list | 1 + .../system/cpu/cpu14/cache/index0/level | 1 + .../system/cpu/cpu14/cache/index1/level | 1 + .../system/cpu/cpu14/cache/index2/level | 1 + .../system/cpu/cpu14/cache/index3/id | 1 + .../system/cpu/cpu14/cache/index3/level | 1 + .../cpu/cpu14/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu14/cache/index3/size | 1 + .../system/cpu/cpu14/cache/index3/type | 1 + .../system/cpu/cpu14/topology/core_id | 1 + .../system/cpu/cpu14/topology/die_id | 1 + .../cpu/cpu14/topology/physical_package_id | 1 + .../cpu/cpu14/topology/thread_siblings_list | 1 + .../system/cpu/cpu15/cache/index0/level | 1 + .../system/cpu/cpu15/cache/index1/level | 1 + .../system/cpu/cpu15/cache/index2/level | 1 + .../system/cpu/cpu15/cache/index3/id | 1 + .../system/cpu/cpu15/cache/index3/level | 1 + .../cpu/cpu15/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu15/cache/index3/size | 1 + .../system/cpu/cpu15/cache/index3/type | 1 + .../system/cpu/cpu15/topology/core_id | 1 + .../system/cpu/cpu15/topology/die_id | 1 + .../cpu/cpu15/topology/physical_package_id | 1 + .../cpu/cpu15/topology/thread_siblings_list | 1 + .../system/cpu/cpu16/cache/index0/level | 1 + .../system/cpu/cpu16/cache/index1/level | 1 + .../system/cpu/cpu16/cache/index2/level | 1 + .../system/cpu/cpu16/cache/index3/id | 1 + .../system/cpu/cpu16/cache/index3/level | 1 + .../cpu/cpu16/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu16/cache/index3/size | 1 + .../system/cpu/cpu16/cache/index3/type | 1 + .../system/cpu/cpu16/topology/core_id | 1 + .../system/cpu/cpu16/topology/die_id | 1 + .../cpu/cpu16/topology/physical_package_id | 1 + .../cpu/cpu16/topology/thread_siblings_list | 1 + .../system/cpu/cpu17/cache/index0/level | 1 + .../system/cpu/cpu17/cache/index1/level | 1 + .../system/cpu/cpu17/cache/index2/level | 1 + .../system/cpu/cpu17/cache/index3/id | 1 + .../system/cpu/cpu17/cache/index3/level | 1 + .../cpu/cpu17/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu17/cache/index3/size | 1 + .../system/cpu/cpu17/cache/index3/type | 1 + .../system/cpu/cpu17/topology/core_id | 1 + .../system/cpu/cpu17/topology/die_id | 1 + .../cpu/cpu17/topology/physical_package_id | 1 + .../cpu/cpu17/topology/thread_siblings_list | 1 + .../system/cpu/cpu18/cache/index0/level | 1 + .../system/cpu/cpu18/cache/index1/level | 1 + .../system/cpu/cpu18/cache/index2/level | 1 + .../system/cpu/cpu18/cache/index3/id | 1 + .../system/cpu/cpu18/cache/index3/level | 1 + .../cpu/cpu18/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu18/cache/index3/size | 1 + .../system/cpu/cpu18/cache/index3/type | 1 + .../system/cpu/cpu18/topology/core_id | 1 + .../system/cpu/cpu18/topology/die_id | 1 + .../cpu/cpu18/topology/physical_package_id | 1 + .../cpu/cpu18/topology/thread_siblings_list | 1 + .../system/cpu/cpu19/cache/index0/level | 1 + .../system/cpu/cpu19/cache/index1/level | 1 + .../system/cpu/cpu19/cache/index2/level | 1 + .../system/cpu/cpu19/cache/index3/id | 1 + .../system/cpu/cpu19/cache/index3/level | 1 + .../cpu/cpu19/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu19/cache/index3/size | 1 + .../system/cpu/cpu19/cache/index3/type | 1 + .../system/cpu/cpu19/topology/core_id | 1 + .../system/cpu/cpu19/topology/die_id | 1 + .../cpu/cpu19/topology/physical_package_id | 1 + .../cpu/cpu19/topology/thread_siblings_list | 1 + .../system/cpu/cpu2/cache/index0/level | 1 + .../system/cpu/cpu2/cache/index1/level | 1 + .../system/cpu/cpu2/cache/index2/level | 1 + .../system/cpu/cpu2/cache/index3/id | 1 + .../system/cpu/cpu2/cache/index3/level | 1 + .../cpu/cpu2/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu2/cache/index3/size | 1 + .../system/cpu/cpu2/cache/index3/type | 1 + .../system/cpu/cpu2/topology/core_id | 1 + .../system/cpu/cpu2/topology/die_id | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../system/cpu/cpu20/cache/index0/level | 1 + .../system/cpu/cpu20/cache/index1/level | 1 + .../system/cpu/cpu20/cache/index2/level | 1 + .../system/cpu/cpu20/cache/index3/id | 1 + .../system/cpu/cpu20/cache/index3/level | 1 + .../cpu/cpu20/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu20/cache/index3/size | 1 + .../system/cpu/cpu20/cache/index3/type | 1 + .../system/cpu/cpu20/topology/core_id | 1 + .../system/cpu/cpu20/topology/die_id | 1 + .../cpu/cpu20/topology/physical_package_id | 1 + .../cpu/cpu20/topology/thread_siblings_list | 1 + .../system/cpu/cpu21/cache/index0/level | 1 + .../system/cpu/cpu21/cache/index1/level | 1 + .../system/cpu/cpu21/cache/index2/level | 1 + .../system/cpu/cpu21/cache/index3/id | 1 + .../system/cpu/cpu21/cache/index3/level | 1 + .../cpu/cpu21/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu21/cache/index3/size | 1 + .../system/cpu/cpu21/cache/index3/type | 1 + .../system/cpu/cpu21/topology/core_id | 1 + .../system/cpu/cpu21/topology/die_id | 1 + .../cpu/cpu21/topology/physical_package_id | 1 + .../cpu/cpu21/topology/thread_siblings_list | 1 + .../system/cpu/cpu22/cache/index0/level | 1 + .../system/cpu/cpu22/cache/index1/level | 1 + .../system/cpu/cpu22/cache/index2/level | 1 + .../system/cpu/cpu22/cache/index3/id | 1 + .../system/cpu/cpu22/cache/index3/level | 1 + .../cpu/cpu22/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu22/cache/index3/size | 1 + .../system/cpu/cpu22/cache/index3/type | 1 + .../system/cpu/cpu22/topology/core_id | 1 + .../system/cpu/cpu22/topology/die_id | 1 + .../cpu/cpu22/topology/physical_package_id | 1 + .../cpu/cpu22/topology/thread_siblings_list | 1 + .../system/cpu/cpu23/cache/index0/level | 1 + .../system/cpu/cpu23/cache/index1/level | 1 + .../system/cpu/cpu23/cache/index2/level | 1 + .../system/cpu/cpu23/cache/index3/id | 1 + .../system/cpu/cpu23/cache/index3/level | 1 + .../cpu/cpu23/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu23/cache/index3/size | 1 + .../system/cpu/cpu23/cache/index3/type | 1 + .../system/cpu/cpu23/topology/core_id | 1 + .../system/cpu/cpu23/topology/die_id | 1 + .../cpu/cpu23/topology/physical_package_id | 1 + .../cpu/cpu23/topology/thread_siblings_list | 1 + .../system/cpu/cpu3/cache/index0/level | 1 + .../system/cpu/cpu3/cache/index1/level | 1 + .../system/cpu/cpu3/cache/index2/level | 1 + .../system/cpu/cpu3/cache/index3/id | 1 + .../system/cpu/cpu3/cache/index3/level | 1 + .../cpu/cpu3/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu3/cache/index3/size | 1 + .../system/cpu/cpu3/cache/index3/type | 1 + .../system/cpu/cpu3/topology/core_id | 1 + .../system/cpu/cpu3/topology/die_id | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../system/cpu/cpu4/cache/index0/level | 1 + .../system/cpu/cpu4/cache/index1/level | 1 + .../system/cpu/cpu4/cache/index2/level | 1 + .../system/cpu/cpu4/cache/index3/id | 1 + .../system/cpu/cpu4/cache/index3/level | 1 + .../cpu/cpu4/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu4/cache/index3/size | 1 + .../system/cpu/cpu4/cache/index3/type | 1 + .../system/cpu/cpu4/topology/core_id | 1 + .../system/cpu/cpu4/topology/die_id | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../system/cpu/cpu5/cache/index0/level | 1 + .../system/cpu/cpu5/cache/index1/level | 1 + .../system/cpu/cpu5/cache/index2/level | 1 + .../system/cpu/cpu5/cache/index3/id | 1 + .../system/cpu/cpu5/cache/index3/level | 1 + .../cpu/cpu5/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu5/cache/index3/size | 1 + .../system/cpu/cpu5/cache/index3/type | 1 + .../system/cpu/cpu5/topology/core_id | 1 + .../system/cpu/cpu5/topology/die_id | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../system/cpu/cpu6/cache/index0/level | 1 + .../system/cpu/cpu6/cache/index1/level | 1 + .../system/cpu/cpu6/cache/index2/level | 1 + .../system/cpu/cpu6/cache/index3/id | 1 + .../system/cpu/cpu6/cache/index3/level | 1 + .../cpu/cpu6/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu6/cache/index3/size | 1 + .../system/cpu/cpu6/cache/index3/type | 1 + .../system/cpu/cpu6/topology/core_id | 1 + .../system/cpu/cpu6/topology/die_id | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../system/cpu/cpu7/cache/index0/level | 1 + .../system/cpu/cpu7/cache/index1/level | 1 + .../system/cpu/cpu7/cache/index2/level | 1 + .../system/cpu/cpu7/cache/index3/id | 1 + .../system/cpu/cpu7/cache/index3/level | 1 + .../cpu/cpu7/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu7/cache/index3/size | 1 + .../system/cpu/cpu7/cache/index3/type | 1 + .../system/cpu/cpu7/topology/core_id | 1 + .../system/cpu/cpu7/topology/die_id | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../system/cpu/cpu8/cache/index0/level | 1 + .../system/cpu/cpu8/cache/index1/level | 1 + .../system/cpu/cpu8/cache/index2/level | 1 + .../system/cpu/cpu8/cache/index3/id | 1 + .../system/cpu/cpu8/cache/index3/level | 1 + .../cpu/cpu8/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu8/cache/index3/size | 1 + .../system/cpu/cpu8/cache/index3/type | 1 + .../system/cpu/cpu8/topology/core_id | 1 + .../system/cpu/cpu8/topology/die_id | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + .../system/cpu/cpu9/cache/index0/level | 1 + .../system/cpu/cpu9/cache/index1/level | 1 + .../system/cpu/cpu9/cache/index2/level | 1 + .../system/cpu/cpu9/cache/index3/id | 1 + .../system/cpu/cpu9/cache/index3/level | 1 + .../cpu/cpu9/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu9/cache/index3/size | 1 + .../system/cpu/cpu9/cache/index3/type | 1 + .../system/cpu/cpu9/topology/core_id | 1 + .../system/cpu/cpu9/topology/die_id | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings_list | 1 + .../linux-hmat/system/cpu/online | 1 + .../node/node0/access1/initiators/node0 | 0 .../node0/access1/initiators/read_bandwidth | 1 + .../node0/access1/initiators/read_latency | 1 + .../node0/access1/initiators/write_bandwidth | 1 + .../node0/access1/initiators/write_latency | 1 + .../system/node/node0/access1/targets/node0 | 0 .../system/node/node0/access1/targets/node1 | 1 + .../linux-hmat/system/node/node0/cpulist | 1 + .../linux-hmat/system/node/node0/distance | 1 + .../hugepages-1048576kB/free_hugepages | 1 + .../hugepages-1048576kB/nr_hugepages | 1 + .../hugepages-1048576kB/surplus_hugepages | 1 + .../hugepages/hugepages-2048kB/free_hugepages | 1 + .../hugepages/hugepages-2048kB/nr_hugepages | 1 + .../hugepages-2048kB/surplus_hugepages | 1 + .../node0/memory_side_cache/index1/indexing | 1 + .../node0/memory_side_cache/index1/line_size | 1 + .../node/node0/memory_side_cache/index1/size | 1 + .../memory_side_cache/index1/write_policy | 1 + .../node0/memory_side_cache/index2/indexing | 1 + .../node0/memory_side_cache/index2/line_size | 1 + .../node/node0/memory_side_cache/index2/size | 1 + .../memory_side_cache/index2/write_policy | 1 + .../node/node1/access1/initiators/node0 | 0 .../node1/access1/initiators/read_bandwidth | 1 + .../node1/access1/initiators/read_latency | 1 + .../node1/access1/initiators/write_bandwidth | 1 + .../node1/access1/initiators/write_latency | 1 + .../linux-hmat/system/node/node1/cpulist | 1 + .../linux-hmat/system/node/node1/distance | 1 + .../hugepages-1048576kB/free_hugepages | 1 + .../hugepages-1048576kB/nr_hugepages | 1 + .../hugepages-1048576kB/surplus_hugepages | 1 + .../hugepages/hugepages-2048kB/free_hugepages | 1 + .../hugepages/hugepages-2048kB/nr_hugepages | 1 + .../hugepages-2048kB/surplus_hugepages | 1 + .../node1/memory_side_cache/index1/indexing | 1 + .../node1/memory_side_cache/index1/line_size | 1 + .../node/node1/memory_side_cache/index1/size | 1 + .../memory_side_cache/index1/write_policy | 1 + .../linux-hmat/system/node/online | 1 + tests/vircaps2xmldata/vircaps-x86_64-hmat.xml | 105 ++++++++++++++++++ tests/vircaps2xmltest.c | 2 + 333 files changed, 435 insertions(+), 1 deletion(-) create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache= /index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topol= ogy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topol= ogy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topol= ogy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topol= ogy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index0/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index1/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index2/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index3/id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index3/level create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index3/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/= index3/type create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topolo= gy/core_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topolo= gy/die_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topolo= gy/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topolo= gy/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/online create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/initiators/node0 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/initiators/read_bandwidth create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/initiators/read_latency create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/initiators/write_bandwidth create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/initiators/write_latency create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/targets/node0 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/acce= ss1/targets/node1 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/cpul= ist create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/dist= ance create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-1048576kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-1048576kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-1048576kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-2048kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-2048kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/huge= pages/hugepages-2048kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index1/indexing create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index1/line_size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index1/write_policy create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index2/indexing create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index2/line_size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memo= ry_side_cache/index2/write_policy create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/acce= ss1/initiators/node0 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/acce= ss1/initiators/read_bandwidth create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/acce= ss1/initiators/read_latency create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/acce= ss1/initiators/write_bandwidth create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/acce= ss1/initiators/write_latency create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/cpul= ist create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/dist= ance create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-1048576kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-1048576kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-1048576kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-2048kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-2048kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/huge= pages/hugepages-2048kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memo= ry_side_cache/index1/indexing create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memo= ry_side_cache/index1/line_size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memo= ry_side_cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memo= ry_side_cache/index1/write_policy create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/online create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-hmat.xml diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 552d639119..be55f26e19 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1835,7 +1835,7 @@ exclude_file_name_regexp--sc_prohibit_mixed_case_abbr= eviations =3D \ ^src/(vbox/vbox_CAPI.*.h|esx/esx_vi.(c|h)|esx/esx_storage_backend_iscsi.= c)$$ =20 exclude_file_name_regexp--sc_prohibit_empty_first_line =3D \ - ^(src/esx/README|tests/(vmwarever|virhostcpu)data/.*)$$ + ^(src/esx/README|tests/(vmwarever|virhostcpu|vircaps2xml)data/.*)$$ =20 exclude_file_name_regexp--sc_prohibit_useless_translation =3D \ ^tests/virpolkittest.c diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology= /physical_package_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology= /physical_package_id new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id new file mode 100644 index 0000000000..f599e28b8a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..f599e28b8a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topolo= gy/physical_package_id new file mode 100644 index 0000000000..f599e28b8a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/physical_p= ackage_id @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..f599e28b8a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thread_sib= lings_list @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id @@ -0,0 +1 @@ +11 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +11 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topolo= gy/physical_package_id new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/physical_p= ackage_id @@ -0,0 +1 @@ +11 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thread_sib= lings_list @@ -0,0 +1 @@ +11 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id @@ -0,0 +1 @@ +12 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +12 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topolo= gy/physical_package_id new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/physical_p= ackage_id @@ -0,0 +1 @@ +12 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thread_sib= lings_list @@ -0,0 +1 @@ +12 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id new file mode 100644 index 0000000000..b1bd38b62a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id @@ -0,0 +1 @@ +13 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..b1bd38b62a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +13 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topolo= gy/physical_package_id new file mode 100644 index 0000000000..b1bd38b62a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/physical_p= ackage_id @@ -0,0 +1 @@ +13 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..b1bd38b62a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thread_sib= lings_list @@ -0,0 +1 @@ +13 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id new file mode 100644 index 0000000000..8351c19397 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id @@ -0,0 +1 @@ +14 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..8351c19397 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +14 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topolo= gy/physical_package_id new file mode 100644 index 0000000000..8351c19397 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/physical_p= ackage_id @@ -0,0 +1 @@ +14 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..8351c19397 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thread_sib= lings_list @@ -0,0 +1 @@ +14 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id new file mode 100644 index 0000000000..60d3b2f4a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id @@ -0,0 +1 @@ +15 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..60d3b2f4a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +15 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topolo= gy/physical_package_id new file mode 100644 index 0000000000..60d3b2f4a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/physical_p= ackage_id @@ -0,0 +1 @@ +15 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..60d3b2f4a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thread_sib= lings_list @@ -0,0 +1 @@ +15 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id new file mode 100644 index 0000000000..b6a7d89c68 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..b6a7d89c68 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topolo= gy/physical_package_id new file mode 100644 index 0000000000..b6a7d89c68 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/physical_p= ackage_id @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..b6a7d89c68 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thread_sib= lings_list @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id new file mode 100644 index 0000000000..98d9bcb75a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id @@ -0,0 +1 @@ +17 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..98d9bcb75a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +17 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topolo= gy/physical_package_id new file mode 100644 index 0000000000..98d9bcb75a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/physical_p= ackage_id @@ -0,0 +1 @@ +17 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..98d9bcb75a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thread_sib= lings_list @@ -0,0 +1 @@ +17 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id new file mode 100644 index 0000000000..3c032078a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id @@ -0,0 +1 @@ +18 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..3c032078a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +18 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topolo= gy/physical_package_id new file mode 100644 index 0000000000..3c032078a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/physical_p= ackage_id @@ -0,0 +1 @@ +18 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..3c032078a4 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thread_sib= lings_list @@ -0,0 +1 @@ +18 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id new file mode 100644 index 0000000000..d6b24041cf --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id @@ -0,0 +1 @@ +19 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..d6b24041cf --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +19 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topolo= gy/physical_package_id new file mode 100644 index 0000000000..d6b24041cf --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/physical_p= ackage_id @@ -0,0 +1 @@ +19 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..d6b24041cf --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thread_sib= lings_list @@ -0,0 +1 @@ +19 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology= /physical_package_id new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id new file mode 100644 index 0000000000..209e3ef4b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id @@ -0,0 +1 @@ +20 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..209e3ef4b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +20 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topolo= gy/physical_package_id new file mode 100644 index 0000000000..209e3ef4b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/physical_p= ackage_id @@ -0,0 +1 @@ +20 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..209e3ef4b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thread_sib= lings_list @@ -0,0 +1 @@ +20 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id new file mode 100644 index 0000000000..aabe6ec390 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id @@ -0,0 +1 @@ +21 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..aabe6ec390 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +21 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topolo= gy/physical_package_id new file mode 100644 index 0000000000..aabe6ec390 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/physical_p= ackage_id @@ -0,0 +1 @@ +21 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..aabe6ec390 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thread_sib= lings_list @@ -0,0 +1 @@ +21 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id new file mode 100644 index 0000000000..2bd5a0a98a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id @@ -0,0 +1 @@ +22 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..2bd5a0a98a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +22 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topolo= gy/physical_package_id new file mode 100644 index 0000000000..2bd5a0a98a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/physical_p= ackage_id @@ -0,0 +1 @@ +22 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..2bd5a0a98a --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thread_sib= lings_list @@ -0,0 +1 @@ +22 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/lev= el new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/lev= el new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3= /id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id new file mode 100644 index 0000000000..409940768f --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id @@ -0,0 +1 @@ +23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3= /level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/lev= el new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3= /shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/= index3/shared_cpu_list new file mode 100644 index 0000000000..409940768f --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/shared= _cpu_list @@ -0,0 +1 @@ +23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3= /size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3= /type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/cor= e_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/phy= sical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topolo= gy/physical_package_id new file mode 100644 index 0000000000..409940768f --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/physical_p= ackage_id @@ -0,0 +1 @@ +23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thr= ead_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topol= ogy/thread_siblings_list new file mode 100644 index 0000000000..409940768f --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thread_sib= lings_list @@ -0,0 +1 @@ +23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology= /physical_package_id new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id new file mode 100644 index 0000000000..b8626c4cff --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id @@ -0,0 +1 @@ +4 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..b8626c4cff --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +4 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology= /physical_package_id new file mode 100644 index 0000000000..b8626c4cff --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +4 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..b8626c4cff --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +4 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id @@ -0,0 +1 @@ +5 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +5 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology= /physical_package_id new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +5 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +5 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id @@ -0,0 +1 @@ +6 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +6 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology= /physical_package_id new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +6 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +6 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id @@ -0,0 +1 @@ +7 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +7 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology= /physical_package_id new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +7 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +7 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology= /physical_package_id new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level @@ -0,0 +1 @@ +2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id @@ -0,0 +1 @@ +9 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/= level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/= shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/in= dex3/shared_cpu_list new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/shared_= cpu_list @@ -0,0 +1 @@ +9 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/= size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size new file mode 100644 index 0000000000..e7252eb3b6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size @@ -0,0 +1 @@ +16384K diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/= type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type new file mode 100644 index 0000000000..e4fd9dccda --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core= _id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_= id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/phys= ical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology= /physical_package_id new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/physical_pa= ckage_id @@ -0,0 +1 @@ +9 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thre= ad_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topolog= y/thread_siblings_list new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thread_sibl= ings_list @@ -0,0 +1 @@ +9 diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/online b/tests/vir= caps2xmldata/linux-hmat/system/cpu/online new file mode 100644 index 0000000000..bb381c7835 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/online @@ -0,0 +1 @@ +0-23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/ini= tiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/= initiators/node0 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/ini= tiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node0= /access1/initiators/read_bandwidth new file mode 100644 index 0000000000..3bc92d44ac --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators= /read_bandwidth @@ -0,0 +1 @@ +201 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/ini= tiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/a= ccess1/initiators/read_latency new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators= /read_latency @@ -0,0 +1 @@ +6 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/ini= tiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node= 0/access1/initiators/write_bandwidth new file mode 100644 index 0000000000..8f897c857d --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators= /write_bandwidth @@ -0,0 +1 @@ +202 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/ini= tiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/= access1/initiators/write_latency new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators= /write_latency @@ -0,0 +1 @@ +7 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/tar= gets/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/tar= gets/node0 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/tar= gets/node1 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/tar= gets/node1 new file mode 120000 index 0000000000..f0a5ec8766 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/no= de1 @@ -0,0 +1 @@ +../../../node1 \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist b/t= ests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist new file mode 100644 index 0000000000..bb381c7835 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist @@ -0,0 +1 @@ +0-23 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/distance b/= tests/vircaps2xmldata/linux-hmat/system/node/node0/distance new file mode 100644 index 0000000000..ed40cec79b --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/distance @@ -0,0 +1 @@ +10 20 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-1048576kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system= /node/node0/hugepages/hugepages-1048576kB/free_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-1048576kB/free_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-1048576kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/n= ode/node0/hugepages/hugepages-1048576kB/nr_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-1048576kB/nr_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-1048576kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/sys= tem/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-1048576kB/surplus_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-2048kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/no= de/node0/hugepages/hugepages-2048kB/free_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-2048kB/free_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-2048kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node= /node0/hugepages/hugepages-2048kB/nr_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-2048kB/nr_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/h= ugepages-2048kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system= /node/node0/hugepages/hugepages-2048kB/surplus_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepage= s-2048kB/surplus_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index1/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node0= /memory_side_cache/index1/indexing new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index1/indexing @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index1/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node= 0/memory_side_cache/index1/line_size new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index1/line_size @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index1/size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/mem= ory_side_cache/index1/size new file mode 100644 index 0000000000..7b16a10f97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index1/size @@ -0,0 +1 @@ +10240 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index1/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/n= ode0/memory_side_cache/index1/write_policy new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index1/write_policy @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index2/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node0= /memory_side_cache/index2/indexing new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index2/indexing @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index2/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node= 0/memory_side_cache/index2/line_size new file mode 100644 index 0000000000..b6a7d89c68 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index2/line_size @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index2/size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/mem= ory_side_cache/index2/size new file mode 100644 index 0000000000..b71078fd07 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index2/size @@ -0,0 +1 @@ +131072 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side= _cache/index2/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/n= ode0/memory_side_cache/index2/write_policy new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/= index2/write_policy @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/ini= tiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/= initiators/node0 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/ini= tiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node1= /access1/initiators/read_bandwidth new file mode 100644 index 0000000000..398050c62c --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators= /read_bandwidth @@ -0,0 +1 @@ +101 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/ini= tiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/a= ccess1/initiators/read_latency new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators= /read_latency @@ -0,0 +1 @@ +11 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/ini= tiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node= 1/access1/initiators/write_bandwidth new file mode 100644 index 0000000000..257e563266 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators= /write_bandwidth @@ -0,0 +1 @@ +102 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/ini= tiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/= access1/initiators/write_latency new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators= /write_latency @@ -0,0 +1 @@ +12 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist b/t= ests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist @@ -0,0 +1 @@ + diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/distance b/= tests/vircaps2xmldata/linux-hmat/system/node/node1/distance new file mode 100644 index 0000000000..df502ea951 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/distance @@ -0,0 +1 @@ +20 10 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-1048576kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system= /node/node1/hugepages/hugepages-1048576kB/free_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-1048576kB/free_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-1048576kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/n= ode/node1/hugepages/hugepages-1048576kB/nr_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-1048576kB/nr_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-1048576kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/sys= tem/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-1048576kB/surplus_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-2048kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/no= de/node1/hugepages/hugepages-2048kB/free_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-2048kB/free_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-2048kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node= /node1/hugepages/hugepages-2048kB/nr_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-2048kB/nr_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/h= ugepages-2048kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system= /node/node1/hugepages/hugepages-2048kB/surplus_hugepages new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepage= s-2048kB/surplus_hugepages @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side= _cache/index1/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node1= /memory_side_cache/index1/indexing new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/= index1/indexing @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side= _cache/index1/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node= 1/memory_side_cache/index1/line_size new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/= index1/line_size @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side= _cache/index1/size b/tests/vircaps2xmldata/linux-hmat/system/node/node1/mem= ory_side_cache/index1/size new file mode 100644 index 0000000000..7b16a10f97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/= index1/size @@ -0,0 +1 @@ +10240 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side= _cache/index1/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/n= ode1/memory_side_cache/index1/write_policy new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/= index1/write_policy @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/online b/tests/vi= rcaps2xmldata/linux-hmat/system/node/online new file mode 100644 index 0000000000..8b0fab869c --- /dev/null +++ b/tests/vircaps2xmldata/linux-hmat/system/node/online @@ -0,0 +1 @@ +0-1 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml b/tests/vircaps2= xmldata/vircaps-x86_64-hmat.xml new file mode 100644 index 0000000000..6fe5751666 --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml @@ -0,0 +1,105 @@ + + + + + x86_64 + + + + + + + + + + 1048576 + 2048 + 4096 + 6144 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2097152 + 4096 + 6144 + 8192 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 1e6c113c77..b143f873a1 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -97,6 +97,8 @@ mymain(void) =20 DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true); =20 + DO_TEST_FULL("hmat", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true); DO_TEST_FULL("resctrl-cmt", VIR_ARCH_X86_64, true, true); DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true); --=20 2.31.1