From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLxH6-0002TQ-J4 for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:10:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLxGx-0007qW-64 for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:10:00 -0500 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:33443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLxGw-0007pg-Sg for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:09:51 -0500 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Feb 2015 17:09:49 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2618F2190068 for ; Thu, 12 Feb 2015 17:09:42 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1CH9lns54067220 for ; Thu, 12 Feb 2015 17:09:47 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1CH9k0E028457 for ; Thu, 12 Feb 2015 12:09:46 -0500 From: Jens Freimann Date: Thu, 12 Feb 2015 18:09:42 +0100 Message-Id: <1423760982-8474-26-git-send-email-jfrei@linux.vnet.ibm.com> In-Reply-To: <1423760982-8474-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1423760982-8474-1-git-send-email-jfrei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 25/25] s390x/helper: Remove s390_cpu_physical_memory_map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger , Alexander Graf , Cornelia Huck Cc: Jens Freimann , qemu-devel@nongnu.org, Thomas Huth From: Thomas Huth The function is now not used anymore, so it can be removed safely. Signed-off-by: Thomas Huth Signed-off-by: Jens Freimann Acked-by: Cornelia Huck Reviewed-by: David Hildenbrand --- target-s390x/cpu.h | 4 ---- target-s390x/helper.c | 25 ------------------------- 2 files changed, 29 deletions(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 1f58312..b6b4632 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -350,10 +350,6 @@ int s390_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, #include "ioinst.h" #ifndef CONFIG_USER_ONLY -void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr *len, - int is_write); -void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len, - int is_write); static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb) { hwaddr addr = 0; diff --git a/target-s390x/helper.c b/target-s390x/helper.c index f8a3c5a..e0fd8fc 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -229,31 +229,6 @@ static void cpu_unmap_lowcore(LowCore *lowcore) cpu_physical_memory_unmap(lowcore, sizeof(LowCore), 1, sizeof(LowCore)); } -void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr *len, - int is_write) -{ - hwaddr start = addr; - - /* Mind the prefix area. */ - if (addr < 8192) { - /* Map the lowcore. */ - start += env->psa; - *len = MIN(*len, 8192 - addr); - } else if ((addr >= env->psa) && (addr < env->psa + 8192)) { - /* Map the 0 page. */ - start -= env->psa; - *len = MIN(*len, 8192 - start); - } - - return cpu_physical_memory_map(start, len, is_write); -} - -void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len, - int is_write) -{ - cpu_physical_memory_unmap(addr, len, is_write, len); -} - static void do_svc_interrupt(CPUS390XState *env) { uint64_t mask, addr; -- 2.1.4