From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLc7n-0002mu-VE for qemu-devel@nongnu.org; Mon, 16 Sep 2013 12:58:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLc7g-0006Vm-Mv for qemu-devel@nongnu.org; Mon, 16 Sep 2013 12:58:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49173 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLc7g-0006Vh-Dp for qemu-devel@nongnu.org; Mon, 16 Sep 2013 12:58:04 -0400 Message-ID: <52373897.9080602@suse.de> Date: Mon, 16 Sep 2013 18:57:59 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= 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> <52332F74.4030609@linux.vnet.ibm.com> In-Reply-To: <52332F74.4030609@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 7/8] [PATCH RFC v3] s390-qemu: cpu hotplug - Implement hot_add_cpu hook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: jjherne@linux.vnet.ibm.com Cc: ehabkost@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com, "Jason J. Herne" Am 13.09.2013 17:29, schrieb Jason J. Herne: > On 09/05/2013 08:38 AM, Andreas F=E4rber 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 =3D { >>> .alias =3D "s390-ccw", >>> .desc =3D "VirtIO-ccw based S390 machine", >>> .init =3D ccw_init, >>> +#if !defined(CONFIG_USER_ONLY) >>> + .hot_add_cpu =3D ccw_hot_add_cpu, >>> +#endif >> >> I doubt this #ifdeffery is necessary here? >> >=20 > This was needed because ccw_hot_add_cpu calls s390_cpu_addr2state which > is wrapped in the very same ifdef. This whole file should never get compiled for CONFIG_USER_ONLY. > However, the offending line is this: >=20 > model_str =3D s390_cpu_addr2state(0)->env.cpu_model_str; >=20 > 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? >=20 > Also, do you know when your patch to remove the model string will hit > the master branch? I've pushed it to qom-cpu-next branch for now, suggest to rebase on that. It all depends on when I get to review all the pending patches and respin some interfering ones and then get someone to pull, which is outside of my control. Cheers, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg