From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 794D3C433DB for ; Sun, 21 Feb 2021 14:36:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3A4464E86 for ; Sun, 21 Feb 2021 14:36:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3A4464E86 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDpqq-0007Be-1E for qemu-devel@archiver.kernel.org; Sun, 21 Feb 2021 09:36:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDpoq-0005db-KY for qemu-devel@nongnu.org; Sun, 21 Feb 2021 09:34:44 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDpoo-0002Jq-Tw for qemu-devel@nongnu.org; Sun, 21 Feb 2021 09:34:44 -0500 Received: by mail-wr1-x429.google.com with SMTP id n8so16288741wrm.10 for ; Sun, 21 Feb 2021 06:34:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CfmWBlvH060L9/ARfTTbpqHH/Yspstc9lZifjtcI/8=; b=RE5SkasnriaNbBDz2pEhQ6YlMr9mlXRCVVsxq3ShcY254pa16DBqAg5M5at+sXf1B9 9PlETr6qlb20k7mJDHS2uDbWRmuPmNgxoY04HMkwyjpZrVGepIa76F+APMGe9Na/SPdR A9zeD6wG7eEQAEX0TdzaFCxDrfcmiUhmmT8WbUVJmgUyT/sLOmuNml9R1r0UUco3xr5S hNRnTxpCkItFliRB4MiR5GVQo0MwOrX3otbzAXZmpuAHwppNuQUE+zauZ5FVE8Mtvb30 gm+SlGAO+SGdkVRAllqdvGscO2SEknrtGDo1QJK8AxAG867Nl3hDVYlj5+a+WEYJkqIL hmSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9CfmWBlvH060L9/ARfTTbpqHH/Yspstc9lZifjtcI/8=; b=HfYQJwWVn6RFTndcR5ZbVtT+gHmzRcx0SmJKPMt9lxa/3XCzLEeFZduvGPZep9t6v1 pNYMfDrMoJjT/98s5pTY+a2rK9nngxIgS/uzn9ryFhjSWHvfpmfFaRgHm6WAbeHSBXXA j2OVhZrSSnErSyVF4Ge+svwJ6QceF31NtWEuiuIDFfge6GrJa/jTVs48t/39J//TlX0G CavKnSarmrvSbKM3pj/OxasMdaGWpDVNIu4veFUldhQNEUhqNbOldHQCbqumdEfUXzF3 lR3HIXFfjMOo/3YkvV/BLxCLgQDlKdRIKXkaxiJL3jFpNBzji61sYeRSMqaKpGdg0tUF R0WA== X-Gm-Message-State: AOAM531aBg8x6o5y2o6TmKXpwVfUqix7jZF+Ke6gIS8L3XXQttYsLTAQ l72OuKJF5+bc5O7lVpFtuTXtbuAtVvY= X-Google-Smtp-Source: ABdhPJwzeFWU4HL7GtbFCl+8apNo6id30JjLsfgEQBjEiyL+J++jOPjWEkLH+PPsfq1WTYfP5EwKUQ== X-Received: by 2002:adf:dd81:: with SMTP id x1mr17462187wrl.233.1613918080102; Sun, 21 Feb 2021 06:34:40 -0800 (PST) Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y6sm22449049wma.10.2021.02.21.06.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/43] hw/mips: loongson3: Drop 'struct MemmapEntry' Date: Sun, 21 Feb 2021 15:33:50 +0100 Message-Id: <20210221143432.2468220-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Cc: Aleksandar Rikalo , Bin Meng , Paul Burton , "Michael S. Tsirkin" , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng There is already a MemMapEntry type defined in hwaddr.h. Let's drop the loongson3 defined `struct MemmapEntry` and use the existing one. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20210122122404.11970-1-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/loongson3_bootp.h | 7 +------ hw/mips/loongson3_virt.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/mips/loongson3_bootp.h b/hw/mips/loongson3_bootp.h index 09f8480abff..d525ab745a6 100644 --- a/hw/mips/loongson3_bootp.h +++ b/hw/mips/loongson3_bootp.h @@ -228,12 +228,7 @@ enum { LOADER_PARAM, }; -struct MemmapEntry { - hwaddr base; - hwaddr size; -}; - -extern const struct MemmapEntry virt_memmap[]; +extern const MemMapEntry virt_memmap[]; void init_loongson_params(struct loongson_params *lp, void *p, uint64_t cpu_freq, uint64_t ram_size); void init_reset_system(struct efi_reset_system_t *reset); diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index d4a82fa5367..b15071defc6 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -72,7 +72,7 @@ #define RTC_IRQ 1 #define PCIE_IRQ_BASE 2 -const struct MemmapEntry virt_memmap[] = { +const MemMapEntry virt_memmap[] = { [VIRT_LOWMEM] = { 0x00000000, 0x10000000 }, [VIRT_PM] = { 0x10080000, 0x100 }, [VIRT_FW_CFG] = { 0x10080100, 0x100 }, @@ -86,13 +86,13 @@ const struct MemmapEntry virt_memmap[] = { [VIRT_HIGHMEM] = { 0x80000000, 0x0 }, /* Variable */ }; -static const struct MemmapEntry loader_memmap[] = { +static const MemMapEntry loader_memmap[] = { [LOADER_KERNEL] = { 0x00000000, 0x4000000 }, [LOADER_INITRD] = { 0x04000000, 0x0 }, /* Variable */ [LOADER_CMDLINE] = { 0x0ff00000, 0x100000 }, }; -static const struct MemmapEntry loader_rommap[] = { +static const MemMapEntry loader_rommap[] = { [LOADER_BOOTROM] = { 0x1fc00000, 0x1000 }, [LOADER_PARAM] = { 0x1fc01000, 0x10000 }, }; -- 2.26.2