Message ID | 1355220666-31722-4-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Dec 11, 2012 at 11:11:03AM +0100, Igor Mammedov wrote: > it will help to get rid of setting default. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 27 +++++++++++++++++++++++++++ > 1 files changed, 27 insertions(+), 0 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 64b7637..1497980 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -387,6 +387,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "core2duo", > .level = 10, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 15, > .stepping = 11, > @@ -431,6 +434,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "qemu32", > .level = 4, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 3, > .stepping = 3, > @@ -441,6 +447,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "kvm32", > .level = 5, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 15, > .model = 6, > .stepping = 1, > @@ -455,6 +464,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "coreduo", > .level = 10, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 14, > .stepping = 8, > @@ -470,6 +482,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "486", > .level = 1, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 4, > .model = 0, > .stepping = 0, > @@ -479,6 +494,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "pentium", > .level = 1, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 5, > .model = 4, > .stepping = 3, > @@ -488,6 +506,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "pentium2", > .level = 2, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 5, > .stepping = 2, > @@ -497,6 +518,9 @@ static x86_def_t builtin_x86_defs[] = { > { > .name = "pentium3", > .level = 2, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 7, > .stepping = 3, > @@ -522,6 +546,9 @@ static x86_def_t builtin_x86_defs[] = { > .name = "n270", > /* original is on level 10 */ > .level = 5, > + .vendor1 = CPUID_VENDOR_INTEL_1, > + .vendor2 = CPUID_VENDOR_INTEL_2, > + .vendor3 = CPUID_VENDOR_INTEL_3, > .family = 6, > .model = 28, > .stepping = 2, > -- > 1.7.1 >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 64b7637..1497980 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -387,6 +387,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "core2duo", .level = 10, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 15, .stepping = 11, @@ -431,6 +434,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "qemu32", .level = 4, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 3, .stepping = 3, @@ -441,6 +447,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "kvm32", .level = 5, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 15, .model = 6, .stepping = 1, @@ -455,6 +464,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "coreduo", .level = 10, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 14, .stepping = 8, @@ -470,6 +482,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "486", .level = 1, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 4, .model = 0, .stepping = 0, @@ -479,6 +494,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "pentium", .level = 1, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 5, .model = 4, .stepping = 3, @@ -488,6 +506,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "pentium2", .level = 2, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 5, .stepping = 2, @@ -497,6 +518,9 @@ static x86_def_t builtin_x86_defs[] = { { .name = "pentium3", .level = 2, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 7, .stepping = 3, @@ -522,6 +546,9 @@ static x86_def_t builtin_x86_defs[] = { .name = "n270", /* original is on level 10 */ .level = 5, + .vendor1 = CPUID_VENDOR_INTEL_1, + .vendor2 = CPUID_VENDOR_INTEL_2, + .vendor3 = CPUID_VENDOR_INTEL_3, .family = 6, .model = 28, .stepping = 2,
it will help to get rid of setting default. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)