From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvBx4-0006ul-JR for qemu-devel@nongnu.org; Tue, 15 Jan 2013 14:13:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvBx2-0000Fg-2C for qemu-devel@nongnu.org; Tue, 15 Jan 2013 14:13:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvBx1-0000Fa-PV for qemu-devel@nongnu.org; Tue, 15 Jan 2013 14:13:35 -0500 Message-ID: <50F5AAD1.7050900@redhat.com> Date: Tue, 15 Jan 2013 20:15:29 +0100 From: Laszlo Ersek MIME-Version: 1.0 References: <20130115174238.GA9798@redhat.com> In-Reply-To: <20130115174238.GA9798@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] virtio-pci: fix irqfd cleanup argument order List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Paolo Bonzini , Anthony Liguori , qemu-devel@nongnu.org, Stefan Hajnoczi On 01/15/13 18:42, Michael S. Tsirkin wrote: > Order of arguments of kvm_virtio_pci_irqfd_release > got mixed up in all calls. > As a result users see assertions during cleanup. > > Reported-by: Laszlo Ersek > Signed-off-by: Michael S. Tsirkin > --- > > hw/virtio-pci.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index 0934246..212acd8 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -576,7 +576,7 @@ undo: > continue; > } > if (proxy->vdev->guest_notifier_mask) { > - kvm_virtio_pci_irqfd_release(proxy, vector, queue_no); > + kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > } > kvm_virtio_pci_vq_vector_release(proxy, vector); > } > @@ -602,7 +602,7 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) > * Otherwise, it was cleaned when masked in the frontend. > */ > if (proxy->vdev->guest_notifier_mask) { > - kvm_virtio_pci_irqfd_release(proxy, vector, queue_no); > + kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > } > kvm_virtio_pci_vq_vector_release(proxy, vector); > } > @@ -651,7 +651,7 @@ static void kvm_virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy, > if (proxy->vdev->guest_notifier_mask) { > proxy->vdev->guest_notifier_mask(proxy->vdev, queue_no, true); > } else { > - kvm_virtio_pci_irqfd_release(proxy, vector, queue_no); > + kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > } > } > Heh, even I can review this patch! Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek Thanks for the fix! Laszlo