Re: [Qemu-devel] [PATCH 0/2] split hw/hw.h

[Anthony Liguori <anthony@codemonkey.ws>]

On 12/06/2011 11:34 AM, Paolo Bonzini wrote:
> Extract qemu-file.h and vmstate.h from it.  Last for this week, promised.

This conflicts badly for me.  Can you rebase?

Regards,

Anthony Liguori

>
> Paolo Bonzini (2):
>    ptimer: move declarations to ptimer.h
>    vmstate: extract declarations out of hw/hw.h
>
>   hw/arm_timer.c        |    1 +
>   hw/etraxfs_timer.c    |    1 +
>   hw/grlib_apbuart.c    |    1 +
>   hw/grlib_gptimer.c    |    1 +
>   hw/hid.h              |   23 ++
>   hw/hw.h               |  882 +------------------------------------------------
>   hw/i2c.h              |   10 +
>   hw/lan9118.c          |    1 +
>   hw/leon3.c            |    1 +
>   hw/lm32_timer.c       |    1 +
>   hw/mcf5206.c          |    1 +
>   hw/mcf5208.c          |    1 +
>   hw/milkymist-sysctl.c |    1 +
>   hw/musicpal.c         |    1 +
>   hw/pcie.h             |   11 +
>   hw/ptimer.c           |    1 +
>   hw/ptimer.h           |   39 +++
>   hw/sh_timer.c         |    1 +
>   hw/slavio_timer.c     |    1 +
>   hw/syborg_timer.c     |    1 +
>   hw/usb.h              |   12 +
>   hw/xilinx_axidma.c    |    1 +
>   hw/xilinx_timer.c     |    1 +
>   net.h                 |   13 +
>   qemu-file.h           |  232 +++++++++++++
>   qemu-timer.h          |   13 -
>   vmstate.h             |  613 ++++++++++++++++++++++++++++++++++
>   27 files changed, 972 insertions(+), 893 deletions(-)
>   create mode 100644 hw/ptimer.h
>   create mode 100644 qemu-file.h
>   create mode 100644 vmstate.h
>