From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK4kF-0002Lr-Vk for qemu-devel@nongnu.org; Mon, 04 Jul 2016 10:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bK4kC-0006jP-NW for qemu-devel@nongnu.org; Mon, 04 Jul 2016 10:21:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK4kC-0006jE-HZ for qemu-devel@nongnu.org; Mon, 04 Jul 2016 10:21:04 -0400 Date: Mon, 4 Jul 2016 17:20:59 +0300 From: "Michael S. Tsirkin" Message-ID: <20160704172010-mutt-send-email-mst@redhat.com> References: <1466784366-281935-1-git-send-email-imammedo@redhat.com> <1466784366-281935-16-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1466784366-281935-16-git-send-email-imammedo@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 15/18] target-i386: do not ignore error and fix apic parent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, eblake@redhat.com, pkrempa@redhat.com, marcel@redhat.com On Fri, Jun 24, 2016 at 06:06:03PM +0200, Igor Mammedov wrote: > object_property_add_child() silently fails with error that it can't > create duplicate propery 'apic' as we already have 'apic' property I thought that one was 'apic-id'? > registered for AIPC ID. APIC > As result generic device_realize puts > apic as into unattached container. > > As it's programming error, abort on it 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); > -- > 1.8.3.1