mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/aspeed: Fix build issue with clang 3.4

Browse Source 
When using clang 3.4.2, compilation of QEMU fails like this:

  CC      aarch64-softmmu/hw/arm/aspeed.o
hw/arm/aspeed.c:36:3: error: redefinition of typedef 'AspeedBoardState' is a C11
      feature [-Werror,-Wtypedef-redefinition]
} AspeedBoardState;
  ^
include/hw/arm/aspeed.h:14:33: note: previous definition is here
typedef struct AspeedBoardState AspeedBoardState;
                                ^
1 error generated.
make[1]: *** [hw/arm/aspeed.o] Error 1
make: *** [subdir-aarch64-softmmu] Error 2

Remove the duplicated typedef to fix this issue.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 1543397736-8198-1-git-send-email-thuth@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Thomas Huth 2018-11-28 10:35:36 +01:00 committed by Peter Maydell
parent c56606684a
commit ea066d39ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/aspeed.c
View File

@ -29,11 +29,11 @@ static struct arm_boot_info aspeed_board_binfo = {
.nb_cpus = 1, .nb_cpus = 1,
}; };
typedef struct AspeedBoardState { struct AspeedBoardState {
AspeedSoCState soc; AspeedSoCState soc;
MemoryRegion ram; MemoryRegion ram;
MemoryRegion max_ram; MemoryRegion max_ram;
} AspeedBoardState; };
/* Palmetto hardware value: 0x120CE416 */ /* Palmetto hardware value: 0x120CE416 */
#define PALMETTO_BMC_HW_STRAP1 ( \ #define PALMETTO_BMC_HW_STRAP1 ( \