From patchwork Fri Aug 8 16:23:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 378261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42DE2140085 for ; Sat, 9 Aug 2014 02:26:57 +1000 (EST) Received: from localhost ([::1]:51972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFn0J-0004Yx-4W for incoming@patchwork.ozlabs.org; Fri, 08 Aug 2014 12:26:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFmxd-0000NC-Sy for qemu-devel@nongnu.org; Fri, 08 Aug 2014 12:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFmxV-0004xj-Ji for qemu-devel@nongnu.org; Fri, 08 Aug 2014 12:24:09 -0400 Received: from s16892447.onlinehome-server.info ([82.165.15.123]:55853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFmxV-0004wP-EI for qemu-devel@nongnu.org; Fri, 08 Aug 2014 12:24:01 -0400 Received: from 5ec2b775.skybroadband.com ([94.194.183.117] helo=kentang.lan) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1XFmxO-0001Zx-Ek; Fri, 08 Aug 2014 17:23:55 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, kwolf@redhat.com, stefanha@redhat.com Date: Fri, 8 Aug 2014 17:23:34 +0100 Message-Id: <1407515016-26273-4-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407515016-26273-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1407515016-26273-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 94.194.183.117 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 3/5] cmd646: switch cmd646_update_irq() to accept PCIDevice instead of PCIIDEState 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 This is in preparation for adding configuration space accessors which accept PCIDevice as a parameter. Signed-off-by: Mark Cave-Ayland --- hw/ide/cmd646.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c3c6c53..11a3e52 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -48,7 +48,7 @@ #define UDIDETCR0 0x73 #define UDIDETCR1 0x7B -static void cmd646_update_irq(PCIIDEState *d); +static void cmd646_update_irq(PCIDevice *pd); static uint64_t cmd646_cmd_read(void *opaque, hwaddr addr, unsigned size) @@ -205,7 +205,7 @@ static void bmdma_write(void *opaque, hwaddr addr, pci_dev->config[MRDMODE] = (pci_dev->config[MRDMODE] & ~0x30) | (val & 0x30); cmd646_update_dma_interrupts(pci_dev); - cmd646_update_irq(bm->pci_dev); + cmd646_update_irq(pci_dev); break; case 2: bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); @@ -245,9 +245,8 @@ static void bmdma_setup_bar(PCIIDEState *d) /* XXX: call it also when the MRDMODE is changed from the PCI config registers */ -static void cmd646_update_irq(PCIIDEState *d) +static void cmd646_update_irq(PCIDevice *pd) { - PCIDevice *pd = PCI_DEVICE(d); int pci_level; pci_level = ((pd->config[MRDMODE] & MRDMODE_INTR_CH0) && @@ -271,7 +270,7 @@ static void cmd646_set_irq(void *opaque, int channel, int level) pd->config[MRDMODE] &= ~irq_mask; } cmd646_update_dma_interrupts(pd); - cmd646_update_irq(d); + cmd646_update_irq(pd); } static void cmd646_reset(void *opaque)