Am 25.04.2013 20:43, schrieb Eduardo Habkost: > From: Borislav Petkov <b...@suse.de> > > The Atom core (cpu name "n270" in QEMU speak) supports MOVBE. This is > needed when booting 3.8 and later linux kernels built with the MATOM > target because we require MOVBE in order to boot properly now. > > Cc: "H. Peter Anvin" <h...@zytor.com> > Cc: Richard Henderson <r...@twiddle.net> > Signed-off-by: Borislav Petkov <b...@suse.de> > [ehabkost: added compat code to disable MOVBE on pc-*-1.4 and older] > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > hw/i386/pc_piix.c | 1 + > hw/i386/pc_q35.c | 1 + > target-i386/cpu.c | 3 ++- > 3 files changed, 4 insertions(+), 1 deletion(-)
Thanks, rebased and applied to qom-cpu: https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 20708dc..615d8f4 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -237,6 +237,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); > pc_init_pci(args); > } > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 7eb4a75..3240203 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -211,6 +211,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); > pc_q35_init(args); > } > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 8ce088e..592fed8 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -656,7 +656,8 @@ static x86_def_t builtin_x86_defs[] = { > /* Some CPUs got no CPUID_SEP */ > .features[FEAT_1_ECX] = > CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 | > - CPUID_EXT_DSCPL | CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR, > + CPUID_EXT_DSCPL | CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR > | > + CPUID_EXT_MOVBE, > .features[FEAT_8000_0001_EDX] = > (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) | > CPUID_EXT2_NX, > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
