From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V55dC-00029H-NP for qemu-devel@nongnu.org; Thu, 01 Aug 2013 23:02:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V55d3-0003R4-Nf for qemu-devel@nongnu.org; Thu, 01 Aug 2013 23:02:18 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:35736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4tcg-0008Cy-0X for qemu-devel@nongnu.org; Thu, 01 Aug 2013 10:12:58 -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:57 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id C69C06E803C for ; Thu, 1 Aug 2013 10:12:49 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r71ECsrM119920 for ; Thu, 1 Aug 2013 10:12:54 -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 r71ECstH023171 for ; Thu, 1 Aug 2013 11:12:54 -0300 From: "Jason J. Herne" Date: Thu, 1 Aug 2013 10:12:35 -0400 Message-Id: <1375366359-11553-5-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 4/8] [PATCH RFC v3] s390-qemu: cpu hotplug - Storage key global access 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" Introduces global access to storage key data so we can set it for each cpu in the S390 cpu initialization routine. Signed-off-by: Jason J. Herne --- hw/s390x/s390-virtio-ccw.c | 5 ++--- hw/s390x/s390-virtio.c | 21 ++++++++++++++++----- hw/s390x/s390-virtio.h | 2 +- target-s390x/cpu.h | 4 ++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index aebbbf1..b469960 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -65,7 +65,6 @@ static void ccw_init(QEMUMachineInitArgs *args) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); int shift = 0; - uint8_t *storage_keys; int ret; VirtualCssBus *css_bus; @@ -94,10 +93,10 @@ static void ccw_init(QEMUMachineInitArgs *args) memory_region_add_subregion(sysmem, 0, ram); /* allocate storage keys */ - storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE); + s390_alloc_storage_keys(my_ram_size); /* init CPUs */ - s390_init_cpus(args->cpu_model, storage_keys); + s390_init_cpus(args->cpu_model); if (kvm_enabled()) { kvm_s390_enable_css_support(s390_cpu_addr2state(0)); diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 439d732..21e9124 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -123,6 +123,18 @@ static void s390_virtio_register_hcalls(void) s390_virtio_hcall_set_status); } +static uint8_t *storage_keys; + +uint8_t *s390_get_storage_keys(void) +{ + return storage_keys; +} + +void s390_alloc_storage_keys(ram_addr_t ram_size) +{ + storage_keys = g_malloc0(ram_size / TARGET_PAGE_SIZE); +} + /* * The number of running CPUs. On s390 a shutdown is the state of all CPUs * being either stopped or disabled (for interrupts) waiting. We have to @@ -176,7 +188,7 @@ void s390_init_ipl_dev(const char *kernel_filename, qdev_init_nofail(dev); } -void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) +void s390_init_cpus(const char *cpu_model) { int i; @@ -196,7 +208,7 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) ipi_states[i] = cpu; cs->halted = 1; cpu->env.exception_index = EXCP_HLT; - cpu->env.storage_keys = storage_keys; + cpu->env.storage_keys = s390_get_storage_keys(); } } @@ -231,7 +243,6 @@ static void s390_init(QEMUMachineInitArgs *args) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); int shift = 0; - uint8_t *storage_keys; void *virtio_region; hwaddr virtio_region_len; hwaddr virtio_region_start; @@ -270,10 +281,10 @@ static void s390_init(QEMUMachineInitArgs *args) virtio_region_len); /* allocate storage keys */ - storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE); + s390_alloc_storage_keys(my_ram_size); /* init CPUs */ - s390_init_cpus(args->cpu_model, storage_keys); + s390_init_cpus(args->cpu_model); /* Create VirtIO network adapters */ s390_create_virtio_net((BusState *)s390_bus, "virtio-net-s390"); diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h index 5c405e7..c1cb042 100644 --- a/hw/s390x/s390-virtio.h +++ b/hw/s390x/s390-virtio.h @@ -20,7 +20,7 @@ typedef int (*s390_virtio_fn)(const uint64_t *args); void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); -void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys); +void s390_init_cpus(const char *cpu_model); void s390_init_ipl_dev(const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 65bef86..877eac7 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -374,6 +374,10 @@ static inline void kvm_s390_interrupt_internal(S390CPU *cpu, int type, { } #endif + +uint8_t *s390_get_storage_keys(void); +void s390_alloc_storage_keys(ram_addr_t ram_size); + S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); void s390_add_running_cpu(S390CPU *cpu); unsigned s390_del_running_cpu(S390CPU *cpu); -- 1.7.10.4