From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KNpUr-0001A7-UU
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 09:44:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KNpUq-00019T-7l
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 09:44:13 -0400
Received: from [199.232.76.173] (port=49031 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KNpUq-00019N-1j
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 09:44:12 -0400
Received: from an-out-0708.google.com ([209.85.132.246]:48607)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1KNpUp-0001WU-OC
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 09:44:11 -0400
Received: by an-out-0708.google.com with SMTP id d18so1829095and.130
	for <qemu-devel@nongnu.org>; Tue, 29 Jul 2008 06:44:11 -0700 (PDT)
Message-ID: <488F1E8A.5050403@codemonkey.ws>
Date: Tue, 29 Jul 2008 08:43:38 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH]: Fix i2c_bus_save, which fixes KVM live
	migration
References: <488EBEFC.5040603@redhat.com>
In-Reply-To: <488EBEFC.5040603@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Paul Brook <paul@codesourcery.com>, kvm@vger.kernel.org

Chris Lalancette wrote:
> Attached is a simple patch to make i2c_bus_save() put a 32-bit quantity in the
> save file, which matches what i2c_bus_load() expects to pull out of the save
> file later.  Without this fix in place, KVM live migration fails since the
> sender is only sending 1 byte while the receiver is waiting to receive 4 bytes.
>
> Avi, I don't know when you plan to next rebase KVM to upstream QEMU, but it's
> probably a good idea to carry this patch so that live migration works at all.
>
> Signed-off-by: Chris Lalancette <clalance@redhat.com>
>   
> diff --git a/qemu/hw/i2c.c b/qemu/hw/i2c.c
> index 5d283fb..f711db7 100644
> --- a/qemu/hw/i2c.c
> +++ b/qemu/hw/i2c.c
> @@ -21,7 +21,7 @@ static void i2c_bus_save(QEMUFile *f, void *opaque)
>  {
>      i2c_bus *bus = (i2c_bus *)opaque;
>  
> -    qemu_put_byte(f, bus->current_dev ? bus->current_dev->address : -1);
> +    qemu_put_be32(f, bus->current_dev ? bus->current_dev->address : -1);
>  }
>   

Looking at the code, I suspect it's really supposed to be a byte.  
Perhaps pbrook can clarify?

Regards,

Anthony Liguori


>  static int i2c_bus_load(QEMUFile *f, void *opaque, int version_id)
>