mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/cpu: Cleanup init in preparation for hotplug

Browse Source 
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>
This commit is contained in:
Matthew Rosato 2016-03-04 12:34:29 -05:00 committed by Cornelia Huck
parent a648c13738
commit d2eae20790
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-virtio-ccw.c
View File

@ -136,7 +136,7 @@ static void ccw_init(MachineState *machine)
virtio_ccw_register_hcalls(); virtio_ccw_register_hcalls();
/* init CPUs */ /* init CPUs */
s390_init_cpus(machine->cpu_model); s390_init_cpus(machine);
if (kvm_enabled()) { if (kvm_enabled()) {
kvm_s390_enable_css_support(s390_cpu_addr2state(0)); kvm_s390_enable_css_support(s390_cpu_addr2state(0));

8
hw/s390x/s390-virtio.c
View File

@ -93,12 +93,12 @@ void s390_init_ipl_dev(const char *kernel_filename,
qdev_init_nofail(dev); qdev_init_nofail(dev);
} }
void s390_init_cpus(const char *cpu_model) void s390_init_cpus(MachineState *machine)
{ {
int i; int i;
if (cpu_model == NULL) { if (machine->cpu_model == NULL) {
cpu_model = "host"; machine->cpu_model = "host";
} }
ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus);
@ -107,7 +107,7 @@ void s390_init_cpus(const char *cpu_model)
S390CPU *cpu; S390CPU *cpu;
CPUState *cs; CPUState *cs;
cpu = cpu_s390x_init(cpu_model); cpu = cpu_s390x_init(machine->cpu_model);
cs = CPU(cpu); cs = CPU(cpu);
ipi_states[i] = cpu; ipi_states[i] = cpu;

2
hw/s390x/s390-virtio.h
View File

@ -19,7 +19,7 @@
typedef int (*s390_virtio_fn)(const uint64_t *args); typedef int (*s390_virtio_fn)(const uint64_t *args);
void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);
void s390_init_cpus(const char *cpu_model); void s390_init_cpus(MachineState *machine);
void s390_init_ipl_dev(const char *kernel_filename, void s390_init_ipl_dev(const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,