From patchwork Tue Oct 22 13:31:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177199 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp5801955ocf; Tue, 22 Oct 2019 07:13:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3joEf3xyYaG1CfnA22plic7Qn3RIF+ksNXsvsvB/3/r4j7uAy2rU2RMn6aphq+OvqL562 X-Received: by 2002:a05:620a:1011:: with SMTP id z17mr3133476qkj.289.1571753621252; Tue, 22 Oct 2019 07:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571753621; cv=none; d=google.com; s=arc-20160816; b=d7lm1JsKMXmIjKCKZzdRgNd3GP5Er6KYE//KQJy3YK6jza2AajooG17PcadJLL2+Ze 9eWZycuf8nWBQdvM0twCiXfUMkO/IsG4g9UkGJj89GLa+xqpVPf1x5UcWiJLByLPk7YY 1w1XcD8ZnVwIVYuX3F9tRT7ELGJbxUulnDSyJARBIInP16mYNyfSnX1T87C9PzTp8bHB 9nFD+JutYo5F1rXuhxoR5ttFr2UPyU4GWt2hWeR4FgcJ44fAR4qXJnSAd6RrlrAdJZyI nOuUYXXvYkoSemeglUV2I0jsQ4Tg8FoIJe9DLi17Eal+zuw/aCugL7h5tZj2DeVwhs0G L5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZwNW00oas6mcry2/k1wb4Dsg08MtsQnh0O8QmW/x2tI=; b=M/HHBMEKIO47np035/Fm/P6nqdW5Gxlxr+k33xhbla/RL5WlNNmti+iGLVBy770sAd x4U4EtZvtlD1DesqtmnhPwZPXuPqeROBkXAbTp/72XO+Armrg0CJ+P+BHEH8Flft2oKC jIj7d0F6F7Bm8mI8AEqKuvowkQDtXVx8qV8UKTSPr1ggf4WrNvf0MKXpPeHtmS+tpaO+ afByzytrETtBAR9pVp5Teqryau4jAgo7EAdohGjtoYrC+OWUYA5jeoauCLKD6JMpb0YK Ka+HPbSaOLGSSUwmgNJMLsHlsWqmA2St6tczGMp5nDakhHVHoZ4Nh8+gfq5NpKjPHg96 zHyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JzUZnxk2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g186si16036187qkd.102.2019.10.22.07.13.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 07:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JzUZnxk2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuup-0002VX-Kl for patch@linaro.org; Tue, 22 Oct 2019 10:13:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37331) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuHq-0003Zu-C5 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuHo-0001hT-3x for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:22 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:50563) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuHm-0001fQ-UG for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:20 -0400 Received: by mail-wm1-x333.google.com with SMTP id q13so7253560wmj.0 for ; Tue, 22 Oct 2019 06:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZwNW00oas6mcry2/k1wb4Dsg08MtsQnh0O8QmW/x2tI=; b=JzUZnxk2KnZ2IeEX86dyIe0gWMAQvqB6rnrDgzV1zSck1Sep4ogcgOZu8y6J0pzjwC q+n1b6+UJ8um8HWLrB5vLo+/F+zhzRcPr+FnLUuT2lMAkhNhvytHFpMuK3sQdiJ6ZIdV TaLqYU/UzrgkNXMHUjEKAkYQwEEMxj2T3tG0iTZXDfI3w2tiHHkab1DYn8ct+rMwvxoA ZYW41wEl2Ad7kLPdJq9B8lqODgy/A17lHHghZPF1KCXMrdvTuLFDoTfWM2sGHB2mHRRZ vk4o+AC+Bdyqi8r5KHcQcViA/o1MhY8mmMEqCPs/JX5WFg0ww9W/QgC7QI0TWWFfvx6G ZbTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZwNW00oas6mcry2/k1wb4Dsg08MtsQnh0O8QmW/x2tI=; b=AYT431qqFQSbJLjjIPSCGj18SJqX8GU1QvjZFb3ULKJyWMV7wxvsafphRo/U/1tkNb XmVVAEdi97SH4mL3GZbmRZkBv7SRGHi1xyJUcKoDhbs9Ak+zaMqmGVhJpTiZngNxF6Br PuHifP6KReoog+PK3LfU/skdTzQ/HzhDQk1vswbrqhz50AjxPtGNPnZa4UEC5asEhB4u zFKPknkurDh5KzxtTZxzkZO0q0//etpn3GUKpVZ203p3/0FqKhCy3BZN7a1G2Kn53bUM gnCLcO99n7cpwa1wWn/3xBV8KQTn7xxCjDLfz7xoTSS4DevdWb6+sn7xNTlv00n6mNv+ btWA== X-Gm-Message-State: APjAAAUtNi/t20yEM/W5gQfZckEMsIgcmaL6hJAMX9rWeCP3WByQxRb4 yhsxbRvbGsHjUMl9+bt1XCKiqDcJe3Y= X-Received: by 2002:a7b:c924:: with SMTP id h4mr3211922wml.46.1571751190844; Tue, 22 Oct 2019 06:33:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.33.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:33:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 41/41] hw/arm/digic4: Inline digic4_board_setup_ram() function Date: Tue, 22 Oct 2019 14:31:34 +0100 Message-Id: <20191022133134.14487-42-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Having the RAM creation code in a separate function is not very helpful. Move this code directly inside the board_init() function, this will later allow the board to have the QOM ownership of the RAM. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20191021190653.9511-7-philmd@redhat.com Signed-off-by: Peter Maydell --- hw/arm/digic_boards.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 304e4d1a294..ef3fc2b6a5f 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -53,12 +53,6 @@ typedef struct DigicBoard { const char *rom1_def_filename; } DigicBoard; -static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) -{ - memory_region_allocate_system_memory(&s->ram, NULL, "ram", ram_size); - memory_region_add_subregion(get_system_memory(), 0, &s->ram); -} - static void digic4_board_init(DigicBoard *board) { Error *err = NULL; @@ -72,7 +66,8 @@ static void digic4_board_init(DigicBoard *board) exit(1); } - digic4_board_setup_ram(s, board->ram_size); + memory_region_allocate_system_memory(&s->ram, NULL, "ram", board->ram_size); + memory_region_add_subregion(get_system_memory(), 0, &s->ram); if (board->add_rom0) { board->add_rom0(s, DIGIC4_ROM0_BASE, board->rom0_def_filename);