[Qemu-devel] [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat()

[Qemu-devel] [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat()

[Peter Maydell]

In commit 40df8c0c0722 support was added for target-specific
handling of SHMLBA. Unfortunately the sparc64-specific part
of the change got lost somewhere between the patch being
posted to the list and going into master:
 http://patchwork.ozlabs.org/patch/646980/
 http://patchwork.ozlabs.org/patch/673339/

Add the accidentally-dropped code.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 linux-user/sparc64/target_syscall.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h
index b7e3bf8..2cbbaae 100644
--- a/linux-user/sparc64/target_syscall.h
+++ b/linux-user/sparc64/target_syscall.h
@@ -23,4 +23,11 @@ struct target_pt_regs {
 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000
 #define TARGET_MLOCKALL_MCL_FUTURE  0x4000
 
+#define TARGET_FORCE_SHMLBA
+
+static inline abi_ulong target_shmlba(CPUSPARCState *env)
+{
+    return MAX(TARGET_PAGE_SIZE, 16 * 1024);
+}
+
 #endif /* SPARC64_TARGET_SYSCALL_H */
-- 
2.7.4

Re: [Qemu-devel] [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat()

[Laurent Vivier]

Le 04/10/2016 à 15:13, Peter Maydell a écrit :
> In commit 40df8c0c0722 support was added for target-specific

I don't have commit 40df8c0c0722, I have
ee8e76141b4dd00f8e97fda274876a17f9a46bbe.

Is this something wrong with my repo?

Laurent

Re: [Qemu-devel] [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat()

[Peter Maydell]

On 4 October 2016 at 18:02, Laurent Vivier <laurent@vivier.eu> wrote:
>
>
> Le 04/10/2016 à 15:13, Peter Maydell a écrit :
>> In commit 40df8c0c0722 support was added for target-specific
>
> I don't have commit 40df8c0c0722, I have
> ee8e76141b4dd00f8e97fda274876a17f9a46bbe.
>
> Is this something wrong with my repo?

No, I cut-n-pasted the wong commit hash into the commit message
by accident. The commit message should read "ee8e76141b4dd"
(the patch itself is correct I think).

thanks
-- PMM

Re: [Qemu-devel] [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat()

[Riku Voipio]

On Tue, Oct 04, 2016 at 06:13:47PM +0100, Peter Maydell wrote:
> On 4 October 2016 at 18:02, Laurent Vivier <laurent@vivier.eu> wrote:
> >
> >
> > Le 04/10/2016 à 15:13, Peter Maydell a écrit :
> >> In commit 40df8c0c0722 support was added for target-specific
> >
> > I don't have commit 40df8c0c0722, I have
> > ee8e76141b4dd00f8e97fda274876a17f9a46bbe.
> >
> > Is this something wrong with my repo?
> 
> No, I cut-n-pasted the wong commit hash into the commit message
> by accident. The commit message should read "ee8e76141b4dd"
> (the patch itself is correct I think).

Applied, thanks

Riku