* [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h'
@ 2023-10-09 9:21 Philippe Mathieu-Daudé
2023-10-09 11:17 ` BALATON Zoltan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-10-09 9:21 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Aurelien Jarno, Corey Minyard,
Jiaxun Yang, BALATON Zoltan
Since commit 93198b6cad ("i2c: Split smbus into parts") the SDRAM
types are enumerated as sdram_type in "hw/i2c/smbus_eeprom.h".
Using the enum removes this global shadow warning:
hw/mips/malta.c:209:12: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
enum { SDR = 0x4, DDR2 = 0x8 } type;
^
include/hw/i2c/smbus_eeprom.h:33:19: note: previous declaration is here
enum sdram_type { SDR = 0x4, DDR = 0x7, DDR2 = 0x8 };
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/mips/malta.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index dac27fad9d..62d04ed113 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -206,7 +206,7 @@ static eeprom24c0x_t spd_eeprom = {
static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size)
{
- enum { SDR = 0x4, DDR2 = 0x8 } type;
+ enum sdram_type type;
uint8_t *spd = spd_eeprom.contents;
uint8_t nbanks = 0;
uint16_t density = 0;
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h'
2023-10-09 9:21 [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h' Philippe Mathieu-Daudé
@ 2023-10-09 11:17 ` BALATON Zoltan
2023-10-10 16:38 ` Richard Henderson
2023-10-16 9:06 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: BALATON Zoltan @ 2023-10-09 11:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Aurelien Jarno, Corey Minyard, Jiaxun Yang
[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]
On Mon, 9 Oct 2023, Philippe Mathieu-Daudé wrote:
> Since commit 93198b6cad ("i2c: Split smbus into parts") the SDRAM
> types are enumerated as sdram_type in "hw/i2c/smbus_eeprom.h".
>
> Using the enum removes this global shadow warning:
>
> hw/mips/malta.c:209:12: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
> enum { SDR = 0x4, DDR2 = 0x8 } type;
> ^
> include/hw/i2c/smbus_eeprom.h:33:19: note: previous declaration is here
> enum sdram_type { SDR = 0x4, DDR = 0x7, DDR2 = 0x8 };
> ^
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> hw/mips/malta.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index dac27fad9d..62d04ed113 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -206,7 +206,7 @@ static eeprom24c0x_t spd_eeprom = {
>
> static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size)
> {
> - enum { SDR = 0x4, DDR2 = 0x8 } type;
> + enum sdram_type type;
> uint8_t *spd = spd_eeprom.contents;
> uint8_t nbanks = 0;
> uint16_t density = 0;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h'
2023-10-09 9:21 [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h' Philippe Mathieu-Daudé
2023-10-09 11:17 ` BALATON Zoltan
@ 2023-10-10 16:38 ` Richard Henderson
2023-10-16 9:06 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2023-10-10 16:38 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Aurelien Jarno, Corey Minyard, Jiaxun Yang, BALATON Zoltan
On 10/9/23 02:21, Philippe Mathieu-Daudé wrote:
> Since commit 93198b6cad ("i2c: Split smbus into parts") the SDRAM
> types are enumerated as sdram_type in "hw/i2c/smbus_eeprom.h".
>
> Using the enum removes this global shadow warning:
>
> hw/mips/malta.c:209:12: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
> enum { SDR = 0x4, DDR2 = 0x8 } type;
> ^
> include/hw/i2c/smbus_eeprom.h:33:19: note: previous declaration is here
> enum sdram_type { SDR = 0x4, DDR = 0x7, DDR2 = 0x8 };
> ^
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h'
2023-10-09 9:21 [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h' Philippe Mathieu-Daudé
2023-10-09 11:17 ` BALATON Zoltan
2023-10-10 16:38 ` Richard Henderson
@ 2023-10-16 9:06 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-10-16 9:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Aurelien Jarno, Corey Minyard, Jiaxun Yang, BALATON Zoltan
On 9/10/23 11:21, Philippe Mathieu-Daudé wrote:
> Since commit 93198b6cad ("i2c: Split smbus into parts") the SDRAM
> types are enumerated as sdram_type in "hw/i2c/smbus_eeprom.h".
>
> Using the enum removes this global shadow warning:
>
> hw/mips/malta.c:209:12: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
> enum { SDR = 0x4, DDR2 = 0x8 } type;
> ^
> include/hw/i2c/smbus_eeprom.h:33:19: note: previous declaration is here
> enum sdram_type { SDR = 0x4, DDR = 0x7, DDR2 = 0x8 };
> ^
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/mips/malta.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Queued to mips-next.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-16 9:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 9:21 [PATCH] hw/mips/malta: Use sdram_type enum from 'hw/i2c/smbus_eeprom.h' Philippe Mathieu-Daudé
2023-10-09 11:17 ` BALATON Zoltan
2023-10-10 16:38 ` Richard Henderson
2023-10-16 9:06 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).