From patchwork Sun Jun 21 11:56:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 487051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4968314012C for ; Sun, 21 Jun 2015 22:03:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=O+3k3UzX; dkim-atps=neutral Received: from localhost ([::1]:36068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6dxt-0006CM-GH for incoming@patchwork.ozlabs.org; Sun, 21 Jun 2015 08:03:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6dxP-0005JK-Ff for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:02:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z6dxK-0001n7-5k for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:02:39 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:32967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6dxJ-0001n2-Vu for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:02:34 -0400 Received: by padev16 with SMTP id ev16so115342960pad.0 for ; Sun, 21 Jun 2015 05:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=pp877FMErn9Yt95lcegScuNSa6LY7BfZEMxeriDN6Qc=; b=O+3k3UzXx54r4jJWo9LIYLtP6Kl2xhaSfj+EsL0GuwohwwnqBTZ7K1QZoEqH3sj5pJ ZmThui2tHWWtMFaBuy6OWtBdKbGoB5Mgx63m7yG5iH4u0g/HC0eCcrFI2X94B9LFIO3J Qu7uttPN9SGnknt+x1Hk8sF5HvU4Mkczc7McH88pLEQkOlVc5Z6Kvnf/NPoGpnWsg6rH Ei5+JQG1Kw3HgejnpwFqqsn5J2kCDkGFwO28EBpjGENhkuaq7CwlVOYxXAvG8GAFXoNj ErupPYNs85F1Em5da688YB2LkHiSRoWjBL+wCAWLXPEziB8o5bbKlScw9x+thfq20ntU Pjxw== X-Received: by 10.70.96.65 with SMTP id dq1mr49781804pdb.79.1434888153319; Sun, 21 Jun 2015 05:02:33 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id rx6sm16565529pbc.62.2015.06.21.05.02.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 21 Jun 2015 05:02:32 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Sun, 21 Jun 2015 21:56:12 +1000 Message-Id: <1434887787-4188-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434887787-4188-1-git-send-email-edgar.iglesias@gmail.com> References: <1434887787-4188-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a Subject: [Qemu-devel] [PATCH v1 01/16] microblaze: s3adsp: Instantiate CPU using QOM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Crosthwaite 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 Signed-off-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias --- 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,