[PATCH] hw/arm/bcm2836: Remove unused 'cpu_type' field

Philippe Mathieu-Daudé posted 1 patch 3 years, 9 months ago
Test FreeBSD passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test docker-mingw@fedora passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200703200459.23294-1-f4bug@amsat.org
include/hw/arm/bcm2836.h | 1 -
1 file changed, 1 deletion(-)
[PATCH] hw/arm/bcm2836: Remove unused 'cpu_type' field
Posted by Philippe Mathieu-Daudé 3 years, 9 months ago
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é <f4bug@amsat.org>
---
 include/hw/arm/bcm2836.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h
index 024af8aae4..79dfff9d73 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 {
-- 
2.21.3


Re: [PATCH] hw/arm/bcm2836: Remove unused 'cpu_type' field
Posted by Alistair Francis 3 years, 9 months ago
On Fri, Jul 3, 2020 at 1:05 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> 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é <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  include/hw/arm/bcm2836.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h
> index 024af8aae4..79dfff9d73 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 {
> --
> 2.21.3
>
>

Re: [PATCH] hw/arm/bcm2836: Remove unused 'cpu_type' field
Posted by Peter Maydell 3 years, 9 months ago
On Fri, 3 Jul 2020 at 21:05, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> 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é <f4bug@amsat.org>
> ---
>  include/hw/arm/bcm2836.h | 1 -
>  1 file changed, 1 deletion(-)
>



Applied to target-arm.next, thanks.

-- PMM