Commit 3a12fc61 authored by Igor Mammedov's avatar Igor Mammedov Committed by Patchew Importer
Browse files

s390x/s390-virtio-ccw: use memdev for RAM 



memory_region_allocate_system_memory() API is going away, so
replace it with memdev allocated MemoryRegion. The later is
initialized by generic code, so board only needs to opt in
to memdev scheme by providing
  MachineClass::default_ram_id
and using MachineState::ram instead of manually initializing
RAM memory region.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Tested-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Acked-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200219160953.13771-39-imammedo@redhat.com>
parent 87c8047f

hw/s390x/s390-virtio-ccw.c

+3 −4
Original line number Diff line number Diff line
@@ -154,14 +154,12 @@ static void virtio_ccw_register_hcalls(void) 
                                   virtio_ccw_hcall_early_printk);

}



static void s390_memory_init(ram_addr_t mem_size)

static void s390_memory_init(MemoryRegion *ram)

{

    MemoryRegion *sysmem = get_system_memory();

    MemoryRegion *ram = g_new(MemoryRegion, 1);

    Error *local_err = NULL;



    /* allocate RAM for core */

    memory_region_allocate_system_memory(ram, NULL, "s390.ram", mem_size);

    memory_region_add_subregion(sysmem, 0, ram);



    /*
@@ -245,7 +243,7 @@ static void ccw_init(MachineState *machine) 


    s390_sclp_init();

    /* init memory + setup max page size. Required for the CPU model */

    s390_memory_init(machine->ram_size);

    s390_memory_init(machine->ram);



    /* init CPUs (incl. CPU model) early so s390_has_feature() works */

    s390_init_cpus(machine);
@@ -471,6 +469,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) 
    hc->plug = s390_machine_device_plug;

    hc->unplug_request = s390_machine_device_unplug_request;

    nc->nmi_monitor_handler = s390_nmi;

    mc->default_ram_id = "s390.ram";

}



static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp)