[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] spapr: remove extra type variable
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 2/6] spapr: remove extra type variable |
Date: |
Wed, 10 Aug 2016 15:45:37 +1000 |
From: Cédric Le Goater <address@hidden>
The sPAPR CPU core typename is already available in the upper
block. Let's use it and move the check upward also.
Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 57564e5..399dcc0 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1815,6 +1815,11 @@ static void ppc_spapr_init(MachineState *machine)
if (mc->query_hotpluggable_cpus) {
char *type = spapr_get_cpu_core_type(machine->cpu_model);
+ if (!object_class_by_name(type)) {
+ error_report("Unable to find sPAPR CPU Core definition");
+ exit(1);
+ }
+
spapr->cores = g_new0(Object *, spapr_max_cores);
for (i = 0; i < spapr_max_cores; i++) {
int core_id = i * smp_threads;
@@ -1826,15 +1831,7 @@ static void ppc_spapr_init(MachineState *machine)
qemu_register_reset(spapr_drc_reset, drc);
if (i < spapr_cores) {
- char *type = spapr_get_cpu_core_type(machine->cpu_model);
- Object *core;
-
- if (!object_class_by_name(type)) {
- error_report("Unable to find sPAPR CPU Core definition");
- exit(1);
- }
-
- core = object_new(type);
+ Object *core = object_new(type);
object_property_set_int(core, smp_threads, "nr-threads",
&error_fatal);
object_property_set_int(core, core_id, CPU_CORE_PROP_CORE_ID,
--
2.7.4
- [Qemu-devel] [PULL 0/6] ppc-for-2.7 queue 20160810, David Gibson, 2016/08/10
- [Qemu-devel] [PULL 1/6] ppc64: fix compressed dump with pseries kernel, David Gibson, 2016/08/10
- [Qemu-devel] [PULL 4/6] hw/ppc/spapr: Look up CPU alias names instead of hard-coding the aliases, David Gibson, 2016/08/10
- [Qemu-devel] [PULL 6/6] ppc/kvm: Register also a generic spapr CPU core family type, David Gibson, 2016/08/10
- [Qemu-devel] [PULL 3/6] ppc: Introduce a function to look up CPU alias strings, David Gibson, 2016/08/10
- [Qemu-devel] [PULL 2/6] spapr: remove extra type variable,
David Gibson <=
- [Qemu-devel] [PULL 5/6] ppc/kvm: Do not mess up the generic CPU family registration, David Gibson, 2016/08/10
- Re: [Qemu-devel] [PULL 0/6] ppc-for-2.7 queue 20160810, Peter Maydell, 2016/08/10