From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKVJz-00086L-73 for qemu-devel@nongnu.org; Fri, 13 Sep 2013 11:30:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VKVJq-00039L-Ae for qemu-devel@nongnu.org; Fri, 13 Sep 2013 11:30:11 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:42774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKVJq-00038W-47 for qemu-devel@nongnu.org; Fri, 13 Sep 2013 11:30:02 -0400 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Sep 2013 09:30:01 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 28B2B3E40042 for ; Fri, 13 Sep 2013 09:29:59 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8DFTw4v297030 for ; Fri, 13 Sep 2013 09:29:58 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r8DFWuWL016207 for ; Fri, 13 Sep 2013 09:32:57 -0600 Message-ID: <52332F74.4030609@linux.vnet.ibm.com> Date: Fri, 13 Sep 2013 11:29:56 -0400 From: "Jason J. Herne" MIME-Version: 1.0 References: <1375366359-11553-1-git-send-email-jjherne@us.ibm.com> <1375366359-11553-8-git-send-email-jjherne@us.ibm.com> <52287B5B.7030003@suse.de> In-Reply-To: <52287B5B.7030003@suse.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 7/8] [PATCH RFC v3] s390-qemu: cpu hotplug - Implement hot_add_cpu hook Reply-To: jjherne@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-15?Q?Andreas_F=E4rber?= Cc: ehabkost@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com, "Jason J. Herne" On 09/05/2013 08:38 AM, Andreas Färber wrote: > Am 01.08.2013 16:12, schrieb Jason J. Herne: >> From: "Jason J. Herne" >> >> Implement hot_add_cpu for S390 to allow hot plugging of cpus. >> >> Signed-off-by: Jason J. Herne >> --- >> hw/s390x/s390-virtio-ccw.c | 3 +++ >> target-s390x/cpu.c | 32 ++++++++++++++++++++++++++++++++ >> target-s390x/cpu.h | 2 ++ >> 3 files changed, 37 insertions(+) >> >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index b469960..30b6a48 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -117,6 +117,9 @@ static QEMUMachine ccw_machine = { >> .alias = "s390-ccw", >> .desc = "VirtIO-ccw based S390 machine", >> .init = ccw_init, >> +#if !defined(CONFIG_USER_ONLY) >> + .hot_add_cpu = ccw_hot_add_cpu, >> +#endif > > I doubt this #ifdeffery is necessary here? > This was needed because ccw_hot_add_cpu calls s390_cpu_addr2state which is wrapped in the very same ifdef. However, the offending line is this: model_str = s390_cpu_addr2state(0)->env.cpu_model_str; Since we're doing away with that line anyway I can probably remove that ifdef. However, does it make sense to have a cpu-add command for the linux-user target? Also, do you know when your patch to remove the model string will hit the master branch? -- -- Jason J. Herne (jjherne@linux.vnet.ibm.com)