diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-07 15:42:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 17:59:42 +0100 |
| commit | b59821a95bd1d7cb4697fd7748725c910582e0e7 (patch) | |
| tree | df1bfc288a92bbd2f2bbcdb588241be9cd87e8ef /hw/block | |
| parent | 1cfe48c1ce219b60a9096312f7a61806fae64ab3 (diff) | |
| download | qemu-b59821a95bd1d7cb4697fd7748725c910582e0e7.tar.gz | |
memory: Rename memory_region_init_rom() and _rom_device() to _nomigrate()
Rename memory_region_init_rom() to memory_region_init_rom_nomigrate()
and memory_region_init_rom_device() to
memory_region_init_rom_device_nomigrate().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-5-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/pflash_cfi01.c | 2 | ||||
| -rw-r--r-- | hw/block/pflash_cfi02.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 594d4cf6fe..c044b56d98 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -743,7 +743,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) return NULL; #endif - memory_region_init_rom_device( + memory_region_init_rom_device_nomigrate( &pfl->mem, OBJECT(dev), &pflash_cfi01_ops, pfl, diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index e6c5c6c25d..a08b09b48c 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -621,7 +621,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) return NULL; #endif - memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ? + memory_region_init_rom_device_nomigrate(&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) { |