From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXtS0-0002MF-8Q for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:30:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXtRr-0003ik-JC for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:30:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49770 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXtRr-0003iL-81 for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:30:27 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 17 Mar 2015 16:30:23 +0100 Message-Id: <1426606224-25380-4-git-send-email-afaerber@suse.de> In-Reply-To: <1426606224-25380-1-git-send-email-afaerber@suse.de> References: <1426606224-25380-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 3/3] target-i386: Remove icc_bridge parameter from cpu_x86_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Instead of passing icc_bridge from the PC initialization code to cpu_x86_create(), make the PC initialization code attach the CPU to icc_bridge. The only difference here is that icc_bridge attachment will now be done after x86_cpu_parse_featurestr() is called. But this shouldn't make any difference, as property setters shouldn't depend on icc_bridge. Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- hw/i386/pc.c | 16 ++++++++++++---- target-i386/cpu.c | 14 ++------------ target-i386/cpu.h | 3 +-- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 642105f..4b46c29 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -993,18 +993,26 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, i= nt level) static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, DeviceState *icc_bridge, Error **errp) { - X86CPU *cpu; + X86CPU *cpu =3D NULL; Error *local_err =3D NULL; =20 - cpu =3D cpu_x86_create(cpu_model, icc_bridge, &local_err); + if (icc_bridge =3D=3D NULL) { + error_setg(&local_err, "Invalid icc-bridge value"); + goto out; + } + + cpu =3D cpu_x86_create(cpu_model, &local_err); if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return NULL; + goto out; } =20 + qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc= ")); + object_unref(OBJECT(cpu)); + object_property_set_int(OBJECT(cpu), apic_id, "apic-id", &local_err)= ; object_property_set_bool(OBJECT(cpu), true, "realized", &local_err); =20 +out: if (local_err) { error_propagate(errp, local_err); object_unref(OBJECT(cpu)); diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ed7e5d5..f01690b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2076,8 +2076,7 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDef= inition *def, Error **errp) =20 } =20 -X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, - Error **errp) +X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) { X86CPU *cpu =3D NULL; X86CPUClass *xcc; @@ -2108,15 +2107,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Devi= ceState *icc_bridge, =20 cpu =3D X86_CPU(object_new(object_class_get_name(oc))); =20 -#ifndef CONFIG_USER_ONLY - if (icc_bridge =3D=3D NULL) { - error_setg(&error, "Invalid icc-bridge value"); - goto out; - } - qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc= ")); - object_unref(OBJECT(cpu)); -#endif - x86_cpu_parse_featurestr(CPU(cpu), features, &error); if (error) { goto out; @@ -2139,7 +2129,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) Error *error =3D NULL; X86CPU *cpu; =20 - cpu =3D cpu_x86_create(cpu_model, NULL, &error); + cpu =3D cpu_x86_create(cpu_model, &error); if (error) { goto out; } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e4c27b1..15db6d7 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -982,8 +982,7 @@ typedef struct CPUX86State { #include "cpu-qom.h" =20 X86CPU *cpu_x86_init(const char *cpu_model); -X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, - Error **errp); +X86CPU *cpu_x86_create(const char *cpu_model, Error **errp); int cpu_x86_exec(CPUX86State *s); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void); --=20 2.1.4