CCing H. Peter Anvin. (Sorry, I thought git-send-email was configured to CC everybody mentioned in the SoB lines).
On Thu, Apr 25, 2013 at 03:43:05PM -0300, Eduardo Habkost wrote: > This changes the model number of 486 to 8 (DX4) which matches the > feature set presented, and actually has the CPUID instruction. > > This adds compatibility calls to the pc-1.4 init function, to keep > model=0 on pc-1.4 and older. > > Signed-off-by: H. Peter Anvin <h...@zytor.com> > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > This patch contains a chunk from a larger patch, sent by H. Peter Anvin > at: > Message-Id: <1362017554-1260-1-git-send-email-...@zytor.com> > http://marc.info/?l=qemu-devel&m=136202143002609 > > I hope I'm doing the right thing by keeping hpa's signed-off-by line. > --- > hw/i386/pc_piix.c | 1 + > hw/i386/pc_q35.c | 1 + > target-i386/cpu.c | 2 +- > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 615d8f4..9372f77 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -238,6 +238,7 @@ static void pc_init_pci(QEMUMachineInitArgs *args) > static void pc_init_pci_1_4(QEMUMachineInitArgs *args) > { > x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); > + x86_cpu_compat_set_model("486", 0); > pc_init_pci(args); > } > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 3240203..fc566fd 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -212,6 +212,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) > static void pc_q35_init_1_4(QEMUMachineInitArgs *args) > { > x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); > + x86_cpu_compat_set_model("486", 0); > pc_q35_init(args); > } > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 592fed8..4fc7527 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -587,7 +587,7 @@ static x86_def_t builtin_x86_defs[] = { > .level = 1, > .vendor = CPUID_VENDOR_INTEL, > .family = 4, > - .model = 0, > + .model = 8, > .stepping = 0, > .features[FEAT_1_EDX] = > I486_FEATURES, > -- > 1.8.1.4 > -- Eduardo
