From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWKUV-00024z-3G for qemu-devel@nongnu.org; Thu, 18 Feb 2016 04:03:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWKUR-0003VB-RV for qemu-devel@nongnu.org; Thu, 18 Feb 2016 04:03:15 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:43662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWKUR-0003Uz-IS for qemu-devel@nongnu.org; Thu, 18 Feb 2016 04:03:11 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 18 Feb 2016 09:03:10 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id A0E8A2190019 for ; Thu, 18 Feb 2016 09:02:53 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1I938Zf57147614 for ; Thu, 18 Feb 2016 09:03:08 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1I9383r023389 for ; Thu, 18 Feb 2016 02:03:08 -0700 Date: Thu, 18 Feb 2016 10:03:06 +0100 From: David Hildenbrand Message-ID: <20160218100306.062b370b@thinkpad-w530> In-Reply-To: <1455739955-28139-6-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1455739955-28139-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1455739955-28139-6-git-send-email-mjrosato@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 5/5] s390x/cpu: Allow hotplug of CPUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Matthew Rosato Cc: qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net > Implement cpu hotplug routine and add the machine hook. > > Signed-off-by: Matthew Rosato > --- > hw/s390x/s390-virtio-ccw.c | 1 + > target-s390x/cpu.c | 40 ++++++++++++++++++++++++++++++++++++++++ > target-s390x/cpu.h | 1 + > 3 files changed, 42 insertions(+) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index b05ed8b..a15904d 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -163,6 +163,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) > > mc->init = ccw_init; > mc->reset = s390_machine_reset; > + mc->hot_add_cpu = s390_hot_add_cpu; > mc->block_default_type = IF_VIRTIO; > mc->no_cdrom = 1; > mc->no_floppy = 1; > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c > index 620b2e3..b4c59c9 100644 > --- a/target-s390x/cpu.c > +++ b/target-s390x/cpu.c > @@ -33,6 +33,8 @@ > #ifndef CONFIG_USER_ONLY > #include "sysemu/arch_init.h" > #include "sysemu/sysemu.h" > +#include "hw/boards.h" > +#include "hw/s390x/sclp.h" > #endif > > #define CR0_RESET 0xE0UL > @@ -226,6 +228,12 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > #endif > > scc->parent_realize(dev, errp); > + > +#if !defined(CONFIG_USER_ONLY) > + if (dev->hotplugged) { > + raise_irq_cpu_hotplug(); > + } > +#endif > } > > static void s390_cpu_initfn(Object *obj) > @@ -269,6 +277,38 @@ static void s390_cpu_finalize(Object *obj) > } > > #if !defined(CONFIG_USER_ONLY) > +void s390_hot_add_cpu(const int64_t id, Error **errp) > +{ > + MachineState *machine = MACHINE(qdev_get_machine()); > + > + if (id < 0) { > + error_setg(errp, "Invalid CPU id: %" PRIi64, id); > + return; > + } > + > + if (cpu_exists(id)) { > + error_setg(errp, "Unable to add CPU: %" PRIi64 > + ", it already exists", id); > + return; > + } > + > + if (id >= max_cpus) { > + error_setg(errp, "Unable to add CPU: %" PRIi64 > + ", max allowed: %d", id, max_cpus - 1); > + return; > + } > + > + if (id != next_cpu_id) { > + error_setg(errp, "Unable to add CPU: %" PRIi64 > + ", The next available id is %d", id, next_cpu_id); > + return; > + } > + > + cpu_s390x_init(machine->cpu_model); > +} > +#endif > + > +#if !defined(CONFIG_USER_ONLY) This #if block could be combined with the previous one. But it's not worth blocking this series so Acked-by: David Hildenbrand As we have a clean interface now (cpu-add id=x) most of this series is internal stuff, so I think this is ready to be picked up :) . David