[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 11/19] gt64120: convert to realize()
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 11/19] gt64120: convert to realize() |
Date: |
Mon, 11 Jan 2016 11:41:50 +0300 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/mips/gt64xxx_pci.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index f76a9fd..c1f3c9c 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -1193,7 +1193,7 @@ static int gt64120_init(SysBusDevice *dev)
return 0;
}
-static int gt64120_pci_init(PCIDevice *d)
+static void gt64120_pci_realize(PCIDevice *d, Error **errp)
{
/* FIXME: Malta specific hw assumptions ahead */
pci_set_word(d->config + PCI_COMMAND, 0);
@@ -1207,8 +1207,6 @@ static int gt64120_pci_init(PCIDevice *d)
pci_set_long(d->config + PCI_BASE_ADDRESS_4, 0x14000000);
pci_set_long(d->config + PCI_BASE_ADDRESS_5, 0x14000001);
pci_set_byte(d->config + 0x3d, 0x01);
-
- return 0;
}
static void gt64120_pci_class_init(ObjectClass *klass, void *data)
@@ -1216,7 +1214,7 @@ static void gt64120_pci_class_init(ObjectClass *klass,
void *data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
- k->init = gt64120_pci_init;
+ k->realize = gt64120_pci_realize;
k->vendor_id = PCI_VENDOR_ID_MARVELL;
k->device_id = PCI_DEVICE_ID_MARVELL_GT6412X;
k->revision = 0x10;
--
2.1.4
- [Qemu-trivial] [PULL 14/19] scripts/checkpatch.pl: Don't allow special cases of unspaced operators, (continued)
- [Qemu-trivial] [PULL 14/19] scripts/checkpatch.pl: Don't allow special cases of unspaced operators, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 09/19] hw/misc/edu: Convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 04/19] iscsi: fix readcapacity error message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 13/19] PCI Bonito: QOMify and cleanup, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 16/19] hw/ide: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 19/19] hw/s390x: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 18/19] hw/core/qdev: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 17/19] hw/acpi: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 10/19] Add missing syscall nrs. according to more recent Linux kernels, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 11/19] gt64120: convert to realize(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 03/19] net: convert qemu_log to error_report, fix message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 02/19] linux-user: enable sigaltstack for all architectures, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 12/19] SH PCI Host: convert to realize(), Michael Tokarev, 2016/01/11
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/19] Trivial patches for 2016-01-11, Peter Maydell, 2016/01/11