On Sun, May 24, 2015 at 9:58 PM, Edgar E. Iglesias
<edgar.igles...@gmail.com> wrote:
> On Sun, May 24, 2015 at 08:31:40PM -0700, Peter Crosthwaite wrote:
>> Instantiate and realise the CPU directly, rather than using
>> cpu_mb_init. Microblazes cpu_model argument is a dummy so remove the
>> default cpu_model set logic.
>
> Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
>
> I've put this in my mb queue.
> BTW, you've got a typo in my email address.
>
Fixed my new mailrc. Thanks,
Regards,
Peter
> Cheers,
> Edgar
>
>
>
>>
>> Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
>> ---
>> hw/microblaze/petalogix_s3adsp1800_mmu.c | 8 ++------
>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
>> b/hw/microblaze/petalogix_s3adsp1800_mmu.c
>> index 84f6e74..4dbbd1e 100644
>> --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
>> +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
>> @@ -62,7 +62,6 @@ static void
>> petalogix_s3adsp1800_init(MachineState *machine)
>> {
>> ram_addr_t ram_size = machine->ram_size;
>> - const char *cpu_model = machine->cpu_model;
>> DeviceState *dev;
>> MicroBlazeCPU *cpu;
>> DriveInfo *dinfo;
>> @@ -73,11 +72,8 @@ petalogix_s3adsp1800_init(MachineState *machine)
>> qemu_irq irq[32];
>> MemoryRegion *sysmem = get_system_memory();
>>
>> - /* init CPUs */
>> - if (cpu_model == NULL) {
>> - cpu_model = "microblaze";
>> - }
>> - cpu = cpu_mb_init(cpu_model);
>> + cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
>> + object_property_set_bool(OBJECT(cpu), true, "realized", &error_abort);
>>
>> /* Attach emulated BRAM through the LMB. */
>> memory_region_init_ram(phys_lmb_bram, NULL,
>> --
>> 1.9.1
>>
>>
>
