From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2fik-0001TI-MT for qemu-devel@nongnu.org; Thu, 12 Oct 2017 11:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2fig-0007Sc-Mp for qemu-devel@nongnu.org; Thu, 12 Oct 2017 11:48:26 -0400 From: Igor Mammedov Date: Thu, 12 Oct 2017 17:48:19 +0200 Message-Id: <1507823299-270245-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1507578671-158758-15-git-send-email-imammedo@redhat.com> References: <1507578671-158758-15-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 14/24] fixup! ppc: spapr: use cpu type name directly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, agraf@suse.de, david@gibson.dropbear.id.au, groug@kaod.org follow up commit that registers host-spapr-cpu-core type unconditionally "ppc: spapr: register 'host' core type along with the rest of core types" makes 'non' machine crash ppc64-softmmu/qemu-system-ppc64 -M none -device host-spapr-cpu-core ERROR:qom/object.c:217:object_type_get_instance_size: assertion failed: (type != NULL) Aborted before it qemu fails cleanly with ppc64-softmmu/qemu-system-ppc64 -M none -device host-spapr-cpu-core qemu-system-ppc64: -device host-spapr-cpu-core: 'host-spapr-cpu-core' is not a valid device model name spapr_cpu_core_realize() already has explicit check for pseries machine, so move access to host cpu type after it so 'none' machine would fail cleanly as expected. Reported-by: Greg Kurz Signed-off-by: Igor Mammedov --- hw/ppc/spapr_cpu_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index b5bbb6a..7dbf9c3 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -151,7 +151,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); CPUCore *cc = CPU_CORE(OBJECT(dev)); - size_t size = object_type_get_instance_size(scc->cpu_type); + size_t size; Error *local_err = NULL; void *obj; int i, j; @@ -162,6 +162,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) return; } + size = object_type_get_instance_size(scc->cpu_type); sc->threads = g_malloc0(size * cc->nr_threads); for (i = 0; i < cc->nr_threads; i++) { char id[32]; -- 2.7.4