From patchwork Wed Oct 7 14:56:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35306 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 6C6D7B7B9C for ; Thu, 8 Oct 2009 02:24:04 +1100 (EST) Received: from localhost ([127.0.0.1]:52994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvYMz-00074T-4M for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2009 11:24:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvXx3-0003Ed-Ja for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvXww-000333-7Y for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:11 -0400 Received: from [199.232.76.173] (port=55168 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvXwv-00032d-SW for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25706) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvXwv-0003gZ-7I for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:05 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n97Ev470031203 for ; Wed, 7 Oct 2009 10:57:04 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n97Eulo0016943; Wed, 7 Oct 2009 10:57:03 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Oct 2009 16:56:29 +0200 Message-Id: <32c8375f80a51c4a92b2c979ff69259e4cbe6e70.1254927187.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 12/12] ide: BMDMAState don't need a pci_dev field anymore 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 Signed-off-by: Juan Quintela --- hw/ide/cmd646.c | 1 - hw/ide/internal.h | 1 - hw/ide/piix.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 4af1954..e62949e 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -144,7 +144,6 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, for(i = 0;i < 2; i++) { BMDMAState *bm = &d->bmdma[i]; d->bus[i].bmdma = bm; - bm->pci_dev = DO_UPCAST(PCIIDEState, dev, pci_dev); bm->bus = d->bus+i; qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 21319fe..2e40431 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -473,7 +473,6 @@ struct BMDMAState { uint8_t status; uint32_t addr; - struct PCIIDEState *pci_dev; IDEBus *bus; /* current transfer state */ uint32_t cur_addr; diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 4583c42..ddce684 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -77,7 +77,6 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, for(i = 0;i < 2; i++) { BMDMAState *bm = &d->bmdma[i]; d->bus[i].bmdma = bm; - bm->pci_dev = DO_UPCAST(PCIIDEState, dev, pci_dev); bm->bus = d->bus+i; qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm);