[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/19] target-i386: cpu: do not ignore error and
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v3 16/19] target-i386: cpu: do not ignore error and fix apic parent |
Date: |
Wed, 6 Jul 2016 08:20:52 +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>
---
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
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), (continued)
- [Qemu-devel] [PATCH v3 13/19] apic: drop APICCommonState.idx and use APIC ID as index in local_apics[], Igor Mammedov, 2016/07/06
- [Qemu-devel] [PATCH v3 14/19] (kvm)apic: add unrealize callbacks, Igor Mammedov, 2016/07/06
- [Qemu-devel] [PATCH v3 15/19] apic: use apic_id as apic's migration instance_id, Igor Mammedov, 2016/07/06
- [Qemu-devel] [PATCH v3 16/19] target-i386: cpu: do not ignore error and fix apic parent,
Igor Mammedov <=
- [Qemu-devel] [PATCH v3 17/19] target-i386: fix apic object leak when CPU is deleted, Igor Mammedov, 2016/07/06
Re: [Qemu-devel] [PATCH v3 17/19] target-i386: fix apic object leak when CPU is deleted, Bandan Das, 2016/07/13
[Qemu-devel] [PATCH v3 18/19] target-i386: add x86_cpu_unrealizefn(), Igor Mammedov, 2016/07/06