diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2017-01-19 19:04:45 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-02-27 13:23:03 -0300 |
| commit | f48c88370399b106ab7ae3fe26aa49f52bb57cce (patch) | |
| tree | 5d433b2d355068b633db7acb9a493b20856f2a06 /target/i386 | |
| parent | 771a13e90d24bc3db5ae102cf0da6f645eecf06c (diff) | |
i386: Add ordering field to CPUClass
Instead of using kvm_enabled to order the "-cpu help" list, use a
new "ordering" field for that.
Message-Id: <20170119210449.11991-3-ehabkost@redhat.com>
Tested-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target/i386')
| -rw-r--r-- | target/i386/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target/i386/cpu.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h index 8cd607e9a2..14abd0a8c1 100644 --- a/target/i386/cpu-qom.h +++ b/target/i386/cpu-qom.h @@ -48,6 +48,7 @@ typedef struct X86CPUDefinition X86CPUDefinition; * X86CPUClass: * @cpu_def: CPU model definition * @kvm_required: Whether CPU model requires KVM to be enabled. + * @ordering: Ordering on the "-cpu help" CPU model list. * @migration_safe: See CpuDefinitionInfo::migration_safe * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. @@ -63,6 +64,7 @@ typedef struct X86CPUClass { X86CPUDefinition *cpu_def; bool kvm_required; + int ordering; bool migration_safe; /* Optional description of CPU model. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2adee42035..8efe4de89e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1550,6 +1550,7 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data) uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0; xcc->kvm_required = true; + xcc->ordering = 9; host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx); x86_cpu_vendor_words2str(host_cpudef.vendor, ebx, edx, ecx); @@ -2126,7 +2127,7 @@ static void listflags(FILE *f, fprintf_function print, const char **featureset) } } -/* Sort alphabetically by type name, listing kvm_required models last. */ +/* Sort alphabetically by type name, respecting X86CPUClass::ordering. */ static gint x86_cpu_list_compare(gconstpointer a, gconstpointer b) { ObjectClass *class_a = (ObjectClass *)a; @@ -2135,9 +2136,8 @@ static gint x86_cpu_list_compare(gconstpointer a, gconstpointer b) X86CPUClass *cc_b = X86_CPU_CLASS(class_b); const char *name_a, *name_b; - if (cc_a->kvm_required != cc_b->kvm_required) { - /* kvm_required items go last */ - return cc_a->kvm_required ? 1 : -1; + if (cc_a->ordering != cc_b->ordering) { + return cc_a->ordering - cc_b->ordering; } else { name_a = object_class_get_name(class_a); name_b = object_class_get_name(class_b); |