falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eduardo Habkost 2017-01-19 19:04:45 -02:00
parent 771a13e90d
commit f48c883703
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/i386/cpu-qom.h
View File

@ -48,6 +48,7 @@ typedef struct X86CPUDefinition X86CPUDefinition;
* X86CPUClass: * X86CPUClass:
* @cpu_def: CPU model definition * @cpu_def: CPU model definition
* @kvm_required: Whether CPU model requires KVM to be enabled. * @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 * @migration_safe: See CpuDefinitionInfo::migration_safe
* @parent_realize: The parent class' realize handler. * @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler. * @parent_reset: The parent class' reset handler.
@ -63,6 +64,7 @@ typedef struct X86CPUClass {
X86CPUDefinition *cpu_def; X86CPUDefinition *cpu_def;
bool kvm_required; bool kvm_required;
int ordering;
bool migration_safe; bool migration_safe;
/* Optional description of CPU model. /* Optional description of CPU model.

8
target/i386/cpu.c
View File

@ -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; uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
xcc->kvm_required = true; xcc->kvm_required = true;
xcc->ordering = 9;
host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx); host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx);
x86_cpu_vendor_words2str(host_cpudef.vendor, ebx, edx, ecx); 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) static gint x86_cpu_list_compare(gconstpointer a, gconstpointer b)
{ {
ObjectClass *class_a = (ObjectClass *)a; 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); X86CPUClass *cc_b = X86_CPU_CLASS(class_b);
const char *name_a, *name_b; const char *name_a, *name_b;
if (cc_a->kvm_required != cc_b->kvm_required) { if (cc_a->ordering != cc_b->ordering) {
/* kvm_required items go last */ return cc_a->ordering - cc_b->ordering;
return cc_a->kvm_required ? 1 : -1;
} else { } else {
name_a = object_class_get_name(class_a); name_a = object_class_get_name(class_a);
name_b = object_class_get_name(class_b); name_b = object_class_get_name(class_b);