Commit bba3ddf7 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/block/pflash_cfi01, pflash_cfi02: Use memory_region_init_rom_device() 



Since we pass the same DeviceState object to
memory_region_init_rom_device_nomigrate() and vmstate_register_ram(),
we can switch to using memory_region_init_rom_device() instead.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-9-git-send-email-peter.maydell@linaro.org
parent 98a99ce0

hw/block/pflash_cfi01.c

+1 −2
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) 
        return NULL;

#endif



    memory_region_init_rom_device_nomigrate(

    memory_region_init_rom_device(

        &pfl->mem, OBJECT(dev),

        &pflash_cfi01_ops,

        pfl,
@@ -753,7 +753,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) 
        return;

    }



    vmstate_register_ram(&pfl->mem, DEVICE(pfl));

    pfl->storage = memory_region_get_ram_ptr(&pfl->mem);

    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem);

hw/block/pflash_cfi02.c

+1 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) 
        return NULL;

#endif



    memory_region_init_rom_device_nomigrate(&pfl->orig_mem, OBJECT(pfl), pfl->be ?

    memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ?

                                  &pflash_cfi02_ops_be : &pflash_cfi02_ops_le,

                                  pfl, pfl->name, chip_len, &local_err);

    if (local_err) {
@@ -629,7 +629,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) 
        return;

    }



    vmstate_register_ram(&pfl->orig_mem, DEVICE(pfl));

    pfl->storage = memory_region_get_ram_ptr(&pfl->orig_mem);

    pfl->chip_len = chip_len;