From patchwork Wed Jun 8 16:21:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 99504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CDBC4B6FC1 for ; Thu, 9 Jun 2011 02:25:47 +1000 (EST) Received: from localhost ([::1]:33152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QULZf-0005s6-Ml for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 12:25:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QULW3-0005rC-4k for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:22:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QULW1-0004HQ-8j for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:21:58 -0400 Received: from goliath.siemens.de ([192.35.17.28]:25782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QULW0-0004Gk-3C for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:21:56 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p58GLqTs007297; Wed, 8 Jun 2011 18:21:53 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p58GLqIE019245; Wed, 8 Jun 2011 18:21:52 +0200 From: Jan Kiszka To: "Michael S. Tsirkin" Date: Wed, 8 Jun 2011 18:21:46 +0200 Message-Id: <134c6ed38c0ce2ad5b9c94ab3033b932bc202673.1307550106.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel Subject: [Qemu-devel] [PATCH v2 3/9] msi: Guard msi_reset with msi_present X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Jan Kiszka --- hw/msi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index b7a92c9..b039893 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -183,6 +183,10 @@ void msi_reset(PCIDevice *dev) uint16_t flags; bool msi64bit; + if (!msi_present(dev)) { + return; + } + flags = pci_get_word(dev->config + msi_flags_off(dev)); flags &= ~(PCI_MSI_FLAGS_QSIZE | PCI_MSI_FLAGS_ENABLE); msi64bit = flags & PCI_MSI_FLAGS_64BIT;