From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3pR5-0001oV-2G for qemu-devel@nongnu.org; Mon, 29 Jul 2013 11:32:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3pQy-0001ET-Vx for qemu-devel@nongnu.org; Mon, 29 Jul 2013 11:32:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44582 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3pQy-0001EM-Q2 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 11:32:28 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 17:32:18 +0200 Message-Id: <1375111939-19577-3-git-send-email-afaerber@suse.de> In-Reply-To: <1375111939-19577-1-git-send-email-afaerber@suse.de> References: <1375111939-19577-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] [PULL for-1.6 2/3] target-i386: Pass X86CPU object to cpu_x86_find_by_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost This will help us change the initialization code to not require carrying some intermediate values in a x86_def_t struct (and eventually kill the x86_def_t struct entirely). Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index df2fb1b..80143bf 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1475,7 +1475,8 @@ static void x86_cpu_get_feature_words(Object *obj, = Visitor *v, void *opaque, error_propagate(errp, err); } =20 -static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name= ) +static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, + const char *name) { x86_def_t *def; int i; @@ -1742,7 +1743,7 @@ static void cpu_x86_register(X86CPU *cpu, const cha= r *name, Error **errp) =20 memset(def, 0, sizeof(*def)); =20 - if (cpu_x86_find_by_name(def, name) < 0) { + if (cpu_x86_find_by_name(cpu, def, name) < 0) { error_setg(errp, "Unable to find CPU definition: %s", name); return; } --=20 1.8.1.4