From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQk8d-0007Aw-NW for qemu-devel@nongnu.org; Wed, 25 Feb 2015 17:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQk8Y-0000wM-Ni for qemu-devel@nongnu.org; Wed, 25 Feb 2015 17:09:03 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38388 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQk8Y-0000wG-Gz for qemu-devel@nongnu.org; Wed, 25 Feb 2015 17:08:58 -0500 Message-ID: <54EE47F8.3060001@suse.de> Date: Wed, 25 Feb 2015 23:08:56 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1424894306-26740-1-git-send-email-ehabkost@redhat.com> <1424894306-26740-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1424894306-26740-6-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 05/11] target-i386: Eliminate cpu_init() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , Peter Maydell , Paolo Bonzini Cc: qemu-devel@nongnu.org Am 25.02.2015 um 20:58 schrieb Eduardo Habkost: > Instead of putting extra logic inside cpu.h, just do everything inside > cpu_x86_init_user(). >=20 > Reviewed-by: Paolo Bonzini > Signed-off-by: Eduardo Habkost > --- > target-i386/cpu.c | 6 +++--- > target-i386/cpu.h | 12 +++--------- > 2 files changed, 6 insertions(+), 12 deletions(-) >=20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 8f18556..aee4d3e 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2135,7 +2135,7 @@ out: > return cpu; > } > =20 > -X86CPU *cpu_x86_init_user(const char *cpu_model) > +CPUX86State *cpu_x86_init_user(const char *cpu_model) > { > Error *error =3D NULL; > X86CPU *cpu; > @@ -2153,10 +2153,10 @@ out: > error_free(error); > if (cpu !=3D NULL) { > object_unref(OBJECT(cpu)); > - cpu =3D NULL; > } > + return NULL; > } > - return cpu; > + return &cpu->env; > } > =20 > static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) > diff --git a/target-i386/cpu.h b/target-i386/cpu.h > index 41d7f0a..d5bd74e 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -982,7 +982,6 @@ typedef struct CPUX86State { > =20 > #include "cpu-qom.h" > =20 > -X86CPU *cpu_x86_init_user(const char *cpu_model); > X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, > Error **errp); > int cpu_x86_exec(CPUX86State *s); > @@ -1171,14 +1170,9 @@ uint64_t cpu_get_tsc(CPUX86State *env); > # define PHYS_ADDR_MASK 0xfffffffffLL > # endif > =20 > -static inline CPUX86State *cpu_init(const char *cpu_model) > -{ > - X86CPU *cpu =3D cpu_x86_init_user(cpu_model); > - if (cpu =3D=3D NULL) { > - return NULL; > - } > - return &cpu->env; > -} > +/* CPU creation function for *-user */ > +CPUX86State *cpu_x86_init_user(const char *cpu_model); > +#define cpu_init cpu_x86_init_user The very purpose of this lightweight glue code in cpu.h was to let us use X86CPU in cpu.c. It seems that you are needlessly reverting my change= ? Andreas > =20 > #define cpu_exec cpu_x86_exec > #define cpu_gen_code cpu_x86_gen_code >=20 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG N=FCrnberg)