Re: [Qemu-devel] [PATCH 0/3] disas/libvixl: update to upstream 1.3

[Christoffer Dall]

On 24 April 2014 21:11, Peter Maydell <address@hidden> wrote:
>
> This patchset updates our copy of libvixl to the upstream
> 1.3 release. I don't think there's anything particularly
> earthshattering in 1.3 compared to what we had before.
>
> I had a bit of a dilemma with this patchset:
>  * separate out the "pristine upstream files" from the
>    "reapply local fixes" commits
>  * retain bisectability of compilation on all hosts
>
> I've opted for the former, because I think it will make
> future upgrades easier -- we can easily see what our
> local-to-QEMU changes are and reapply them next time
> round if required. However it does have the disadvantage
> that between the commits in this series the 32 bit
> hosts won't compile :-(
>
> Possible options:
>  (a) apply these patches, and live with the bisection
>      break on 32 bit hosts
>  (b) squash all these patches together into a single
>      commit, avoiding the bisection break but losing the
>      ability to see the local changes
>  (c) add a patch at the start which nobbles configure
>      to never set CONFIG_ARM_A64_DIS=y, and then another
>      at the end which reenables it
>
> Opinions?
>
I think being able to easily distinguish the pristine upstream files
from the QEMU versions and point out local changes is absolutely
important to maintain some sort of integration between these two open
source projects.

I can live with (a), but option (c) does seem to be an improvement on
that with no additional disadvantages.

-Christoffer