[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/19] hw/misc/edu: Convert to realize()
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 09/19] hw/misc/edu: Convert to realize() |
Date: |
Mon, 11 Jan 2016 11:41:48 +0300 |
From: Cao jin <address@hidden>
for educational PCI device
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/misc/edu.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index fe50b42..43d5b18 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -327,7 +327,7 @@ static void *edu_fact_thread(void *opaque)
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);
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,
"edu-mmio", 1 << 20);
pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio);
-
- return 0;
}
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);
- k->init = pci_edu_init;
+ k->realize = pci_edu_realize;
k->exit = pci_edu_uninit;
k->vendor_id = PCI_VENDOR_ID_QEMU;
k->device_id = 0x11e8;
--
2.1.4
- [Qemu-devel] [PULL 00/19] Trivial patches for 2016-01-11, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 01/19] unicore32: convert get_sp_from_cpustate from macro to inline, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 07/19] xen/Makefile.objs: simplify, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 05/19] MAINTAINERS: Add the correct device_tree.h file, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 08/19] configure: fix trace backend check, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 06/19] crypto: Fix typo in example, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 04/19] iscsi: fix readcapacity error message, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 14/19] scripts/checkpatch.pl: Don't allow special cases of unspaced operators, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 09/19] hw/misc/edu: Convert to realize(),
Michael Tokarev <=
- [Qemu-devel] [PULL 13/19] PCI Bonito: QOMify and cleanup, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 16/19] hw/ide: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 19/19] hw/s390x: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 18/19] hw/core/qdev: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 17/19] hw/acpi: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 12/19] SH PCI Host: convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 02/19] linux-user: enable sigaltstack for all architectures, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 11/19] gt64120: convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 10/19] Add missing syscall nrs. according to more recent Linux kernels, Michael Tokarev, 2016/01/11
- [Qemu-devel] [PULL 03/19] net: convert qemu_log to error_report, fix message, Michael Tokarev, 2016/01/11