From 788e8ad69b09d1005dc916aec90bfbffb486af9a Mon Sep 17 00:00:00 2001
From: NAO NISHIJIMA <nao.nishijima.xt@hitachi.com>
Date: Mon, 7 Dec 2015 11:50:42 +0900
Subject: [PATCH] Add missing CPU features to Glance Metadata Catalog

This patch adds missing CPU features to Glance Metadata Catalog.
CPU features based on linux v4.4-rc4 kernel source code in
arch/x86/include/asm/cpufeature.h and picked up Intel&AMD vender.

Change-Id: I8c622172dbc1f7d80e606278064bea6f5bcb4c8f
Closes-Bug: #1409071
---
 etc/metadefs/compute-host-capabilities.json | 112 +++++++++++++++++++-
 1 file changed, 110 insertions(+), 2 deletions(-)

diff --git a/etc/metadefs/compute-host-capabilities.json b/etc/metadefs/compute-host-capabilities.json
index e09de35563..6e7b768df9 100644
--- a/etc/metadefs/compute-host-capabilities.json
+++ b/etc/metadefs/compute-host-capabilities.json
@@ -107,7 +107,7 @@
             "items": {
                 "type": "string",
                 "enum": [
-                    "aes",
+                    "fpu",
                     "vme",
                     "de",
                     "pse",
@@ -124,6 +124,7 @@
                     "cmov",
                     "pat",
                     "pse36",
+                    "pn",
                     "clflush",
                     "dts",
                     "acpi",
@@ -136,7 +137,29 @@
                     "tm",
                     "ia64",
                     "pbe",
+                    "syscall",
+                    "mp",
+                    "nx",
+                    "mmxext",
+                    "fxsr_opt",
+                    "pdpe1gb",
                     "rdtscp",
+                    "lm",
+                    "3dnowext",
+                    "3dnow",
+                    "arch_perfmon",
+                    "pebs",
+                    "bts",
+                    "rep_good",
+                    "nopl",
+                    "xtopology",
+                    "tsc_reliable",
+                    "nonstop_tsc",
+                    "extd_apicid",
+                    "amd_dcm",
+                    "aperfmperf",
+                    "eagerfpu",
+                    "nonstop_tsc_s3",
                     "pni",
                     "pclmulqdq",
                     "dtes64",
@@ -160,11 +183,80 @@
                     "movbe",
                     "popcnt",
                     "tsc_deadline_timer",
+                    "aes",
                     "xsave",
                     "avx",
                     "f16c",
                     "rdrand",
+                    "hypervisor",
+                    "rng",
+                    "rng_en",
+                    "ace",
+                    "ace_en",
+                    "ace2",
+                    "ace2_en",
+                    "phe",
+                    "phe_en",
+                    "pmm",
+                    "pmm_en",
+                    "lahf_lm",
+                    "cmp_legacy",
+                    "svm",
+                    "extapic",
+                    "cr8_legacy",
+                    "abm",
+                    "sse4a",
+                    "misalignsse",
+                    "3dnowprefetch",
+                    "osvw",
+                    "ibs",
+                    "xop",
+                    "skinit",
+                    "wdt",
+                    "lwp",
+                    "fma4",
+                    "tce",
+                    "nodeid_msr",
+                    "tbm",
+                    "topoext",
+                    "perfctr_core",
+                    "perfctr_nb",
+                    "bpext",
+                    "perfctr_l2",
+                    "mwaitx",
+                    "ida",
+                    "arat",
+                    "cpb",
+                    "epb",
+                    "pln",
+                    "pts",
+                    "dtherm",
+                    "hw_pstate",
+                    "proc_feedback",
+                    "hwp",
+                    "hwp_notify",
+                    "hwp_act_window",
+                    "hwp_epp",
+                    "hwp_pkg_req",
+                    "intel_pt",
+                    "tpr_shadow",
+                    "vnmi",
+                    "flexpriority",
+                    "ept",
+                    "vpid",
+                    "npt",
+                    "lbrv",
+                    "svm_lock",
+                    "nrip_save",
+                    "tsc_scale",
+                    "vmcb_clean",
+                    "flushbyasid",
+                    "decodeassists",
+                    "pausefilter",
+                    "pfthreshold",
+                    "vmmcall",
                     "fsgsbase",
+                    "tsc_adjust",
                     "bmi1",
                     "hle",
                     "avx2",
@@ -173,10 +265,26 @@
                     "erms",
                     "invpcid",
                     "rtm",
+                    "cqm",
                     "mpx",
+                    "avx512f",
                     "rdseed",
                     "adx",
-                    "smap"
+                    "smap",
+                    "pcommit",
+                    "clflushopt",
+                    "clwb",
+                    "avx512pf",
+                    "avx512er",
+                    "avx512cd",
+                    "sha_ni",
+                    "xsaveopt",
+                    "xsavec",
+                    "xgetbv1",
+                    "xsaves",
+                    "cqm_llc",
+                    "cqm_occup_llc",
+                    "clzero"
                 ]
             }
         }