From patchwork Fri Apr 20 15:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 133902 Delivered-To: patches@linaro.org Received: by 10.46.66.142 with SMTP id h14csp441229ljf; Fri, 20 Apr 2018 08:55:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr/Gjzkd4Qd9yyW32kC5LUbuH0h0atmBjuHtScF4IBZ9pH+VQMgcuJZg/m592uqqWUdU+ms X-Received: by 10.28.154.137 with SMTP id c131mr243144wme.146.1524239750525; Fri, 20 Apr 2018 08:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524239750; cv=none; d=google.com; s=arc-20160816; b=agPwtIVKmuZwJYaQ7MwrQ3+LOwGVjNulwWmsRhx35MvRDGu6Cf8VLoap4A/uPT/pJ0 NPKlkUDkcLVR3w12CZqYG6oZgiAfLDYQ/lFBCMfzLA8TRHxpu/u37nL1SM+AOVIQErXB QsJRnUy2dkYfTNQmXs/NjoGrxcObu/F94PJOJKoF94sCl9Nf1hLJRlEcYvQCAvG86tds elifPDs+PK1ZO60U3gRzYqBfDl7KCNd+bOR1wY4Rw87w67LgILtiBRTlB3qtNqQLKacm 1HvFvkm09MU1lWcW5LLANX0Wdx8oWRAT6YzjlJ9fdSoZMYIUdFBDUNCnasRAIyFdB0MZ nrsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=x64wu9paW0rkvW76CIBZWD+msqV2gD6zV6b4bOujsiU=; b=dTTh23JPHgEzUyr1hl7PL3Rvi8b5uNEbvDGTuUTjmFska1lBMjnvbKj2P6AQbrDbsx aZzCmDxxTmeAFCzYqtxlGYrqdZBClfaDpBa5mzgu5SePESAlY2juH1WX2FHADTNJue+M ExT0dX6OzGje9s/Ci3YvnPItfqf3sPLZNNtzUW7cVkvtTI+YqxYCX3PdHmwrXeCjyp9C Wz10169NIwI6Y6NMJ16nyYnch+QT/YQSk/rcKXdCF/u5SkQZswfvkMJO3Buot5W7Ffi2 cxo6l+k2CbXiUjSrlQ8y+BGK9rYJ5zkt/0VbJJL6wff7jPQaRxp8yArQ2+CeT0t4RoPU IAhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id 42-v6si5107774wrt.26.2018.04.20.08.55.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Apr 2018 08:55:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1f9YO5-0007Yo-17; Fri, 20 Apr 2018 16:55:49 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Igor Mammedov , Andrew Baumann Subject: [PATCH] hw/arm/raspi: Don't bother setting default_cpu_type Date: Fri, 20 Apr 2018 16:55:47 +0100 Message-Id: <20180420155547.9497-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In commit 210f47840dd62, we changed the bcm2836 SoC object to always create a CPU of the correct type for that SoC model. This makes the default_cpu_type settings in the MachineClass structs for the raspi2 and raspi3 boards redundant. We didn't change those at the time because it would have meant a temporary regression in a corner case of error handling if the user requested a non-existing CPU type. The -cpu parse handling changes in 2278b93941d42c3 mean that it no longer implicitly depends on default_cpu_type for this to work, so we can now delete the redundant default_cpu_type fields. Signed-off-by: Peter Maydell --- Tidying up a loose end from the raspi changes I did last month... hw/arm/raspi.c | 2 -- 1 file changed, 2 deletions(-) -- 2.17.0 Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 955a7c4e80..66899c28dc 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -226,7 +226,6 @@ static void raspi2_machine_init(MachineClass *mc) mc->no_parallel = 1; mc->no_floppy = 1; mc->no_cdrom = 1; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"); mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS; @@ -249,7 +248,6 @@ static void raspi3_machine_init(MachineClass *mc) mc->no_parallel = 1; mc->no_floppy = 1; mc->no_cdrom = 1; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53"); mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS;