ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pflash_cfi02: Use QOM realize for pflash_cfi02 

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:29 +08:00 committed by Andreas Färber
parent e40b5f3e0e
commit da3bd64234
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/block/pflash_cfi02.c
View File

@ -592,7 +592,7 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int pflash_cfi02_init(SysBusDevice *dev) static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
{ {
pflash_t *pfl = CFI_PFLASH02(dev); pflash_t *pfl = CFI_PFLASH02(dev);
uint32_t chip_len; uint32_t chip_len;
@ -616,14 +616,16 @@ static int pflash_cfi02_init(SysBusDevice *dev)
/* read the initial flash content */ /* read the initial flash content */
ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9); ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9);
if (ret < 0) { if (ret < 0) {
g_free(pfl); vmstate_unregister_ram(&pfl->orig_mem, DEVICE(pfl));
return 1; memory_region_destroy(&pfl->orig_mem);
error_setg(errp, "failed to read the initial flash content");
return;
} }
} }
pflash_setup_mappings(pfl); pflash_setup_mappings(pfl);
pfl->rom_mode = 1; pfl->rom_mode = 1;
sysbus_init_mmio(dev, &pfl->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem);
if (pfl->bs) { if (pfl->bs) {
pfl->ro = bdrv_is_read_only(pfl->bs); pfl->ro = bdrv_is_read_only(pfl->bs);
@ -712,8 +714,6 @@ static int pflash_cfi02_init(SysBusDevice *dev)
pfl->cfi_table[0x3b] = 0x00; pfl->cfi_table[0x3b] = 0x00;
pfl->cfi_table[0x3c] = 0x00; pfl->cfi_table[0x3c] = 0x00;
return 0;
} }
static Property pflash_cfi02_properties[] = { static Property pflash_cfi02_properties[] = {
@ -736,9 +736,8 @@ static Property pflash_cfi02_properties[] = {
static void pflash_cfi02_class_init(ObjectClass *klass, void *data) static void pflash_cfi02_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 = pflash_cfi02_init; dc->realize = pflash_cfi02_realize;
dc->props = pflash_cfi02_properties; dc->props = pflash_cfi02_properties;
} }