mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide/ich: QOM parent field cleanup

Browse Source 
Replace direct uses of AHCIPCIState::card with QOM casts and rename it
to parent_obj.

Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-06-30 14:19:24 +02:00
parent fd58922cf4
commit 0d3aea5603
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ide/ahci.c
View File

@ -117,12 +117,13 @@ static uint32_t ahci_port_read(AHCIState *s, int port, int offset)
static void ahci_irq_raise(AHCIState *s, AHCIDevice *dev) static void ahci_irq_raise(AHCIState *s, AHCIDevice *dev)
{ {
struct AHCIPCIState *d = container_of(s, AHCIPCIState, ahci); AHCIPCIState *d = container_of(s, AHCIPCIState, ahci);
PCIDevice *pci_dev = PCI_DEVICE(d);
DPRINTF(0, "raise irq\n"); DPRINTF(0, "raise irq\n");
if (msi_enabled(&d->card)) { if (msi_enabled(pci_dev)) {
msi_notify(&d->card, 0); msi_notify(pci_dev, 0);
} else { } else {
qemu_irq_raise(s->irq); qemu_irq_raise(s->irq);
} }
@ -130,11 +131,11 @@ static void ahci_irq_raise(AHCIState *s, AHCIDevice *dev)
static void ahci_irq_lower(AHCIState *s, AHCIDevice *dev) static void ahci_irq_lower(AHCIState *s, AHCIDevice *dev)
{ {
struct AHCIPCIState *d = container_of(s, AHCIPCIState, ahci); AHCIPCIState *d = container_of(s, AHCIPCIState, ahci);
DPRINTF(0, "lower irq\n"); DPRINTF(0, "lower irq\n");
if (!msi_enabled(&d->card)) { if (!msi_enabled(PCI_DEVICE(d))) {
qemu_irq_lower(s->irq); qemu_irq_lower(s->irq);
} }
} }

5
hw/ide/ahci.h
View File

@ -301,7 +301,10 @@ typedef struct AHCIState {
} AHCIState; } AHCIState;
typedef struct AHCIPCIState { typedef struct AHCIPCIState {
PCIDevice card; /*< private >*/
PCIDevice parent_obj;
/*< public >*/
AHCIState ahci; AHCIState ahci;
} AHCIPCIState; } AHCIPCIState;

22
hw/ide/ich.c
View File

@ -84,7 +84,7 @@ static const VMStateDescription vmstate_ich9_ahci = {
.unmigratable = 1, /* Still buggy under I/O load */ .unmigratable = 1, /* Still buggy under I/O load */
.version_id = 1, .version_id = 1,
.fields = (VMStateField []) { .fields = (VMStateField []) {
VMSTATE_PCI_DEVICE(card, AHCIPCIState), VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState),
VMSTATE_AHCI(ahci, AHCIPCIState), VMSTATE_AHCI(ahci, AHCIPCIState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
@ -106,30 +106,30 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
ahci_init(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6); ahci_init(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6);
pci_config_set_prog_interface(d->card.config, AHCI_PROGMODE_MAJOR_REV_1); pci_config_set_prog_interface(dev->config, AHCI_PROGMODE_MAJOR_REV_1);
d->card.config[PCI_CACHE_LINE_SIZE] = 0x08; /* Cache line size */ dev->config[PCI_CACHE_LINE_SIZE] = 0x08; /* Cache line size */
d->card.config[PCI_LATENCY_TIMER] = 0x00; /* Latency timer */ dev->config[PCI_LATENCY_TIMER] = 0x00; /* Latency timer */
pci_config_set_interrupt_pin(d->card.config, 1); pci_config_set_interrupt_pin(dev->config, 1);
/* XXX Software should program this register */ /* XXX Software should program this register */
d->card.config[0x90] = 1 << 6; /* Address Map Register - AHCI mode */ dev->config[0x90] = 1 << 6; /* Address Map Register - AHCI mode */
msi_init(dev, 0x50, 1, true, false); msi_init(dev, 0x50, 1, true, false);
d->ahci.irq = d->card.irq[0]; d->ahci.irq = dev->irq[0];
pci_register_bar(&d->card, ICH9_IDP_BAR, PCI_BASE_ADDRESS_SPACE_IO, pci_register_bar(dev, ICH9_IDP_BAR, PCI_BASE_ADDRESS_SPACE_IO,
&d->ahci.idp); &d->ahci.idp);
pci_register_bar(&d->card, ICH9_MEM_BAR, PCI_BASE_ADDRESS_SPACE_MEMORY, pci_register_bar(dev, ICH9_MEM_BAR, PCI_BASE_ADDRESS_SPACE_MEMORY,
&d->ahci.mem); &d->ahci.mem);
sata_cap_offset = pci_add_capability(&d->card, PCI_CAP_ID_SATA, sata_cap_offset = pci_add_capability(dev, PCI_CAP_ID_SATA,
ICH9_SATA_CAP_OFFSET, SATA_CAP_SIZE); ICH9_SATA_CAP_OFFSET, SATA_CAP_SIZE);
if (sata_cap_offset < 0) { if (sata_cap_offset < 0) {
return sata_cap_offset; return sata_cap_offset;
} }
sata_cap = d->card.config + sata_cap_offset; sata_cap = dev->config + sata_cap_offset;
pci_set_word(sata_cap + SATA_CAP_REV, 0x10); pci_set_word(sata_cap + SATA_CAP_REV, 0x10);
pci_set_long(sata_cap + SATA_CAP_BAR, pci_set_long(sata_cap + SATA_CAP_BAR,
(ICH9_IDP_BAR + 0x4) | (ICH9_IDP_INDEX_LOG2 << 4)); (ICH9_IDP_BAR + 0x4) | (ICH9_IDP_INDEX_LOG2 << 4));