Add Features to JSON output (#94)

.. and X64Level
klauspost · Feb 8, 2022 · a4e6a85 · a4e6a85
1 parent 1a69123
commit a4e6a85
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/cmd/cpuid/main.go b/cmd/cpuid/main.go
@@ -25,7 +25,16 @@ var js = flag.Bool("json", false, "Output as JSON")
 func main() {
 	flag.Parse()
 	if *js {
-		b, err := json.MarshalIndent(cpuid.CPU, "", "  ")
+		info := struct {
+			cpuid.CPUInfo
+			Features []string
+			X64Level int
+		}{
+			CPUInfo:  cpuid.CPU,
+			Features: cpuid.CPU.FeatureSet(),
+			X64Level: cpuid.CPU.X64Level(),
+		}
+		b, err := json.MarshalIndent(info, "", "  ")
 		if err != nil {
 			panic(err)
 		}