From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXZZE-0003A2-2R for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXZZ8-00087W-PS for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32861 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXZZ8-00087P-Gn for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 1 May 2013 18:07:20 +0200 Message-Id: <1367424440-16687-5-git-send-email-afaerber@suse.de> In-Reply-To: <1367424440-16687-1-git-send-email-afaerber@suse.de> References: <1367424440-16687-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-cpu for-1.5 4/4] target-i386: Change CPUID model of 486 to 8 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, pbonzini@redhat.com, anthony@codemonkey.ws, "H. Peter Anvin" , imammedo@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= This changes the model number of 486 to 8 (DX4) which matches the feature set presented, and actually has the CPUID instruction. This adds a compatibility property, to keep model=3D0 on pc-*-1.4 and old= er. Signed-off-by: H. Peter Anvin Cc: Eduardo Habkost [AF: Add compat_props entry] Signed-off-by: Andreas F=C3=A4rber --- include/hw/i386/pc.h | 4 ++++ target-i386/cpu.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 41869e5..417afe4 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -242,6 +242,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .driver =3D "pc-sysfw",\ .property =3D "rom_only",\ .value =3D stringify(0),\ + },{\ + .driver =3D "486-" TYPE_X86_CPU,\ + .property =3D "model",\ + .value =3D stringify(0),\ } =20 #endif diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 8a9563b..f7d4d9b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -550,7 +550,7 @@ static x86_def_t builtin_x86_defs[] =3D { .level =3D 1, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 4, - .model =3D 0, + .model =3D 8, .stepping =3D 0, .features =3D I486_FEATURES, .xlevel =3D 0, --=20 1.8.1.4