From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an78u-0004Ht-Sy for qemu-devel@nongnu.org; Mon, 04 Apr 2016 12:14:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1an78p-0003po-QB for qemu-devel@nongnu.org; Mon, 04 Apr 2016 12:14:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an78n-0003pb-Uw for qemu-devel@nongnu.org; Mon, 04 Apr 2016 12:14:15 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E7098EA3B for ; Mon, 4 Apr 2016 16:14:13 +0000 (UTC) References: <1459785281-6686-1-git-send-email-dgilbert@redhat.com> From: Marcel Apfelbaum Message-ID: <570292CF.10305@redhat.com> Date: Mon, 4 Apr 2016 19:14:07 +0300 MIME-Version: 1.0 In-Reply-To: <1459785281-6686-1-git-send-email-dgilbert@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Migration: Add i82801b11 migration data List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org, mst@redhat.com Cc: amit.shah@redhat.com, jsnow@redhat.com, quintela@redhat.com On 04/04/2016 06:54 PM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > The i82801b11 bridge didn't have a vmsd and thus didn't send > any migration data, including that of its parent PCIBridge object. > The symptom being if the guest used any devices behind the bridge > the guest crashed (mostly with various interrupt related issues). > > Note: This will cause migration from old qemus that used this device to > explicitly fail during migration as opposed to the guest crashing. > > Signed-off-by: Dr. David Alan Gilbert > Suggested-by: Marcel Apfelbaum > --- > hw/pci-bridge/i82801b11.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c > index 5c40708..2404e7e 100644 > --- a/hw/pci-bridge/i82801b11.c > +++ b/hw/pci-bridge/i82801b11.c > @@ -78,6 +78,14 @@ err_bridge: > return rc; > } > > +static const VMStateDescription i82801b11_bridge_dev_vmstate = { > + .name = "i82801b11_bridge", > + .fields = (VMStateField[]) { > + VMSTATE_PCI_DEVICE(parent_obj, PCIBridge), > + VMSTATE_END_OF_LIST() > + } > +}; > + > static void i82801b11_bridge_class_init(ObjectClass *klass, void *data) > { > PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > @@ -89,6 +97,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data) > k->revision = ICH9_D2P_A2_REVISION; > k->init = i82801b11_bridge_initfn; > k->config_write = pci_bridge_write_config; > + dc->vmsd = &i82801b11_bridge_dev_vmstate; > set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > } > > If this patch was enough we got lucky :) Is not too late to make it to 2.6, right? Reviewed-by: Marcel Apfelbaum Thanks, Marcel