From: Juan Quintela <quintela@redhat.com>
Date: Wed, 7 Oct 2009 14:56:29 +0000 (+0200)
Subject: ide: BMDMAState don't need a pci_dev field anymore
X-Git-Tag: v0.12.0-rc0~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1570baa5790d3c529a60120539193a58cd31229;p=thirdparty%2Fqemu.git

ide: BMDMAState don't need a pci_dev field anymore

Patchworks-ID: 35306
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 3b5362d0e28..5c8f615258a 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 21319fefd42..2e404311045 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 4583c42ec8a..ddce6847df3 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);