From patchwork Thu Oct 31 17:21:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason J. Herne" X-Patchwork-Id: 287580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 278B82C008F for ; Fri, 1 Nov 2013 04:49:34 +1100 (EST) Received: from localhost ([::1]:58546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vbvyj-0006S3-Rn for incoming@patchwork.ozlabs.org; Thu, 31 Oct 2013 13:24:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbvwP-0003AG-KK for qemu-devel@nongnu.org; Thu, 31 Oct 2013 13:22:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbvwF-0002We-NX for qemu-devel@nongnu.org; Thu, 31 Oct 2013 13:21:53 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:41816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbvwF-0002WD-Jp for qemu-devel@nongnu.org; Thu, 31 Oct 2013 13:21:43 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Oct 2013 13:21:42 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 31 Oct 2013 13:21:40 -0400 Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 62E0C6E803A for ; Thu, 31 Oct 2013 13:21:38 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by b01cxnp23033.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9VHLd6k3604778 for ; Thu, 31 Oct 2013 17:21:39 GMT Received: from d01av05.pok.ibm.com (localhost [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9VHLcm6006487 for ; Thu, 31 Oct 2013 13:21:39 -0400 Received: from jason-ThinkPad-W500.endicott.ibm.com (jason-thinkpad-w500.endicott.ibm.com [9.60.75.166] (may be forged)) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9VHLYvo006083; Thu, 31 Oct 2013 13:21:38 -0400 From: "Jason J. Herne" 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 Date: Thu, 31 Oct 2013 13:21:33 -0400 Message-Id: <1383240094-28760-8-git-send-email-jjherne@us.ibm.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1383240094-28760-1-git-send-email-jjherne@us.ibm.com> References: <1383240094-28760-1-git-send-email-jjherne@us.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13103117-7182-0000-0000-000008F6F2D1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.139 Cc: "Jason J. Herne" Subject: [Qemu-devel] [PATCH 7/8 v4] [PATCH RFC v4] s390-hotplug: Implement hot_add_cpu hook X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 1 + target-s390x/cpu.c | 29 +++++++++++++++++++++++++++++ target-s390x/cpu.h | 2 ++ 3 files changed, 32 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 62319b9..8b89886 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -132,6 +132,7 @@ static QEMUMachine ccw_machine = { .alias = "s390-ccw", .desc = "VirtIO-ccw based S390 machine", .init = ccw_init, + .hot_add_cpu = ccw_hot_add_cpu, .block_default_type = IF_VIRTIO, .no_cdrom = 1, .no_floppy = 1, diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 3e7fa30..6b7e1fa 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 @@ -206,6 +208,33 @@ 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; + int cpu_count = 0; + + CPU_FOREACH(cpu) { + cpu_count++; + } + + if (cpu_count == max_cpus) { + error_setg(errp, "Maximum number of cpus already defined"); + return; + } + + if (id != next_cpu_num) { + error_setg(errp, "Unable to add CPU: %" PRIi64 + ", The next available id is %d", id, next_cpu_num); + return; + } + + new_cpu = S390_CPU(object_new(TYPE_S390_CPU)); + object_property_set_bool(OBJECT(new_cpu), true, "realized", NULL); +} +#endif + static const VMStateDescription vmstate_s390_cpu = { .name = "cpu", .unmigratable = 1, diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 8873536..8c0bed7 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -385,6 +385,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);