From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axtAB-0002QT-6u for qemu-devel@nongnu.org; Wed, 04 May 2016 05:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axt9z-0003AU-DF for qemu-devel@nongnu.org; Wed, 04 May 2016 05:32:05 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:35329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axt9y-00032u-3q for qemu-devel@nongnu.org; Wed, 04 May 2016 05:31:59 -0400 Received: by mail-wm0-x22a.google.com with SMTP id e201so179425114wme.0 for ; Wed, 04 May 2016 02:31:37 -0700 (PDT) References: <1461987197-31264-1-git-send-email-cota@braap.org> <1461987197-31264-14-git-send-email-cota@braap.org> <87twifr3ss.fsf@linaro.org> <20160503172613.GA27503@flamenco> <5c2f2baa-93e8-22c5-a48b-1e5c85b17676@twiddle.net> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <5c2f2baa-93e8-22c5-a48b-1e5c85b17676@twiddle.net> Date: Wed, 04 May 2016 10:31:44 +0100 Message-ID: <87oa8mqidb.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 13/14] tb hash: track translated blocks with qht List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: "Emilio G. Cota" , QEMU Developers , MTTCG Devel , Paolo Bonzini , Peter Crosthwaite , Sergey Fedorov Richard Henderson writes: > On 05/03/2016 07:26 AM, Emilio G. Cota wrote: >> On Tue, May 03, 2016 at 08:36:35 +0100, Alex Bennée wrote: >>> Emilio G. Cota writes: >>>> static TranslationBlock *tb_find_physical(CPUState *cpu, >>>> target_ulong pc, >>>> target_ulong cs_base, >>>> uint32_t flags) >>> >>> This does not apply cleanly to master due to the flag change. You should >>> either reference the clean-up patch or include it in the series. >> >> Ouch, sorry. Won't happen again. >> >> Grab the missing pre-requisite patch from: >> http://patchwork.ozlabs.org/patch/607662/mbox/ > > Well, that said, there are further conflicts within my tcg-next tree. > If you'll rebase on > > git://github.com/rth7680/qemu.git tcg-next FYI I did build a tree on which to base the rest of the MTTCG work: https://github.com/stsquad/qemu/commits/mttcg/tcg-next-plus-qht > > I'll queue the patchset for 2.7. > > > r~ -- Alex Bennée