From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDb-0006mr-Hu for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKgDZ-0004VI-JP for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDZ-0004Ut-E4 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:53 -0400 From: Igor Mammedov Date: Wed, 6 Jul 2016 08:20:52 +0200 Message-Id: <1467786055-85835-17-git-send-email-imammedo@redhat.com> In-Reply-To: <1467786055-85835-1-git-send-email-imammedo@redhat.com> References: <1467786055-85835-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v3 16/19] target-i386: cpu: do not ignore error and fix apic parent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net 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 --- 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 ebf4140..04c0b79 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2763,8 +2763,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.7.0