From patchwork Tue Apr 23 08:29:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 238803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62F1A2C015E for ; Tue, 23 Apr 2013 18:57:23 +1000 (EST) Received: from localhost ([::1]:47725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYhp-000078-Az for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 04:36:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYfG-0006PO-3r for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:33:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUYfE-0001u3-MT for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:33:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYfE-0001ts-CZ for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:33:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3N8XHuj009697 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Apr 2013 04:33:17 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3N8W6ja017193; Tue, 23 Apr 2013 04:33:13 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 23 Apr 2013 10:29:47 +0200 Message-Id: <1366705795-24732-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1366705795-24732-1-git-send-email-imammedo@redhat.com> References: <1366705795-24732-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, gleb@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, lcapitulino@redhat.com, blauwirbel@gmail.com, kraxel@redhat.com, quintela@redhat.com, armbru@redhat.com, yang.z.zhang@intel.com, ehabkost@redhat.com, stefano.stabellini@eu.citrix.com, aderumier@odiso.com, anthony.perard@citrix.com, alex.williamson@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, claudio.fontana@huawei.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 13/21] target-i386: cpu: attach ICC bus to CPU on its creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org X86CPU should have parent bus so it would be possible to unplug it later. Set bus_type to TYPE_ICC_BUS for X86CPU type to make device_add attach hotplugged CPU to ICC bus. Signed-off-by: Igor Mammedov --- v2: * make sure that missing or ambiguous icc-bus will cause error on softmmu target. --- target-i386/cpu.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 296ba58..8d3ad00 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -41,6 +41,7 @@ #endif #include "sysemu/sysemu.h" +#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/sysbus.h" @@ -1619,6 +1620,19 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) features = model_pieces[1]; cpu = X86_CPU(object_new(TYPE_X86_CPU)); +#ifndef CONFIG_USER_ONLY + do { + bool ambiguous = false; + Object *icc_bus = object_resolve_path_type("icc-bus", TYPE_ICC_BUS, + &ambiguous); + if ((icc_bus == NULL) || ambiguous) { + error_setg(&error, "Invalid icc-bus value"); + goto out; + } + qdev_set_parent_bus(DEVICE(cpu), BUS(icc_bus)); + object_unref(OBJECT(cpu)); + } while (0); +#endif env = &cpu->env; env->cpu_model_str = cpu_model; @@ -2330,6 +2344,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->bus_type = TYPE_ICC_BUS; xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset;