From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXuZX-0002ly-Bk for qemu-devel@nongnu.org; Mon, 22 Feb 2016 12:47:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXuZT-0002B2-58 for qemu-devel@nongnu.org; Mon, 22 Feb 2016 12:46:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:59762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXuZS-0002Ay-VU for qemu-devel@nongnu.org; Mon, 22 Feb 2016 12:46:55 -0500 References: <1456160797-832-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1456160797-832-2-git-send-email-mjrosato@linux.vnet.ibm.com> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <56CB498D.8050302@suse.de> Date: Mon, 22 Feb 2016 18:46:53 +0100 MIME-Version: 1.0 In-Reply-To: <1456160797-832-2-git-send-email-mjrosato@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v6 1/7] s390x/cpu: Cleanup init in preparation for hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Matthew Rosato , qemu-devel@nongnu.org Cc: dahi@linux.vnet.ibm.com, agraf@suse.de, borntraeger@de.ibm.com, imammedo@redhat.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, rth@twiddle.net Am 22.02.2016 um 18:06 schrieb Matthew Rosato: > 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. >=20 > Signed-off-by: Matthew Rosato > Reviewed-by: David Hildenbrand > --- > 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(-) >=20 > 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(); > =20 > /* init CPUs */ > - s390_init_cpus(machine->cpu_model); > + s390_init_cpus(machine); > =20 > 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 c320878..b576811 100644 > --- a/hw/s390x/s390-virtio.c > +++ b/hw/s390x/s390-virtio.c > @@ -95,12 +95,12 @@ void s390_init_ipl_dev(const char *kernel_filename, > qdev_init_nofail(dev); > } > =20 > -void s390_init_cpus(const char *cpu_model) > +void s390_init_cpus(MachineState *machine) > { > int i; > =20 > - if (cpu_model =3D=3D NULL) { > - cpu_model =3D "host"; > + if (machine->cpu_model =3D=3D NULL) { > + machine->cpu_model =3D "host"; When/why is cpu_model =3D=3D NULL? Could you simply set it as a default i= n your machine's instance_init? Regards, Andreas > } > =20 > ipi_states =3D g_malloc(sizeof(S390CPU *) * smp_cpus); > @@ -109,7 +109,7 @@ void s390_init_cpus(const char *cpu_model) > S390CPU *cpu; > CPUState *cs; > =20 > - cpu =3D cpu_s390x_init(cpu_model); > + cpu =3D cpu_s390x_init(machine->cpu_model); > cs =3D CPU(cpu); > =20 > ipi_states[i] =3D 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); > =20 > -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, >=20 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Graham Norton; HRB 21284 (AG N=FC= rnberg)