Patchwork [12/12] ide: BMDMAState don't need a pci_dev field anymore

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 2:56 p.m.
Message ID <32c8375f80a51c4a92b2c979ff69259e4cbe6e70.1254927187.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35306/
State Under Review
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 2:56 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/ide/cmd646.c   |    1 -
 hw/ide/internal.h |    1 -
 hw/ide/piix.c     |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

Patch

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);