From patchwork Sat Dec 14 15:56:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11292313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B575188B for ; Sat, 14 Dec 2019 15:57:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A37C2465B for ; Sat, 14 Dec 2019 15:57:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KGP3wgoE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726752AbfLNP5O (ORCPT ); Sat, 14 Dec 2019 10:57:14 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47538 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725900AbfLNP5O (ORCPT ); Sat, 14 Dec 2019 10:57:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576339032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Os44yYqV4Qf/DGZHPDswJ/Ob+mUvkJTnaZl2qxMI8rM=; b=KGP3wgoEvvmp3AE87xjEmKV+IsRKcbJHi1WKTKrtUqiYkAWGfUVhE4kITZIKvvIW7YC0Rr 7DUtxxDmJVKj1TE+dyH0laSOTUZBsMZur7SGXkEl4MVrE0kdFBV2pYAv4rA7V0+OCGjNei LdWj4kvUIrbJvgqlWMEvsK//fxhHbu0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-BFIqEERuN2SIx64E6tImNQ-1; Sat, 14 Dec 2019 10:57:11 -0500 X-MC-Unique: BFIqEERuN2SIx64E6tImNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FB26107ACC4; Sat, 14 Dec 2019 15:57:09 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3EC45D6A7; Sat, 14 Dec 2019 15:56:47 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Andrew Baumann , Aurelien Jarno , kvm@vger.kernel.org, Alex Williamson , Aleksandar Markovic , Joel Stanley , qemu-arm@nongnu.org, Marcelo Tosatti , Alistair Francis , "Michael S. Tsirkin" , Eduardo Habkost , Richard Henderson , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Paul Burton , Marcel Apfelbaum , "Edgar E. Iglesias" , Paolo Bonzini Subject: [PATCH 2/8] hw/arm/raspi: Use memory_region_add_subregion() when priority is 0 Date: Sat, 14 Dec 2019 16:56:08 +0100 Message-Id: <20191214155614.19004-3-philmd@redhat.com> In-Reply-To: <20191214155614.19004-1-philmd@redhat.com> References: <20191214155614.19004-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org It is pointless to overlap a memory subregion with priority 0. Use the simpler memory_region_add_subregion() function. This patch was produced with the following spatch script: @@ expression region; expression offset; expression subregion; @@ -memory_region_add_subregion_overlap(region, offset, subregion, 0) +memory_region_add_subregion(region, offset, subregion) Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2835_peripherals.c | 4 ++-- hw/arm/raspi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 17207ae07e..f792bd6bb1 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -160,8 +160,8 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) for (n = 0; n < 4; n++) { memory_region_init_alias(&s->ram_alias[n], OBJECT(s), "bcm2835-gpu-ram-alias[*]", ram, 0, ram_size); - memory_region_add_subregion_overlap(&s->gpu_bus_mr, (hwaddr)n << 30, - &s->ram_alias[n], 0); + memory_region_add_subregion(&s->gpu_bus_mr, (hwaddr)n << 30, + &s->ram_alias[n]); } /* Interrupt Controller */ diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 6a510aafc1..3649b75449 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -187,7 +187,7 @@ static void raspi_init(MachineState *machine, int version) memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram", machine->ram_size); /* FIXME: Remove when we have custom CPU address space support */ - memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0); + memory_region_add_subregion(get_system_memory(), 0, &s->ram); /* Setup the SOC */ object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),