From patchwork Mon Jul 13 14:10:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 235402 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2876892ilg; Mon, 13 Jul 2020 07:12:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8NT02r8uf7SgW7yseBq+HJYl/vv3x55QmmCxL/IVXZFuhXPglAL5j+7XhWDpbMz7DUuHK X-Received: by 2002:a25:2314:: with SMTP id j20mr303515ybj.498.1594649577071; Mon, 13 Jul 2020 07:12:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594649577; cv=none; d=google.com; s=arc-20160816; b=PtiaR7nCpbo8+35uGLBrZNBGF6/QB3AUBuEV8JhOFYsL/zhZDvZ2/15Xj5R6zZpapq oAtIS5G0IasTTI19MCJnKhFOUOFZAG0+eI3S3xknrWB/s3jvWehYWS9NUjgCWv+M9kxi tciezWD3i9zJzHfzYWv3B3fRpLqqkuTDixSsyQFl+NLJxQEIWogPHrZ+27perY1rq71u AHUTBisYEDQYWz1hrcSDva3ozZZZPNhVRzMtIkLJwxF3m9T9vKbMi7MqyPsugsQmnvF9 QW5v0WJ9wLSR0SZgKAnOweofA4TWKKkPCamCGtufnfxSOC4a/z6PAr014pVSprbNcxcW vT0w== 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=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=sA43+IXkyN7zYLGiJu+TSvW1XYCTa4GBirTfQEmDJtgk74VkBH76534Wv7O/j3k2d0 KsJdYAJOJiemBdnXja/DsTUjXCqp3kyj4wkuKi3bOEppIWapfu1PGKlnwGCSyuubkN01 JiSk8ka0ah8KXCMkXQwsF6pgf9i9CxxOoL3OrquXGsi2j8QdMp9O1rYyJ56GevHn1dOY 7xIdLQzpvi5np9fIbHpYBKocmouU8eCVQ6qqdrggKEHTN676jJ91HbuqZ2FXn8+W+0Nx y38nmkJfibHPadRZxXhrQMyfpqRF2qPUu9mYz/R5K1T42AQe3kVw7DAU0Cq55Di+HgN5 gTpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u7pW8AJ1; 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 v13si14038728ybl.67.2020.07.13.07.12.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 07:12:57 -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=u7pW8AJ1; 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]:54362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzCS-000866-F9 for patch@linaro.org; Mon, 13 Jul 2020 10:12:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAl-0004p1-FT for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAj-0006bf-TH for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:11 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 22so13464827wmg.1 for ; Mon, 13 Jul 2020 07:11:09 -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=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=u7pW8AJ1B/B6IQLXN4VlTtF7clsKz3z6EEfBUzxcfzC3jZ5n0pavb4g/Bh6oZMy4ds lVi4Ndil7QjEOg81o2jMqfVZf4yLUPcy72ePf1Sad0UAVzDiVbviiXgFi7NP6HeDSK2+ bErOHofLuIrZLWklRv2f7ZkGvAKhL+rdILkkiuqmSJ6GncjiuehFDkab8mmi77WX+CZF 9kPxAylsVqZb1xyyCD/rz4ColoMcaZqRCPLiTvP+DzEzyvddbuqUZBOJr9ZOONxp39IG 0Bzsebpdyp/9+k93WvcYydPRYHImPc+4hEAhjCIEnSwj3jQIl+cgp0zb8V/3cFLebTKz rC1g== 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=pLks78n58shGUjzr8qBFjGZdlcgPpzMamGTQB7aIdDA=; b=lkwF82EC1fxObAukDOoITWXoDdHLgye6WfgVTtTLAHTgzxd94Mtf4REhawuCxqsY4N besrYuL5DHJW/JNb0gh6n8yq7HYdxTBRP/0pjnVLFeIjpllxgcJgK7caPDExH2AzbXOs CzlHeDb8SWVx5vVmGiHcydOu3KnXW3GioToLxU3pjlZVD4korYS3O4axnpdTb1SkMIu9 6byT599Olii5sUVKB6TOMbIwu+BtcfNfyyK8c59pKzIXywjUC264KZY3LRgwqaMWLxJj 0UEh6Ga7Hpq7xjbwFNrlrFoz7ZmBKfgRttMXg6I9vZu8/D9cD4qvVeIqbGHbUsqbjaBr OwrA== X-Gm-Message-State: AOAM531XKPmKfTdGegrX+qiBUnHR05HCbTdGLSsANnX9H6bFWsB7lsKL zDX8Q/D1vN+GiyNi3guBUehGKJOOks1+gQ== X-Received: by 2002:a1c:2349:: with SMTP id j70mr182163wmj.22.1594649468170; Mon, 13 Jul 2020 07:11:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/25] hw/arm/bcm2836: Remove unused 'cpu_type' field Date: Mon, 13 Jul 2020 15:10:40 +0100 Message-Id: <20200713141104.5139-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The 'cpu_type' has been moved from BCM283XState to BCM283XClass in commit 210f47840d, but we forgot to remove the old variable. Do it now. Fixes: 210f47840d ("hw/arm/bcm2836: Hardcode correct CPU type") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20200703200459.23294-1-f4bug@amsat.org Signed-off-by: Peter Maydell --- include/hw/arm/bcm2836.h | 1 - 1 file changed, 1 deletion(-) -- 2.20.1 diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 024af8aae4f..79dfff9d734 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -33,7 +33,6 @@ typedef struct BCM283XState { DeviceState parent_obj; /*< public >*/ - char *cpu_type; uint32_t enabled_cpus; struct {