[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 14/24] fixup! ppc: spapr: use cpu type name directl
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH v2 14/24] fixup! ppc: spapr: use cpu type name directly |
Date: |
Thu, 12 Oct 2017 17:48:19 +0200 |
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 <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
---
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
- [Qemu-ppc] [PATCH v2 13/24] ppc: spapr: define core types statically, (continued)
Re: [Qemu-ppc] [Qemu-devel] [PATCH v2 13/24] ppc: spapr: define core types statically, Philippe Mathieu-Daudé, 2017/10/11
[Qemu-ppc] [PATCH v2 15/24] ppc: spapr: register 'host' core type along with the rest of core types, Igor Mammedov, 2017/10/09
[Qemu-ppc] [PATCH v2 14/24] ppc: spapr: use cpu type name directly, Igor Mammedov, 2017/10/09
- [Qemu-ppc] [PATCH v2 14/24] fixup! ppc: spapr: use cpu type name directly,
Igor Mammedov <=
[Qemu-ppc] [PATCH v2 16/24] ppc: spapr: use cpu model names as tcg defaults instead of aliases, Igor Mammedov, 2017/10/09
[Qemu-ppc] [PATCH v2 17/24] ppc: move ppc_cpu_lookup_alias() before its first user, Igor Mammedov, 2017/10/09
[Qemu-ppc] [PATCH v2 19/24] ppc: pnv: use generic cpu_model parsing, Igor Mammedov, 2017/10/09
[Qemu-ppc] [PATCH v2 18/24] ppc: spapr: use generic cpu_model parsing, Igor Mammedov, 2017/10/09