openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/misc/edu: Convert to realize() 

for educational PCI device

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Cao jin 2015-12-18 16:55:35 +08:00 committed by Michael Tokarev
parent 713572a7b5
commit f922254c87
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/misc/edu.c
View File

@ -327,7 +327,7 @@ static void *edu_fact_thread(void *opaque)
return NULL; return NULL;
} }
static int pci_edu_init(PCIDevice *pdev) static void pci_edu_realize(PCIDevice *pdev, Error **errp)
{ {
EduState *edu = DO_UPCAST(EduState, pdev, pdev); EduState *edu = DO_UPCAST(EduState, pdev, pdev);
uint8_t *pci_conf = pdev->config; uint8_t *pci_conf = pdev->config;
@ -344,8 +344,6 @@ static int pci_edu_init(PCIDevice *pdev)
memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu,
"edu-mmio", 1 << 20); "edu-mmio", 1 << 20);
pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio); pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio);
return 0;
} }
static void pci_edu_uninit(PCIDevice *pdev) static void pci_edu_uninit(PCIDevice *pdev)
@ -385,7 +383,7 @@ static void edu_class_init(ObjectClass *class, void *data)
{ {
PCIDeviceClass *k = PCI_DEVICE_CLASS(class); PCIDeviceClass *k = PCI_DEVICE_CLASS(class);
k->init = pci_edu_init; k->realize = pci_edu_realize;
k->exit = pci_edu_uninit; k->exit = pci_edu_uninit;
k->vendor_id = PCI_VENDOR_ID_QEMU; k->vendor_id = PCI_VENDOR_ID_QEMU;
k->device_id = 0x11e8; k->device_id = 0x11e8;