From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Lalancette Subject: [PATCH]: Fix i2c_bus_save, which fixes KVM live migration Date: Tue, 29 Jul 2008 08:55:56 +0200 Message-ID: <488EBEFC.5040603@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020904050905020503090104" Cc: kvm@vger.kernel.org, Avi Kivity To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([66.187.233.31]:34095 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbYG2G5f (ORCPT ); Tue, 29 Jul 2008 02:57:35 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------020904050905020503090104 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 --------------020904050905020503090104 Content-Type: text/x-patch; name="qemu-i2c-migrate-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="qemu-i2c-migrate-fix.patch" 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); } static int i2c_bus_load(QEMUFile *f, void *opaque, int version_id) --------------020904050905020503090104--