[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] block/nand: Convert Sysbus::init to Device::real
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 7/8] block/nand: Convert Sysbus::init to Device::realize |
Date: |
Tue, 25 Jun 2013 19:21:55 +0100 |
From: Peter Crosthwaite <address@hidden>
The prescribed transition from Sysbus::init function to a
Device::realize.
Cc: address@hidden
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/block/nand.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 861e893..a0232d1 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -367,7 +367,7 @@ static const VMStateDescription vmstate_nand = {
}
};
-static int nand_device_init(SysBusDevice *dev)
+static void nand_realize(DeviceState *dev, Error **errp)
{
int pagesize;
NANDFlashState *s = NAND(dev);
@@ -393,16 +393,17 @@ static int nand_device_init(SysBusDevice *dev)
nand_init_2048(s);
break;
default:
- error_report("Unsupported NAND block size");
- return -1;
+ error_setg(errp, "Unsupported NAND block size %#x\n",
+ 1 << s->page_shift);
+ return;
}
pagesize = 1 << s->oob_shift;
s->mem_oob = 1;
if (s->bdrv) {
if (bdrv_is_read_only(s->bdrv)) {
- error_report("Can't use a read-only drive");
- return -1;
+ error_setg(errp, "Can't use a read-only drive");
+ return;
}
if (bdrv_getlength(s->bdrv) >=
(s->pages << s->page_shift) + (s->pages << s->oob_shift)) {
@@ -418,8 +419,6 @@ static int nand_device_init(SysBusDevice *dev)
}
/* Give s->ioaddr a sane value in case we save state before it is used. */
s->ioaddr = s->io;
-
- return 0;
}
static Property nand_properties[] = {
@@ -432,9 +431,8 @@ static Property nand_properties[] = {
static void nand_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = nand_device_init;
+ dc->realize = nand_realize;
dc->reset = nand_reset;
dc->vmsd = &vmstate_nand;
dc->props = nand_properties;
--
1.7.9.5
- [Qemu-devel] [PULL 0/8] arm-devs queue, Peter Maydell, 2013/06/25
- [Qemu-devel] [PULL 1/8] ARM: Allow dumping of device tree, Peter Maydell, 2013/06/25
- [Qemu-devel] [PULL 8/8] nand: Don't inherit from Sysbus, Peter Maydell, 2013/06/25
- [Qemu-devel] [PULL 7/8] block/nand: Convert Sysbus::init to Device::realize,
Peter Maydell <=
- [Qemu-devel] [PULL 3/8] i.MX: Rework functions/types name and use new style initialization, Peter Maydell, 2013/06/25
- [Qemu-devel] [PULL 4/8] arm/boot: Free dtb blob memory after use, Peter Maydell, 2013/06/25
- [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Peter Maydell, 2013/06/25
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Paolo Bonzini, 2013/06/25
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Peter Maydell, 2013/06/25
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Paolo Bonzini, 2013/06/26
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., jcd, 2013/06/26
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Paolo Bonzini, 2013/06/26
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., jcd, 2013/06/26
- Re: [Qemu-devel] [PULL 2/8] i.MX: Implement a more complete version of the GPT timer., Peter Crosthwaite, 2013/06/26