From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th2fC-0006GE-N1 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th2fB-0004TD-Dk for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:28:42 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38816 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th2fB-0004T7-7I for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:28:41 -0500 Message-ID: <50C23555.7030504@suse.de> Date: Fri, 07 Dec 2012 19:28:37 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <20121207180031.GJ4986@otherpad.lan.raisama.net> In-Reply-To: <20121207180031.GJ4986@otherpad.lan.raisama.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] target-i386: Postpone cpuid_level update to realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Igor Mammedov , qemu-devel@nongnu.org Am 07.12.2012 19:00, schrieb Eduardo Habkost: > From: Igor Mammedov >=20 > Delay capping cpuid_level to 7 to realize time so property setters > for cpuid_7_0_ebx_features and "level" could be used in any order/time > between x86_cpu_initfn() and x86_cpu_realize(). >=20 > Signed-off-by: Igor Mammedov > Reviewed-by: Eduardo Habkost > Signed-off-by: Eduardo Habkost > --- > The patch in the pull request sent by Andreas is not the right one (a > patch chunk is missing). I'm resending the correct patch. Igor's patch didn't apply cleanly despite --3way, seems one hunk got lost. Sorry! > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index a631ae9..7be3ad8 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c [...] > @@ -2074,6 +2071,11 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error= **errp) > void x86_cpu_realize(Object *obj, Error **errp) > { > X86CPU *cpu =3D X86_CPU(obj); > + CPUX86State *env =3D &cpu->env; > + > + if (env->cpuid_7_0_ebx_features && env->cpuid_level < 7) { > + env->cpuid_level =3D 7; > + } > =20 > #ifndef CONFIG_USER_ONLY > qemu_register_reset(x86_cpu_machine_reset_cb, cpu); I manually patch'ed in this missing hunk and made you a Signed-off-by. Pull was updated with new commit hash and stats already. Thanks, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg