From: Stefan Hajnoczi <stefanha@redhat.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Blue Swirl <blauwirbel@gmail.com>,
qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 7/9] target-ppc: make some functions static
Date: Thu, 1 Nov 2012 20:05:52 +0100 [thread overview]
Message-ID: <1351796754-21703-14-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1351796754-21703-1-git-send-email-stefanha@redhat.com>
From: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
target-ppc/cpu.h | 6 ------
target-ppc/mmu_helper.c | 11 ++++++-----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index ddee9a0..bb5b0a4 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1140,10 +1140,6 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo,
int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw,
int mmu_idx);
#define cpu_handle_mmu_fault cpu_ppc_handle_mmu_fault
-#if !defined(CONFIG_USER_ONLY)
-int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr,
- int rw, int access_type);
-#endif
void do_interrupt (CPUPPCState *env);
void ppc_hw_interrupt (CPUPPCState *env);
@@ -1188,8 +1184,6 @@ void store_40x_dbcr0 (CPUPPCState *env, uint32_t val);
void store_40x_sler (CPUPPCState *env, uint32_t val);
void store_booke_tcr (CPUPPCState *env, target_ulong val);
void store_booke_tsr (CPUPPCState *env, target_ulong val);
-void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot);
-hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb);
int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb,
hwaddr *raddrp, target_ulong address,
uint32_t pid);
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 811f47f..318ce92 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -1276,7 +1276,8 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
return ret;
}
-void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
+static void booke206_flush_tlb(CPUPPCState *env, int flags,
+ const int check_iprot)
{
int tlb_size;
int i, j;
@@ -1297,8 +1298,8 @@ void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
tlb_flush(env, 1);
}
-hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
- ppcmas_tlb_t *tlb)
+static hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
+ ppcmas_tlb_t *tlb)
{
int tlbm_size;
@@ -1706,8 +1707,8 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
return ret;
}
-int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr,
- int rw, int access_type)
+static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
+ target_ulong eaddr, int rw, int access_type)
{
int ret;
--
1.7.12.1
next prev parent reply other threads:[~2012-11-01 19:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 19:05 [Qemu-devel] [PULL 1.3 0/9] Trivial patches for 20 October to 1 November 2012 Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 1/9] cadence_uart: More debug information Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 1/6] ui/vnc: Only report/use TIGHT_PNG encoding if enabled Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 2/9] m68k: Return semihosting errno values correctly Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 2/6] targphys.h: Don't define target_phys_addr_t for user-mode emulators Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 3/6] target-arm/neon_helper: Remove obsolete FIXME comment Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 3/9] target-sparc: make do_unaligned_access static Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 4/6] configure: Remove unused parameters from main function Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 4/9] vl.c: add missing static Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 5/6] net/tap-win32: Fix compiler warning caused by missing include statement Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 5/9] vnc: add missing static Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 6/9] ppc: " Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 6/6] ui/vnc-jobs.c: Fix minor typos in comments Stefan Hajnoczi
2012-11-01 19:05 ` Stefan Hajnoczi [this message]
2012-11-01 19:05 ` [Qemu-devel] [PATCH 8/9] exec: make some functions static Stefan Hajnoczi
2012-11-01 19:05 ` [Qemu-devel] [PATCH 9/9] pc: Drop redundant test for ROM memory region Stefan Hajnoczi
2012-11-03 15:19 ` [Qemu-devel] [PULL 1.3 0/9] Trivial patches for 20 October to 1 November 2012 Blue Swirl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351796754-21703-14-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).