From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4vCO-0005Zr-Jv for qemu-devel@nongnu.org; Thu, 01 Aug 2013 11:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4tcZ-0008Av-Dy for qemu-devel@nongnu.org; Thu, 01 Aug 2013 10:13:00 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:35688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4tcZ-00089g-8o for qemu-devel@nongnu.org; Thu, 01 Aug 2013 10:12:51 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Aug 2013 10:12:49 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 989FC6E803A for ; Thu, 1 Aug 2013 10:12:41 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r71ECks7157898 for ; Thu, 1 Aug 2013 10:12:46 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r71ECkiD022019 for ; Thu, 1 Aug 2013 11:12:46 -0300 From: "Jason J. Herne" Date: Thu, 1 Aug 2013 10:12:38 -0400 Message-Id: <1375366359-11553-8-git-send-email-jjherne@us.ibm.com> In-Reply-To: <1375366359-11553-1-git-send-email-jjherne@us.ibm.com> References: <1375366359-11553-1-git-send-email-jjherne@us.ibm.com> Subject: [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: afaerber@suse.de, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com Cc: "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 .block_default_type = IF_VIRTIO, .no_cdrom = 1, .no_floppy = 1, diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index c90a91c..60029d9 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -27,6 +27,8 @@ #include "qemu-common.h" #include "qemu/timer.h" #include "hw/hw.h" +#include "hw/s390x/sclp.h" +#include "sysemu/sysemu.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h" #endif @@ -154,6 +156,36 @@ static void s390_cpu_finalize(Object *obj) #endif } +#if !defined(CONFIG_USER_ONLY) +void ccw_hot_add_cpu(const int64_t id, Error **errp) +{ + S390CPU *new_cpu; + CPUState *cpu; + const char *model_str; + int cpu_count = 0; + + for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) { + cpu_count++; + } + + if (cpu_count == max_cpus) { + error_setg(errp, "Maximum number of cpus already defined"); + return; + } + + if (id != cpu_count) { + error_setg(errp, "Unable to add CPU: %" PRIi64 + ", The next available id is %d", id, cpu_count); + return; + } + + model_str = s390_cpu_addr2state(0)->env.cpu_model_str; + new_cpu = s390_new_cpu(model_str, id); + object_property_set_bool(OBJECT(new_cpu), true, "realized", NULL); + raise_irq_cpu_hotplug(); +} +#endif + static const VMStateDescription vmstate_s390_cpu = { .name = "cpu", .unmigratable = 1, diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 0f68dd0..711aad4 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -383,6 +383,8 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); void s390_add_running_cpu(S390CPU *cpu); unsigned s390_del_running_cpu(S390CPU *cpu); +void ccw_hot_add_cpu(const int64_t id, Error **errp); + /* service interrupts are floating therefore we must not pass an cpustate */ void s390_sclp_extint(uint32_t parm); -- 1.7.10.4