From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAPq0-0003FL-UZ for qemu-devel@nongnu.org; Mon, 03 Feb 2014 15:09:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAPpr-0001uD-W1 for qemu-devel@nongnu.org; Mon, 03 Feb 2014 15:09:48 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:39852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAPpr-0001u7-PY for qemu-devel@nongnu.org; Mon, 03 Feb 2014 15:09:39 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 3 Feb 2014 13:09:38 -0700 Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 98C1DC90041 for ; Mon, 3 Feb 2014 15:09:33 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp22034.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s13K9aVf8519944 for ; Mon, 3 Feb 2014 20:09:36 GMT Received: from d01av01.pok.ibm.com (localhost [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s13K9Yr8023578 for ; Mon, 3 Feb 2014 15:09:36 -0500 Message-ID: <52EFF77D.1050101@linux.vnet.ibm.com> Date: Mon, 03 Feb 2014 15:09:33 -0500 From: "Jason J. Herne" MIME-Version: 1.0 References: <1390405693-15696-1-git-send-email-jjherne@us.ibm.com> In-Reply-To: <1390405693-15696-1-git-send-email-jjherne@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] s390: Storage key global access Reply-To: jjherne@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Jason J. Herne" , afaerber@suse.de, borntraeger@de.ibm.com, agraf@suse.de, qemu-devel@nongnu.org On 01/22/2014 10:48 AM, Jason J. Herne wrote: > 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 | 3 +-- > hw/s390x/s390-virtio.c | 6 +++--- > hw/s390x/s390-virtio.h | 2 +- > target-s390x/cpu.h | 3 +++ > 4 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 733d988..62319b9 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -80,7 +80,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; > > @@ -112,7 +111,7 @@ static void ccw_init(QEMUMachineInitArgs *args) > storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_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 7adf92a..804483f 100644 > --- a/hw/s390x/s390-virtio.c > +++ b/hw/s390x/s390-virtio.c > @@ -53,6 +53,7 @@ > > static VirtIOS390Bus *s390_bus; > static S390CPU **ipi_states; > +uint8_t *storage_keys; > > S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) > { > @@ -176,7 +177,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; > > @@ -231,7 +232,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; > @@ -273,7 +273,7 @@ static void s390_init(QEMUMachineInitArgs *args) > storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_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 68b5ab7..b1432c7 100644 > --- a/target-s390x/cpu.h > +++ b/target-s390x/cpu.h > @@ -381,6 +381,9 @@ static inline void kvm_s390_interrupt_internal(S390CPU *cpu, int type, > { > } > #endif > + > +extern uint8_t *storage_keys; > + > S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); > void s390_add_running_cpu(S390CPU *cpu); > unsigned s390_del_running_cpu(S390CPU *cpu); > Ping. -- -- Jason J. Herne (jjherne@linux.vnet.ibm.com)