diff options
| author | Matthew Rosato | 2016-03-04 18:34:29 +0100 |
|---|---|---|
| committer | Cornelia Huck | 2016-03-10 10:37:15 +0100 |
| commit | d2eae20790e825656b205dbe347826ff991fb3d8 (patch) | |
| tree | feab08d5f041b3e54766bdc7762a8e982e051990 /hw/s390x/s390-virtio.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into st... (diff) | |
| download | qemu-d2eae20790e825656b205dbe347826ff991fb3d8.tar.gz qemu-d2eae20790e825656b205dbe347826ff991fb3d8.tar.xz qemu-d2eae20790e825656b205dbe347826ff991fb3d8.zip | |
s390x/cpu: Cleanup init in preparation for hotplug
Ensure a valid cpu_model is set upfront by setting the
default value directly into the MachineState when none is
specified. This is needed to ensure hotplugged CPUs share
the same cpu_model.
Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <1457112875-5209-2-git-send-email-mjrosato@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x/s390-virtio.c')
| -rw-r--r-- | hw/s390x/s390-virtio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 8e533ae88a..d40d0dc75d 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -93,12 +93,12 @@ void s390_init_ipl_dev(const char *kernel_filename, qdev_init_nofail(dev); } -void s390_init_cpus(const char *cpu_model) +void s390_init_cpus(MachineState *machine) { int i; - if (cpu_model == NULL) { - cpu_model = "host"; + if (machine->cpu_model == NULL) { + machine->cpu_model = "host"; } ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); @@ -107,7 +107,7 @@ void s390_init_cpus(const char *cpu_model) S390CPU *cpu; CPUState *cs; - cpu = cpu_s390x_init(cpu_model); + cpu = cpu_s390x_init(machine->cpu_model); cs = CPU(cpu); ipi_states[i] = cpu; |