Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OBAuQ-0001dS-MV for qemu-devel@nongnu.org; Sun, 09 May 2010 14:07:22 -0400 Received: from [140.186.70.92] (port=57355 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBAuP-0001dK-DF for qemu-devel@nongnu.org; Sun, 09 May 2010 14:07:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OBAuN-0003Id-Tc for qemu-devel@nongnu.org; Sun, 09 May 2010 14:07:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38355) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OBAuN-0003IR-ME for qemu-devel@nongnu.org; Sun, 09 May 2010 14:07:19 -0400 From: Juan Quintela In-Reply-To: <20100509161503.GA20492@redhat.com> (Michael S. Tsirkin's message of "Sun, 9 May 2010 19:15:16 +0300") References: <20100509161503.GA20492@redhat.com> Date: Sun, 09 May 2010 20:07:14 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH master+0.12] pci: irq_state vmstate breakage List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org "Michael S. Tsirkin" wrote: > Code for saving irq_state got vm_state > macros wrong, passing in the wrong parameter. > As a result, we both saved a wrong value > and restored it to a wrong offset. > > This leads to device and bus irq counts getting > out of sync, which in turn leads to interrupts getting lost or > never cleared, such as > https://bugzilla.redhat.com/show_bug.cgi?id=588133 > > Signed-off-by: Michael S. Tsirkin Acked-by: Juan Quintela Code is "obviously" wrong (TM). I didn't catch it when it was introduced. How can it ever have worked since that commit? > --- > > Juan, could you please take a look at this patch? > I managed to catch this bug by looking at > a savevm image which already has a wrong value, > but I could not reproduce it locally so I don't know > for sure whether patch is enough, or there are other bugs. > > Anthony, this is a regression introduced in > eea4acfa5c1ef26439a718375475fe468b7f2fba > so we need the fix on 0.12 branch as well. > > hw/pci.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 95bfa3d..5452b86 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -325,7 +325,7 @@ static VMStateInfo vmstate_info_pci_config = { > > static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) > { > - PCIDevice *s = container_of(pv, PCIDevice, config); > + PCIDevice *s = container_of(pv, PCIDevice, irq_state); > uint32_t irq_state[PCI_NUM_PINS]; > int i; > for (i = 0; i < PCI_NUM_PINS; ++i) { > @@ -347,7 +347,7 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) > static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size) > { > int i; > - PCIDevice *s = container_of(pv, PCIDevice, config); > + PCIDevice *s = container_of(pv, PCIDevice, irq_state); > > for (i = 0; i < PCI_NUM_PINS; ++i) { > qemu_put_be32(f, pci_irq_state(s, i));