From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: [PATCH] device-assignment: Clear assigned_dev irq type Date: Tue, 29 Jun 2010 11:51:54 -0600 Message-ID: <20100629175103.5078.11134.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: quintela@redhat.com, chrisw@redhat.com, alex.williamson@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:1025 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239Ab0F2Rvz (ORCPT ); Tue, 29 Jun 2010 13:51:55 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5THptOs008108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 29 Jun 2010 13:51:55 -0400 Sender: kvm-owner@vger.kernel.org List-ID: Commit 96abccb5 cleared assigned_irq_data.flags when an irq is disabled, but what we really want is to clear assigned_dev->irq_requested_type. Signed-off-by: Alex Williamson Found-by: Juan Quintela --- hw/device-assignment.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 585162b..48ac73c 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1044,7 +1044,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) if (r && r != -ENXIO) perror("assigned_dev_update_msi: deassign irq"); - assigned_irq_data.flags = 0; + assigned_dev->irq_requested_type = 0; } if (ctrl_byte & PCI_MSI_FLAGS_ENABLE) { @@ -1208,7 +1208,7 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos) if (r && r != -ENXIO) perror("assigned_dev_update_msix: deassign irq"); - assigned_irq_data.flags = 0; + assigned_dev->irq_requested_type = 0; } if (*ctrl_word & PCI_MSIX_ENABLE) {