From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WI37I-0007nA-Mz for qemu-devel@nongnu.org; Mon, 24 Feb 2014 16:31:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WI378-0007g6-Lo for qemu-devel@nongnu.org; Mon, 24 Feb 2014 16:31:12 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:34638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WI378-0007g0-F6 for qemu-devel@nongnu.org; Mon, 24 Feb 2014 16:31:02 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 24 Feb 2014 14:31:02 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 44CFF1FF003F for ; Mon, 24 Feb 2014 14:31:00 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by b03cxnp07029.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1OJSJdf62652562 for ; Mon, 24 Feb 2014 20:28:19 +0100 Received: from d03av01.boulder.ibm.com (localhost [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1OLUx46012537 for ; Mon, 24 Feb 2014 14:31:00 -0700 From: Matthew Rosato Date: Mon, 24 Feb 2014 16:30:51 -0500 Message-Id: <1393277453-13942-4-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1393277453-13942-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1393277453-13942-1-git-send-email-mjrosato@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 3/5] sclp-s390: Add device to manage s390 memory hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, gleb@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, aliguori@amazon.com, imammedo@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, rth@twiddle.net Add sclpMemoryHotplugDev to contain associated data structures, etc. Signed-off-by: Matthew Rosato --- hw/s390x/sclp.c | 32 ++++++++++++++++++++++++++++++++ include/hw/s390x/sclp.h | 19 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index d8ddf35..338dbdf 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -183,3 +183,35 @@ void s390_sclp_init(void) OBJECT(dev), NULL); qdev_init_nofail(dev); } + +sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void) +{ + DeviceState *dev; + ObjectProperty *op = object_property_find(qdev_get_machine(), + TYPE_SCLP_MEMORY_HOTPLUG_DEV, + NULL); + if (!op) { + dev = qdev_create(NULL, TYPE_SCLP_MEMORY_HOTPLUG_DEV); + object_property_add_child(qdev_get_machine(), + TYPE_SCLP_MEMORY_HOTPLUG_DEV, + OBJECT(dev), NULL); + qdev_init_nofail(dev); + op = object_property_find(qdev_get_machine(), + TYPE_SCLP_MEMORY_HOTPLUG_DEV, + NULL); + } + + return op->opaque; +} + +static TypeInfo sclp_memory_hotplug_dev_info = { + .name = TYPE_SCLP_MEMORY_HOTPLUG_DEV, + .parent = TYPE_DEVICE, + .instance_size = sizeof(sclpMemoryHotplugDev), +}; + +static void register_types(void) +{ + type_register_static(&sclp_memory_hotplug_dev_info); +} +type_init(register_types); diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index 7ef1622..bbcc181 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -156,6 +156,24 @@ typedef struct SCCB { char data[SCCB_DATA_LEN]; } QEMU_PACKED SCCB; +typedef struct sclpMemoryHotplugDev sclpMemoryHotplugDev; + +#define TYPE_SCLP_MEMORY_HOTPLUG_DEV "sclp-memory-hotplug-dev" +#define SCLP_MEMORY_HOTPLUG_DEV(obj) \ + OBJECT_CHECK(sclpMemoryHotplugDev, (obj), TYPE_SCLP_MEMORY_HOTPLUG_DEV) + +struct sclpMemoryHotplugDev { + DeviceState parent; + ram_addr_t standby_mem_size; + ram_addr_t padded_ram_size; + ram_addr_t pad_size; + ram_addr_t standby_subregion_size; + ram_addr_t rzm; + int shift; + char *standby_state_map; +}; + + static inline int sccb_data_len(SCCB *sccb) { return be16_to_cpu(sccb->h.length) - sizeof(sccb->h); @@ -163,6 +181,7 @@ static inline int sccb_data_len(SCCB *sccb) void s390_sclp_init(void); +sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void); void sclp_service_interrupt(uint32_t sccb); void raise_irq_cpu_hotplug(void); -- 1.7.9.5