| Message ID | 1507823114-270153-1-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | fixup! ppc: spapr: use cpu type name directly | expand |
On Thu, Oct 12, 2017 at 05:45:14PM +0200, Igor Mammedov wrote: > 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 <groug@kaod.org> > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Applied (folded into the original patch). > --- > 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];
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];
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 <groug@kaod.org> Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/ppc/spapr_cpu_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)