Re: [Qemu-devel] [PATCH v2 0/2] QOM'ify Alpha CPU

[Blue Swirl]

On Tue, Apr 10, 2012 at 22:40, Andreas Färber <address@hidden> wrote:
> Hello Richard,
>
> This series strips down my Alpha QOM'ification patch from the 
> qom-cpu-others.v1
> RFC series. Subclasses are postponed for now.
>
> Can you please retest and either provide Acked-bys again or send an instant 
> PULL?
>
> Available from:
> git://github.com/afaerber/qemu-cpu.git qom-cpu-alpha.v2
> https://github.com/afaerber/qemu-cpu/commits/qom-cpu-alpha.v2

Does not pull anymore:
Auto-merging target-i386/cpu.c
Auto-merging Makefile.target
Auto-merging target-alpha/cpu.h
Auto-merging target-ppc/helper.c
Auto-merging target-ppc/translate_init.c
CONFLICT (content): Merge conflict in target-ppc/translate_init.c
Automatic merge failed; fix conflicts and then commit the result.

Please rebase.

>
> Regards,
> Andreas
>
> Cc: Richard Henderson <address@hidden>
>
> v1 -> v2:
> * Split off from qom-cpu-others series, rebased onto qemu.git.
> * Move cpu.o down in Makefile.target, following Richard's AREG0 changes.
> * Update argument/variable naming to avoid "klass" and to use ..._type_info.
> * Drop subclasses for now and leave TYPE_ALPHA_CPU non-abstract.
>
> Andreas Färber (2):
>  target-alpha: QOM'ify CPU
>  target-alpha: QOM'ify CPU init
>
>  Makefile.target          |    1 +
>  target-alpha/cpu-qom.h   |   71 
> ++++++++++++++++++++++++++++++++++++++++++++++
>  target-alpha/cpu.c       |   58 +++++++++++++++++++++++++++++++++++++
>  target-alpha/cpu.h       |    1 +
>  target-alpha/translate.c |   16 ++--------
>  5 files changed, 135 insertions(+), 12 deletions(-)
>  create mode 100644 target-alpha/cpu-qom.h
>  create mode 100644 target-alpha/cpu.c
>
> --
> 1.7.7
>
>