From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:41727)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RaEwr-00039j-1v
	for qemu-devel@nongnu.org; Mon, 12 Dec 2011 18:06:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RaEwn-0002hu-VG
	for qemu-devel@nongnu.org; Mon, 12 Dec 2011 18:06:16 -0500
Received: from mail-gx0-f173.google.com ([209.85.161.173]:56111)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RaEwn-0002hk-Rm
	for qemu-devel@nongnu.org; Mon, 12 Dec 2011 18:06:13 -0500
Received: by ggnk1 with SMTP id k1so6942345ggn.4
	for <qemu-devel@nongnu.org>; Mon, 12 Dec 2011 15:06:13 -0800 (PST)
Message-ID: <4EE688E1.2030803@codemonkey.ws>
Date: Mon, 12 Dec 2011 17:06:09 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1323192845-7100-1-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1323192845-7100-1-git-send-email-pbonzini@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 0/2] split hw/hw.h
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

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
>