Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-05 19:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block/nand: Convert Sysbus::init to Device::realize

Browse Source 
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>
This commit is contained in:
Peter Crosthwaite 2013-06-18 21:11:52 +10:00 committed by Peter Maydell
parent e12078cc62
commit d47a5d9b9d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/block/nand.c
View File

@ -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; int pagesize;
NANDFlashState *s = NAND(dev); NANDFlashState *s = NAND(dev);
@ -393,16 +393,17 @@ static int nand_device_init(SysBusDevice *dev)
nand_init_2048(s); nand_init_2048(s);
break; break;
default: default:
error_report("Unsupported NAND block size"); error_setg(errp, "Unsupported NAND block size %#x\n",
return -1; 1 << s->page_shift);
return;
} }
pagesize = 1 << s->oob_shift; pagesize = 1 << s->oob_shift;
s->mem_oob = 1; s->mem_oob = 1;
if (s->bdrv) { if (s->bdrv) {
if (bdrv_is_read_only(s->bdrv)) { if (bdrv_is_read_only(s->bdrv)) {
error_report("Can't use a read-only drive"); error_setg(errp, "Can't use a read-only drive");
return -1; return;
} }
if (bdrv_getlength(s->bdrv) >= if (bdrv_getlength(s->bdrv) >=
(s->pages << s->page_shift) + (s->pages << s->oob_shift)) { (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. */ /* Give s->ioaddr a sane value in case we save state before it is used. */
s->ioaddr = s->io; s->ioaddr = s->io;
return 0;
} }
static Property nand_properties[] = { static Property nand_properties[] = {
@ -432,9 +431,8 @@ static Property nand_properties[] = {
static void nand_class_init(ObjectClass *klass, void *data) static void nand_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); 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->reset = nand_reset;
dc->vmsd = &vmstate_nand; dc->vmsd = &vmstate_nand;
dc->props = nand_properties; dc->props = nand_properties;