From nobody Thu Nov 6 20:35:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487747788965619.459134261667; Tue, 21 Feb 2017 23:16:28 -0800 (PST) Received: from localhost ([::1]:50362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgRA1-0003Wz-Ej for importer@patchew.org; Wed, 22 Feb 2017 02:16:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgQVE-0003Bb-Bm for qemu-devel@nongnu.org; Wed, 22 Feb 2017 01:34:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgQVB-0008De-IL for qemu-devel@nongnu.org; Wed, 22 Feb 2017 01:34:16 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:44811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgQVB-00089m-04; Wed, 22 Feb 2017 01:34:13 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vSndM2WtYz9sNK; Wed, 22 Feb 2017 17:33:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1487745239; bh=e+W7bc4DyjEgWIwhfS+yXsbOzWyGzqNfiU+DVO0XSCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZqYbLpP4P9n526zWN49rb+yZw5UQzxFsvngxh4N6H/jElrZgH6VJY/WlH17ZW7E6j ATa2XywcT9/gLk8n+X5TMF3WsiqwKZil7RswmrF8J/TkeDTC4vfR5qL3+2/shk9wUt SmZooYpFBXtv5T1aRhYSKAOgnaU16HxQSytRzCZY= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 22 Feb 2017 17:33:41 +1100 Message-Id: <20170222063348.32176-37-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170222063348.32176-1-david@gibson.dropbear.id.au> References: <20170222063348.32176-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 36/43] change CPUArchId.cpu type to Object* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov so it could be reused for SPAPR cores as well Signed-off-by: Igor Mammedov Signed-off-by: David Gibson --- hw/acpi/cpu.c | 2 +- hw/i386/pc.c | 8 ++++---- include/hw/boards.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 6017ca0..8c719d3 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -198,7 +198,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owne= r, state->dev_count =3D id_list->len; state->devs =3D g_new0(typeof(*state->devs), state->dev_count); for (i =3D 0; i < id_list->len; i++) { - state->devs[i].cpu =3D id_list->cpus[i].cpu; + state->devs[i].cpu =3D CPU(id_list->cpus[i].cpu); state->devs[i].arch_id =3D id_list->cpus[i].arch_id; } memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3475174..138022d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1830,7 +1830,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev, } =20 found_cpu =3D pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL); - found_cpu->cpu =3D CPU(dev); + found_cpu->cpu =3D OBJECT(dev); out: error_propagate(errp, local_err); } @@ -2288,13 +2288,13 @@ static const CPUArchIdList *pc_possible_cpu_arch_id= s(MachineState *ms) static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machi= ne) { int i; - CPUState *cpu; + Object *cpu; HotpluggableCPUList *head =3D NULL; const char *cpu_type; =20 cpu =3D machine->possible_cpus->cpus[0].cpu; assert(cpu); /* BSP is always present */ - cpu_type =3D object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu))); + cpu_type =3D object_get_typename(cpu); =20 for (i =3D 0; i < machine->possible_cpus->len; i++) { HotpluggableCPUList *list_item =3D g_new0(typeof(*list_item), 1); @@ -2308,7 +2308,7 @@ static HotpluggableCPUList *pc_query_hotpluggable_cpu= s(MachineState *machine) cpu =3D machine->possible_cpus->cpus[i].cpu; if (cpu) { cpu_item->has_qom_path =3D true; - cpu_item->qom_path =3D object_get_canonical_path(OBJECT(cpu)); + cpu_item->qom_path =3D object_get_canonical_path(cpu); } =20 list_item->value =3D cpu_item; diff --git a/include/hw/boards.h b/include/hw/boards.h index 4023b38..60209df 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -51,7 +51,7 @@ void machine_register_compat_props(MachineState *machine); typedef struct { uint64_t arch_id; CpuInstanceProperties props; - struct CPUState *cpu; + Object *cpu; } CPUArchId; =20 /** --=20 2.9.3