[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH for-1.4 v4 03/12] macio: Delay qdev init until all fie
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PATCH for-1.4 v4 03/12] macio: Delay qdev init until all fields are initialized |
Date: |
Thu, 24 Jan 2013 10:03:56 +0100 |
This turns macio_bar_setup() into an implementation detail of the qdev
initfn, to be removed step by step.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/macio.c | 11 ++++++++---
1 Datei geändert, 8 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/hw/macio.c b/hw/macio.c
index 770e3bd..8b4b48d 100644
--- a/hw/macio.c
+++ b/hw/macio.c
@@ -82,7 +82,13 @@ static void macio_bar_setup(MacIOState *macio_state)
static int macio_initfn(PCIDevice *d)
{
+ MacIOState *s = MACIO(d);
+
d->config[0x3d] = 0x01; // interrupt on pin 1
+
+ macio_bar_setup(s);
+ pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar);
+
return 0;
}
@@ -127,7 +133,7 @@ void macio_init (PCIBus *bus, int device_id, int
is_oldworld,
MacIOState *macio_state;
int i;
- d = pci_create_simple(bus, -1, TYPE_MACIO);
+ d = pci_create(bus, -1, TYPE_MACIO);
macio_state = MACIO(d);
macio_state->is_oldworld = is_oldworld;
@@ -148,6 +154,5 @@ void macio_init (PCIBus *bus, int device_id, int
is_oldworld,
pci_config_set_device_id(d->config, device_id);
- macio_bar_setup(macio_state);
- pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &macio_state->bar);
+ qdev_init_nofail(DEVICE(d));
}
--
1.7.10.4
- [Qemu-ppc] [PATCH for-1.4 v4 00/12] target-ppc: MacIO QOM'ification, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 01/12] ppc: Move Mac machines to hw/ppc/, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 02/12] macio: QOM'ify some more, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 03/12] macio: Delay qdev init until all fields are initialized,
Andreas Färber <=
- [Qemu-ppc] [PATCH for-1.4 v4 06/12] mac_nvram: Mark as Big Endian, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 10/12] adb: QOM'ify Apple Desktop Bus, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 05/12] mac_nvram: Clean up public API, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 09/12] cuda: QOM'ify CUDA, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 07/12] mac_nvram: QOM'ify MacIO NVRAM, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 08/12] ide/macio: QOM'ify MacIO IDE, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 12/12] cuda: Move ADB bus into CUDA state, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 04/12] macio: Split MacIO in two, Andreas Färber, 2013/01/24
- [Qemu-ppc] [PATCH for-1.4 v4 11/12] adb: QOM'ify ADB devices, Andreas Färber, 2013/01/24
- Re: [Qemu-ppc] [PATCH for-1.4 v4 00/12] target-ppc: MacIO QOM'ification, Alexander Graf, 2013/01/24