From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36547 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKp7j-0005Iv-8B for qemu-devel@nongnu.org; Tue, 23 Nov 2010 04:25:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKp7e-0004z4-D4 for qemu-devel@nongnu.org; Tue, 23 Nov 2010 04:25:15 -0500 Received: from mail-bw0-f45.google.com ([209.85.214.45]:38017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKp7e-0004yk-8K for qemu-devel@nongnu.org; Tue, 23 Nov 2010 04:25:10 -0500 Received: by bwz16 with SMTP id 16so7163565bwz.4 for ; Tue, 23 Nov 2010 01:25:08 -0800 (PST) Date: Tue, 23 Nov 2010 10:05:56 +0100 From: "Edgar E. Iglesias" Subject: Re: [Qemu-devel] [PATCH 1/7] microblaze: target-ify target_ucontext Message-ID: <20101123090556.GA2876@edde.se.axis.com> References: <1290466678-6337-1-git-send-email-rth@twiddle.net> <1290466678-6337-2-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1290466678-6337-2-git-send-email-rth@twiddle.net> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org, aurelien@aurel32.net, Richard Henderson On Mon, Nov 22, 2010 at 02:57:52PM -0800, Richard Henderson wrote: > From: Richard Henderson > > Rename the members of target_ucontext so that they don't conflict > with possible host macros for ucontext members. This has already > been done for the other targets. Thanks, I applied this one. Cheers > > Signed-off-by: Richard Henderson > --- > linux-user/signal.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index 77683f7..7c62fac 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -3071,11 +3071,11 @@ struct target_stack_t { > }; > > struct target_ucontext { > - abi_ulong uc_flags; > - abi_ulong uc_link; > - struct target_stack_t uc_stack; > - struct target_sigcontext sc; > - uint32_t extramask[TARGET_NSIG_WORDS - 1]; > + abi_ulong tuc_flags; > + abi_ulong tuc_link; > + struct target_stack_t tuc_stack; > + struct target_sigcontext tuc_mcontext; > + uint32_t tuc_extramask[TARGET_NSIG_WORDS - 1]; > }; > > /* Signal frames. */ > @@ -3189,7 +3189,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, > goto badframe; > > /* Save the mask. */ > - err |= __put_user(set->sig[0], &frame->uc.sc.oldmask); > + err |= __put_user(set->sig[0], &frame->uc.tuc_mcontext.oldmask); > if (err) > goto badframe; > > @@ -3198,7 +3198,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, > goto badframe; > } > > - setup_sigcontext(&frame->uc.sc, env); > + setup_sigcontext(&frame->uc.tuc_mcontext, env); > > /* Set up to return from userspace. If provided, use a stub > already in userspace. */ > @@ -3261,7 +3261,7 @@ long do_sigreturn(CPUState *env) > goto badframe; > > /* Restore blocked signals */ > - if (__get_user(target_set.sig[0], &frame->uc.sc.oldmask)) > + if (__get_user(target_set.sig[0], &frame->uc.tuc_mcontext.oldmask)) > goto badframe; > for(i = 1; i < TARGET_NSIG_WORDS; i++) { > if (__get_user(target_set.sig[i], &frame->extramask[i - 1])) > @@ -3270,7 +3270,7 @@ long do_sigreturn(CPUState *env) > target_to_host_sigset_internal(&set, &target_set); > sigprocmask(SIG_SETMASK, &set, NULL); > > - restore_sigcontext(&frame->uc.sc, env); > + restore_sigcontext(&frame->uc.tuc_mcontext, env); > /* We got here through a sigreturn syscall, our path back is via an > rtb insn so setup r14 for that. */ > env->regs[14] = env->sregs[SR_PC]; > -- > 1.7.2.3 > >