aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>2013-06-18 21:11:52 +1000
committerPeter Maydell <peter.maydell@linaro.org>2013-06-25 19:15:45 +0100
commitd47a5d9b9dda19f975320b72c386c581dad32c7a (patch)
tree449efa5ded7434923a9e5b29d49a41fc19f21216
parente12078cc62f2b4a947903efef803ab1b2e13cfa1 (diff)
downloadqemu-arm-d47a5d9b9dda19f975320b72c386c581dad32c7a.tar.gz
block/nand: Convert Sysbus::init to Device::realize
The prescribed transition from Sysbus::init function to a Device::realize. Cc: afaerber@suse.de Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/block/nand.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 861e893eb2..a0232d1849 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;