[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH] spapr_cpu_core: fail gracefully with non-pseries mach
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH] spapr_cpu_core: fail gracefully with non-pseries machine types |
Date: |
Mon, 11 Sep 2017 22:52:06 +0200 |
User-agent: |
StGit/0.17.1-46-g6855-dirty |
Since commit 7cca3e466eb0 ("ppc: spapr: Move VCPU ID calculation into
sPAPR"), QEMU aborts when started with a *-spapr-cpu-core device and
a non-pseries machine.
Let's rely on the already existing call to object_dynamic_cast() instead
of using the SPAPR_MACHINE() macro.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/ppc/spapr_cpu_core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index d04d1e0d8164..dc9df0d393d1 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -201,7 +201,7 @@ error:
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
{
- sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
+ sPAPRMachineState *spapr;
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
CPUCore *cc = CPU_CORE(OBJECT(dev));
@@ -211,7 +211,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error
**errp)
void *obj;
int i, j;
- if (!object_dynamic_cast(qdev_get_machine(), TYPE_SPAPR_MACHINE)) {
+ spapr = (sPAPRMachineState *) qdev_get_machine();
+ if (!object_dynamic_cast((Object *) spapr, TYPE_SPAPR_MACHINE)) {
error_setg(errp, "spapr-cpu-core needs a pseries machine");
return;
}
- [Qemu-ppc] [PATCH] spapr_cpu_core: fail gracefully with non-pseries machine types,
Greg Kurz <=