From 594cbeaa06b73c559898a0301898df7c86d79b80 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 26 Feb 2018 08:16:57 -0500
Subject: [PATCH] target-i386: List CPU models using subclass list

Instead of using the builtin_x86_defs array, use the QOM subclass
list to list CPU models on "-cpu ?" and "query-cpu-definitions".

Backports commit ee465a3ef77c2b2975ffa71c72208c05b3f3970d from qemu
---
 qemu/target-i386/cpu-qom.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qemu/target-i386/cpu-qom.h b/qemu/target-i386/cpu-qom.h
index e9f48663..c0d66c5c 100644
--- a/qemu/target-i386/cpu-qom.h
+++ b/qemu/target-i386/cpu-qom.h
@@ -63,6 +63,10 @@ typedef struct X86CPUClass {
 
     bool kvm_required;
 
+    /* Optional description of CPU model.
+     * If unavailable, cpu_def->model_id is used */
+    const char *model_description;
+
     DeviceRealize parent_realize;
     void (*parent_reset)(CPUState *cpu);
 } X86CPUClass;