From patchwork Tue Jun 29 17:51:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 108636 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5TIDP4b009150 for ; Tue, 29 Jun 2010 18:21:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639Ab0F2Rv5 (ORCPT ); Tue, 29 Jun 2010 13:51:57 -0400 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 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5THpsxg018754; Tue, 29 Jun 2010 13:51:54 -0400 From: Alex Williamson Subject: [PATCH] device-assignment: Clear assigned_dev irq type To: kvm@vger.kernel.org Cc: quintela@redhat.com, chrisw@redhat.com, alex.williamson@redhat.com Date: Tue, 29 Jun 2010 11:51:54 -0600 Message-ID: <20100629175103.5078.11134.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 29 Jun 2010 18:21:40 +0000 (UTC) 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) {