From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPt7l-0005Rq-Ec for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPt7g-0004F1-Jo for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPt7g-0004Ex-Di for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:20 -0400 From: Eduardo Habkost Date: Wed, 20 Jul 2016 12:08:19 -0300 Message-Id: <1469027314-31655-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1469027314-31655-1-git-send-email-ehabkost@redhat.com> References: <1469027314-31655-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 13/28] target-i386: cpu: Do not ignore error and fix apic parent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org, Igor Mammedov From: Igor Mammedov object_property_add_child() silently fails with error that it can't create duplicate propery 'apic' as we already have 'apic' property registered for 'apic' feature. As result generic device_realize puts apic into unattached container. As it's programming error, abort if name collision happens in future and fix property name for apic_state to 'lapic', this way apic is a child of cpu instance. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- 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 c36441d..6c36b13 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2826,8 +2826,9 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) cpu->apic_state = DEVICE(object_new(apic_type)); - object_property_add_child(OBJECT(cpu), "apic", - OBJECT(cpu->apic_state), NULL); + object_property_add_child(OBJECT(cpu), "lapic", + OBJECT(cpu->apic_state), &error_abort); + qdev_prop_set_uint8(cpu->apic_state, "id", cpu->apic_id); /* TODO: convert to link<> */ apic = APIC_COMMON(cpu->apic_state); -- 2.5.5