[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.6 01/11] s390x/cpu: Cleanup init in preparation
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.6 01/11] s390x/cpu: Cleanup init in preparation for hotplug |
Date: |
Fri, 11 Mar 2016 10:56:32 +0100 |
From: Matthew Rosato <address@hidden>
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 <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/s390x/s390-virtio.c | 8 ++++----
hw/s390x/s390-virtio.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 89f5d0d..b05ed8b 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -136,7 +136,7 @@ static void ccw_init(MachineState *machine)
virtio_ccw_register_hcalls();
/* init CPUs */
- s390_init_cpus(machine->cpu_model);
+ s390_init_cpus(machine);
if (kvm_enabled()) {
kvm_s390_enable_css_support(s390_cpu_addr2state(0));
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 8e533ae..d40d0dc 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;
diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h
index eebce8e..ffd014c 100644
--- a/hw/s390x/s390-virtio.h
+++ b/hw/s390x/s390-virtio.h
@@ -19,7 +19,7 @@
typedef int (*s390_virtio_fn)(const uint64_t *args);
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,
const char *kernel_cmdline,
const char *initrd_filename,
--
2.7.2
- [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 06/11] s390x/cpu: Add error handling to cpu creation, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 01/11] s390x/cpu: Cleanup init in preparation for hotplug,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.6 02/11] s390x/cpu: Set initial CPU state in common routine, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 05/11] s390x/cpu: Add CPU property links, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 03/11] s390x/cpu: Get rid of side effects when creating a vcpu, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 08/11] pc-bios/s390-ccw: fix old bug in ptr increment, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 04/11] s390x/cpu: Tolerate max_cpus, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 09/11] s390x: Introduce machine definition macros, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 07/11] s390x/cpu: Allow hotplug of CPUs, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 11/11] s390x/cpu: use g_new0, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 10/11] s390x: Introduce S390MachineClass, Cornelia Huck, 2016/03/11
- Re: [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Peter Maydell, 2016/03/14