[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/12] ide: Remove cast in pci_register_bar
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 02/12] ide: Remove cast in pci_register_bar |
Date: |
Wed, 7 Oct 2009 16:56:19 +0200 |
We already have a PCIDevice at that point
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ide/pci.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 0e2c7d7..9d7fdd4 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -413,16 +413,11 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
pci_conf[0x51] |= 0x08; /* enable IDE1 */
}
- pci_register_bar((PCIDevice *)d, 0, 0x8,
- PCI_ADDRESS_SPACE_IO, ide_map);
- pci_register_bar((PCIDevice *)d, 1, 0x4,
- PCI_ADDRESS_SPACE_IO, ide_map);
- pci_register_bar((PCIDevice *)d, 2, 0x8,
- PCI_ADDRESS_SPACE_IO, ide_map);
- pci_register_bar((PCIDevice *)d, 3, 0x4,
- PCI_ADDRESS_SPACE_IO, ide_map);
- pci_register_bar((PCIDevice *)d, 4, 0x10,
- PCI_ADDRESS_SPACE_IO, bmdma_map);
+ pci_register_bar(dev, 0, 0x8, PCI_ADDRESS_SPACE_IO, ide_map);
+ pci_register_bar(dev, 1, 0x4, PCI_ADDRESS_SPACE_IO, ide_map);
+ pci_register_bar(dev, 2, 0x8, PCI_ADDRESS_SPACE_IO, ide_map);
+ pci_register_bar(dev, 3, 0x4, PCI_ADDRESS_SPACE_IO, ide_map);
+ pci_register_bar(dev, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map);
pci_conf[0x3d] = 0x01; // interrupt on pin 1
@@ -477,8 +472,7 @@ static int pci_piix_ide_initfn(PCIIDEState *d)
qemu_register_reset(piix3_reset, d);
piix3_reset(d);
- pci_register_bar((PCIDevice *)d, 4, 0x10,
- PCI_ADDRESS_SPACE_IO, bmdma_map);
+ pci_register_bar(&d->dev, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map);
register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/12] PCI IDE cleanup, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 01/12] ide: change cast to DO_UPCAST, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 02/12] ide: Remove cast in pci_register_bar,
Juan Quintela <=
- [Qemu-devel] [PATCH 03/12] ide: Remove duplicated definitions, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 04/12] ide: remove uselsess casts from void *, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 06/12] ide: export needed ide-pci functions for split, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 05/12] ide: create ide/pci.h for common ide pci definitions, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 07/12] ide: split cmd646 and piix from pci.c, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 08/12] ide: PCIIDEState type field is not needed anymore, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 09/12] ide: 'secondary' field is only used by cmd646, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 10/12] ide: cmd646 we can get the pci device with container_of, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 12/12] ide: BMDMAState don't need a pci_dev field anymore, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 11/12] ide: cmd646 ->unit has just the value that we want, Juan Quintela, 2009/10/07