ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macio: Delay qdev init until all fields are initialized 

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 <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2013-01-23 23:03:56 +00:00 committed by Alexander Graf
parent fcf1bbabf4
commit 7b925079e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/macio.c
View File

@ -82,7 +82,13 @@ static void macio_bar_setup(MacIOState *macio_state)
static int macio_initfn(PCIDevice *d) static int macio_initfn(PCIDevice *d)
{ {
MacIOState *s = MACIO(d);
d->config[0x3d] = 0x01; // interrupt on pin 1 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; return 0;
} }
@ -127,7 +133,7 @@ void macio_init (PCIBus *bus, int device_id, int is_oldworld,
MacIOState *macio_state; MacIOState *macio_state;
int i; int i;
d = pci_create_simple(bus, -1, TYPE_MACIO); d = pci_create(bus, -1, TYPE_MACIO);
macio_state = MACIO(d); macio_state = MACIO(d);
macio_state->is_oldworld = is_oldworld; 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); pci_config_set_device_id(d->config, device_id);
macio_bar_setup(macio_state); qdev_init_nofail(DEVICE(d));
pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &macio_state->bar);
} }