Message ID | 20200224205533.23798-3-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw: Sanitize various MemoryRegion calls | expand |
On Mon, Feb 24, 2020 at 1:10 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > memory_region_init_rom_nomigrate() has the same content than > memory_region_init_ram_shared_nomigrate(), with setting the > readonly mode. The code is easier to review as creating a > readonly ram/shared/nomigrate region. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > memory.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/memory.c b/memory.c > index ce1179874e..6a327a54ed 100644 > --- a/memory.c > +++ b/memory.c > @@ -1659,19 +1659,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr, > uint64_t size, > Error **errp) > { > - Error *err = NULL; > - memory_region_init(mr, owner, name, size); > - mr->ram = true; > + memory_region_init_ram_shared_nomigrate(mr, owner, name, size, false, errp); > mr->readonly = true; > - mr->terminates = true; > - mr->destructor = memory_region_destructor_ram; > - mr->ram_block = qemu_ram_alloc(size, false, mr, &err); > - mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; > - if (err) { > - mr->size = int128_zero(); > - object_unparent(OBJECT(mr)); > - error_propagate(errp, err); > - } > } > > void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, > -- > 2.21.1 > >
diff --git a/memory.c b/memory.c index ce1179874e..6a327a54ed 100644 --- a/memory.c +++ b/memory.c @@ -1659,19 +1659,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr, uint64_t size, Error **errp) { - Error *err = NULL; - memory_region_init(mr, owner, name, size); - mr->ram = true; + memory_region_init_ram_shared_nomigrate(mr, owner, name, size, false, errp); mr->readonly = true; - mr->terminates = true; - mr->destructor = memory_region_destructor_ram; - mr->ram_block = qemu_ram_alloc(size, false, mr, &err); - mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { - mr->size = int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - } } void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
memory_region_init_rom_nomigrate() has the same content than memory_region_init_ram_shared_nomigrate(), with setting the readonly mode. The code is easier to review as creating a readonly ram/shared/nomigrate region. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- memory.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)