From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab1hj-00074b-3J for qemu-devel@nongnu.org; Wed, 02 Mar 2016 03:00:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab1hf-0002Br-So for qemu-devel@nongnu.org; Wed, 02 Mar 2016 03:00:19 -0500 Received: from e06smtp07.uk.ibm.com ([195.75.94.103]:36483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab1hf-0002Bj-Ku for qemu-devel@nongnu.org; Wed, 02 Mar 2016 03:00:15 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 Mar 2016 08:00:14 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id A83AB219005C for ; Wed, 2 Mar 2016 07:59:54 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2280A8F393536 for ; Wed, 2 Mar 2016 08:00:11 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2280Ain032395 for ; Wed, 2 Mar 2016 01:00:10 -0700 Date: Wed, 2 Mar 2016 09:00:08 +0100 From: David Hildenbrand Message-ID: <20160302090008.494d331e@thinkpad-w530> In-Reply-To: <1456866806-31466-7-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1456866806-31466-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1456866806-31466-7-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 v7 6/6] s390x/cpu: Allow hotplug of CPUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Matthew Rosato Cc: imammedo@redhat.com, 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 Reviewed-by: David Hildenbrand > --- > hw/s390x/s390-virtio-ccw.c | 13 +++++++++++++ > target-s390x/cpu.c | 7 +++++++ > 2 files changed, 20 insertions(+) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4886dbf..cfb2ef4 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -215,6 +215,18 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine, > return NULL; > } > > +static void s390_hot_add_cpu(const int64_t id, Error **errp) > +{ > + MachineState *machine = MACHINE(qdev_get_machine()); > + Error *local_err = NULL; > + > + s390_new_cpu(machine, id, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > +} > + > static void ccw_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -223,6 +235,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 ec66ed6..6585f04 100644 > --- a/target-s390x/cpu.c > +++ b/target-s390x/cpu.c > @@ -33,6 +33,7 @@ > #include "qapi/visitor.h" > #ifndef CONFIG_USER_ONLY > #include "sysemu/arch_init.h" > +#include "hw/s390x/sclp.h" > #endif > > #define CR0_RESET 0xE0UL > @@ -227,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_get_id(Object *obj, Visitor *v, const char *name, David