From nobody Sun Feb 8 10:43:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894087; cv=none; d=zohomail.com; s=zohoarc; b=PhVX67KkZCd3E3wwfawY+SOaF71+TWKaG4/WKiNCnjl9qTRo4vOPq/LWn2iya2jbMG/RGCkYDeRGamjB7RBZnapUnaWN9rSJjMhWM00HuOF5V9ZQRm3BTfB/DLsTe4fzWIDNh2NL67XRMTOlVcTtABkqCx0Ug/4eABv5NzU64QQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894087; 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=H0Syntd/2IlznB6qKN7UaPW0r7rYsuyAp9F128FgRT4=; b=Q05PsrFcrufvp7zt3f7VMxZXo2EDWcxV0AXjKV5mo8WhSxyyWMqBUxUffaRwhUa+OYTUUpijy8sNy/fdEJYVXNMa4/waIgwdsGxMTL8o99V2hBIpcf3h7+GYRyDsqom9oiiiad5rX8MIoL3KWl0CmrHZfZmxWYVvo4vfjuAlZfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894087185493.0632655345115; Thu, 16 Jul 2020 03:08:07 -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-483-Nftvg4hTNDWqdfKWvy-oCQ-1; Thu, 16 Jul 2020 06:08:03 -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 D898F1888AB7; Thu, 16 Jul 2020 10:07:57 +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 B502C61982; Thu, 16 Jul 2020 10:07:57 +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 81980180476B; Thu, 16 Jul 2020 10:07:57 +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 06GA42bo017616 for ; Thu, 16 Jul 2020 06:04:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 431852B6DB; Thu, 16 Jul 2020 10:04:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B27C32DE71 for ; Thu, 16 Jul 2020 10:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894086; 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=H0Syntd/2IlznB6qKN7UaPW0r7rYsuyAp9F128FgRT4=; b=GJaMIp59JVT+TU6FGPPTu57Qt/XGWihnNcjX8wj+et1asLZjUQ/QJgt8I03AT76daq4W4g xU7et79AUzS9khA7UJMYrTOMMivl7qV/C7bcmZeu15aAdz0YaRF9V2WLRV3MMZQDVCRCSV uBPwONncOWqXpJxQOB4xxB0SZyOrJyU= X-MC-Unique: Nftvg4hTNDWqdfKWvy-oCQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 153/351] meson: src: install cpu_map data Date: Thu, 16 Jul 2020 11:56:29 +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.12 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" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 1 - src/cpu_map/Makefile.inc.am | 78 ------------------------------------- src/cpu_map/meson.build | 75 +++++++++++++++++++++++++++++++++++ src/meson.build | 2 + 4 files changed, 77 insertions(+), 79 deletions(-) delete mode 100644 src/cpu_map/Makefile.inc.am create mode 100644 src/cpu_map/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index b83a087b716..e727ad32944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,7 +67,6 @@ COMMON_UNIT_VARS =3D \ lib_LTLIBRARIES +=3D libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am -include cpu_map/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am deleted file mode 100644 index d3ccb880733..00000000000 --- a/src/cpu_map/Makefile.inc.am +++ /dev/null @@ -1,78 +0,0 @@ -# vim: filetype=3Dautomake - -cpumapdir =3D $(pkgdatadir)/cpu_map -cpumap_DATA =3D \ - cpu_map/arm_cortex-a53.xml \ - cpu_map/arm_cortex-a57.xml \ - cpu_map/arm_cortex-a72.xml \ - cpu_map/arm_features.xml \ - cpu_map/arm_Kunpeng-920.xml \ - cpu_map/arm_ThunderX299xx.xml \ - cpu_map/arm_Falkor.xml \ - cpu_map/arm_vendors.xml \ - cpu_map/index.xml \ - cpu_map/ppc64_vendors.xml \ - cpu_map/ppc64_POWER7.xml \ - cpu_map/ppc64_POWER9.xml \ - cpu_map/ppc64_POWERPC_e6500.xml \ - cpu_map/ppc64_POWER6.xml \ - cpu_map/ppc64_POWER8.xml \ - cpu_map/ppc64_POWERPC_e5500.xml \ - cpu_map/x86_features.xml \ - cpu_map/x86_vendors.xml \ - cpu_map/x86_486.xml \ - cpu_map/x86_athlon.xml \ - cpu_map/x86_Broadwell.xml \ - cpu_map/x86_Broadwell-IBRS.xml \ - cpu_map/x86_Broadwell-noTSX.xml \ - cpu_map/x86_Broadwell-noTSX-IBRS.xml \ - cpu_map/x86_Cascadelake-Server.xml \ - cpu_map/x86_Cascadelake-Server-noTSX.xml \ - cpu_map/x86_Conroe.xml \ - cpu_map/x86_Cooperlake.xml \ - cpu_map/x86_core2duo.xml \ - cpu_map/x86_coreduo.xml \ - cpu_map/x86_cpu64-rhel5.xml \ - cpu_map/x86_cpu64-rhel6.xml \ - cpu_map/x86_Dhyana.xml \ - cpu_map/x86_EPYC.xml \ - cpu_map/x86_EPYC-IBPB.xml \ - cpu_map/x86_Haswell.xml \ - cpu_map/x86_Haswell-IBRS.xml \ - cpu_map/x86_Haswell-noTSX.xml \ - cpu_map/x86_Haswell-noTSX-IBRS.xml \ - cpu_map/x86_Icelake-Client.xml \ - cpu_map/x86_Icelake-Client-noTSX.xml \ - cpu_map/x86_Icelake-Server.xml \ - cpu_map/x86_Icelake-Server-noTSX.xml \ - cpu_map/x86_IvyBridge.xml \ - cpu_map/x86_IvyBridge-IBRS.xml \ - cpu_map/x86_kvm32.xml \ - cpu_map/x86_kvm64.xml \ - cpu_map/x86_n270.xml \ - cpu_map/x86_Nehalem.xml \ - cpu_map/x86_Nehalem-IBRS.xml \ - cpu_map/x86_Opteron_G1.xml \ - cpu_map/x86_Opteron_G2.xml \ - cpu_map/x86_Opteron_G3.xml \ - cpu_map/x86_Opteron_G4.xml \ - cpu_map/x86_Opteron_G5.xml \ - cpu_map/x86_Penryn.xml \ - cpu_map/x86_pentium.xml \ - cpu_map/x86_pentium2.xml \ - cpu_map/x86_pentium3.xml \ - cpu_map/x86_pentiumpro.xml \ - cpu_map/x86_phenom.xml \ - cpu_map/x86_qemu32.xml \ - cpu_map/x86_qemu64.xml \ - cpu_map/x86_SandyBridge.xml \ - cpu_map/x86_SandyBridge-IBRS.xml \ - cpu_map/x86_Skylake-Client.xml \ - cpu_map/x86_Skylake-Client-IBRS.xml \ - cpu_map/x86_Skylake-Client-noTSX-IBRS.xml \ - cpu_map/x86_Skylake-Server.xml \ - cpu_map/x86_Skylake-Server-IBRS.xml \ - cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \ - cpu_map/x86_Westmere.xml \ - cpu_map/x86_Westmere-IBRS.xml \ - $(NULL) diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build new file mode 100644 index 00000000000..d89106dfcbd --- /dev/null +++ b/src/cpu_map/meson.build @@ -0,0 +1,75 @@ +cpumap_data =3D [ + 'arm_cortex-a53.xml', + 'arm_cortex-a57.xml', + 'arm_cortex-a72.xml', + 'arm_Falkor.xml', + 'arm_features.xml', + 'arm_Kunpeng-920.xml', + 'arm_ThunderX299xx.xml', + 'arm_vendors.xml', + 'index.xml', + 'ppc64_POWER6.xml', + 'ppc64_POWER7.xml', + 'ppc64_POWER8.xml', + 'ppc64_POWER9.xml', + 'ppc64_POWERPC_e5500.xml', + 'ppc64_POWERPC_e6500.xml', + 'ppc64_vendors.xml', + 'x86_486.xml', + 'x86_athlon.xml', + 'x86_Broadwell-IBRS.xml', + 'x86_Broadwell-noTSX-IBRS.xml', + 'x86_Broadwell-noTSX.xml', + 'x86_Broadwell.xml', + 'x86_Cascadelake-Server.xml', + 'x86_Conroe.xml', + 'x86_Cooperlake.xml', + 'x86_core2duo.xml', + 'x86_coreduo.xml', + 'x86_cpu64-rhel5.xml', + 'x86_cpu64-rhel6.xml', + 'x86_EPYC-IBPB.xml', + 'x86_EPYC.xml', + 'x86_features.xml', + 'x86_Haswell-IBRS.xml', + 'x86_Haswell-noTSX-IBRS.xml', + 'x86_Haswell-noTSX.xml', + 'x86_Haswell.xml', + 'x86_Icelake-Client-noTSX.xml', + 'x86_Icelake-Client.xml', + 'x86_Icelake-Server-noTSX.xml', + 'x86_Icelake-Server.xml', + 'x86_IvyBridge-IBRS.xml', + 'x86_IvyBridge.xml', + 'x86_kvm32.xml', + 'x86_kvm64.xml', + 'x86_n270.xml', + 'x86_Nehalem-IBRS.xml', + 'x86_Nehalem.xml', + 'x86_Opteron_G1.xml', + 'x86_Opteron_G2.xml', + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', + 'x86_Penryn.xml', + 'x86_pentium.xml', + 'x86_pentium2.xml', + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', + 'x86_phenom.xml', + 'x86_qemu32.xml', + 'x86_qemu64.xml', + 'x86_SandyBridge-IBRS.xml', + 'x86_SandyBridge.xml', + 'x86_Skylake-Client-IBRS.xml', + 'x86_Skylake-Client-noTSX-IBRS.xml', + 'x86_Skylake-Client.xml', + 'x86_Skylake-Server-IBRS.xml', + 'x86_Skylake-Server-noTSX-IBRS.xml', + 'x86_Skylake-Server.xml', + 'x86_vendors.xml', + 'x86_Westmere-IBRS.xml', + 'x86_Westmere.xml', +] + +install_data(cpumap_data, install_dir: pkgdatadir / 'cpu_map') diff --git a/src/meson.build b/src/meson.build index b6b9da32df6..748bb7a9914 100644 --- a/src/meson.build +++ b/src/meson.build @@ -121,6 +121,8 @@ libvirt_libs =3D [] =20 # list subdirectories =20 +subdir('cpu_map') + subdir('util') =20 src_dep =3D declare_dependency( --=20 2.26.2