[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/16] target-i386: cpu: do not ignore error and
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v4 13/16] target-i386: cpu: do not ignore error and fix apic parent |
Date: |
Thu, 14 Jul 2016 18:54:42 +0200 |
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 <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
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 c6d8704..fb528de 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2829,8 +2829,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.4
- Re: [Qemu-devel] [PATCH v4 05/16] pc: enforce adding CPUs contiguously and removing them in opposit order, (continued)
- [Qemu-devel] [PATCH v4 06/16] pc: cpu: allow device_add to be used with x86 cpu, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 07/16] pc: implement query-hotpluggable-cpus callback, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 09/16] apic: drop APICCommonState.idx and use APIC ID as index in local_apics[], Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 08/16] apic: move MAX_APICS check to 'apic' class, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 11/16] (kvm)apic: add unrealize callbacks, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 10/16] apic: kvm-apic: fix crash due to access to freed memory region, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 13/16] target-i386: cpu: do not ignore error and fix apic parent,
Igor Mammedov <=
- [Qemu-devel] [PATCH v4 12/16] apic: use apic_id as apic's migration instance_id, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 14/16] target-i386: fix apic object leak when CPU is deleted, Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 15/16] target-i386: add x86_cpu_unrealizefn(), Igor Mammedov, 2016/07/14
- [Qemu-devel] [PATCH v4 16/16] pc: make device_del CPU work for x86 CPUs, Igor Mammedov, 2016/07/14
- Re: [Qemu-devel] [PATCH v4 00/16] pc: add CPU hot-add/hot-remove with device_add/device_del, Michael S. Tsirkin, 2016/07/18