From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXx7a-0000IT-RB for qemu-devel@nongnu.org; Mon, 22 Feb 2016 15:30:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXx7V-0001u3-RM for qemu-devel@nongnu.org; Mon, 22 Feb 2016 15:30:18 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:54745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXx7V-0001tw-Jq for qemu-devel@nongnu.org; Mon, 22 Feb 2016 15:30:13 -0500 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 22 Feb 2016 13:30:12 -0700 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 3923A3E40044 for ; Mon, 22 Feb 2016 13:30:10 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1MKUAbU27525136 for ; Mon, 22 Feb 2016 13:30:10 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1MKU9j1031215 for ; Mon, 22 Feb 2016 13:30:10 -0700 References: <1456160797-832-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1456160797-832-2-git-send-email-mjrosato@linux.vnet.ibm.com> <56CB498D.8050302@suse.de> From: Matthew Rosato Message-ID: <56CB6FCA.9080407@linux.vnet.ibm.com> Date: Mon, 22 Feb 2016 15:30:02 -0500 MIME-Version: 1.0 In-Reply-To: <56CB498D.8050302@suse.de> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit 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: =?UTF-8?Q?Andreas_F=c3=a4rber?= , qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, agraf@suse.de, dahi@linux.vnet.ibm.com, pbonzini@redhat.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, imammedo@redhat.com, rth@twiddle.net On 02/22/2016 12:46 PM, Andreas Färber wrote: > 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. >> >> 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(-) >> >> 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 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); >> } >> >> -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"; > > When/why is cpu_model == NULL? Could you simply set it as a default in > your machine's instance_init? > Yes, we definitely did this in an earlier version. I'll set this during machine instance_init. Matt