From patchwork Tue Nov 2 05:37:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 69863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38B4AB70E9 for ; Tue, 2 Nov 2010 16:44:00 +1100 (EST) Received: from localhost ([127.0.0.1]:40596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9f3-000286-Cy for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2010 01:43:57 -0400 Received: from [140.186.70.92] (port=55106 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9Z6-0008PI-1i for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD9Z5-0003K8-0l for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD9Z4-0003K1-PE for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:46 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA25bk7N001906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 Nov 2010 01:37:46 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA25bjdo005385; Tue, 2 Nov 2010 01:37:45 -0400 From: Alex Williamson To: mst@redhat.com, yamahata@valinux.co.jp Date: Mon, 01 Nov 2010 23:37:45 -0600 Message-ID: <20101102053738.10424.81682.stgit@s20.home> In-Reply-To: <20101102053544.10424.42769.stgit@s20.home> References: <20101102053544.10424.42769.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/3] msi: Cleanup uninit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This makes msi_uninit more similar to msix_uninit, doing nothing if not enable, clearing msi_cap and capability flag. Signed-off-by: Alex Williamson --- hw/msi.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index 0ad4e38..110859b 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -170,9 +170,15 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, void msi_uninit(struct PCIDevice *dev) { - uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); - uint8_t cap_size = msi_cap_sizeof(flags); + uint8_t cap_size; + + if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) + return; + + cap_size = msi_cap_sizeof(pci_get_word(dev->config + msi_flags_off(dev))); pci_del_capability(dev, PCI_CAP_ID_MSIX, cap_size); + dev->msi_cap = 0; + dev->cap_present &= ~QEMU_PCI_CAP_MSI; MSI_DEV_PRINTF(dev, "uninit\n"); }