From patchwork Fri May 11 14:42:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 158535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A25F6B6FC5 for ; Sat, 12 May 2012 01:17:12 +1000 (EST) Received: from localhost ([::1]:40990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSr4V-0005qG-Th for incoming@patchwork.ozlabs.org; Fri, 11 May 2012 10:43:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSr3m-00040v-Mk for qemu-devel@nongnu.org; Fri, 11 May 2012 10:43:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSr3d-0003E9-QJ for qemu-devel@nongnu.org; Fri, 11 May 2012 10:43:10 -0400 Received: from goliath.siemens.de ([192.35.17.28]:21000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSr3d-0003DV-Gu for qemu-devel@nongnu.org; Fri, 11 May 2012 10:43:01 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q4BEgxUT012344; Fri, 11 May 2012 16:42:59 +0200 Received: from mchn199C.mchp.siemens.de ([139.22.114.193]) by mail1.siemens.de (8.13.6/8.13.6) with SMTP id q4BEgiv6026375; Fri, 11 May 2012 16:42:58 +0200 From: Jan Kiszka To: "Michael S. Tsirkin" Date: Fri, 11 May 2012 11:42:39 -0300 Message-Id: <9d03dc4ba8e46b2848d61e46a117853f6dc712fd.1336747349.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 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 v3 6/8] msi: Guard msi/msix_write_config 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 Terminate msi/msix_write_config early if support is not enabled. This allows to remove checks at the caller site if MSI is optional. Signed-off-by: Jan Kiszka --- hw/msi.c | 3 ++- hw/msix.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index b2903fc..da12f33 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -276,7 +276,8 @@ void msi_write_config(PCIDevice *dev, uint32_t addr, uint32_t val, int len) unsigned int vector; uint32_t pending; - if (!ranges_overlap(addr, len, dev->msi_cap, msi_cap_sizeof(flags))) { + if (!msi_present(dev) || + !ranges_overlap(addr, len, dev->msi_cap, msi_cap_sizeof(flags))) { return; } diff --git a/hw/msix.c b/hw/msix.c index 3835eaa..84915d8 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -157,7 +157,7 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, int vector; bool was_masked; - if (!range_covers_byte(addr, len, enable_pos)) { + if (!msix_present(dev) || !range_covers_byte(addr, len, enable_pos)) { return; }