hw/nvram: use at24 macro

[PATCH] hw/nvram: use at24 macro

Posted by Patrick Venture 4 years ago

Use the macro for going from I2CSlave to EEPROMState.

Signed-off-by: Patrick Venture <venture@google.com>
---
 hw/nvram/eeprom_at24c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index af6f5dbb99..da435500ba 100644
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -54,7 +54,7 @@ struct EEPROMState {
 static
 int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
 {
-    EEPROMState *ee = container_of(s, EEPROMState, parent_obj);
+    EEPROMState *ee = AT24C_EE(s);
 
     switch (event) {
     case I2C_START_SEND:
-- 
2.34.1.703.g22d0c6ccf7-goog

Re: [PATCH] hw/nvram: use at24 macro

Posted by Philippe Mathieu-Daudé via 4 years ago

On 19/1/22 22:43, Patrick Venture wrote:
> Use the macro for going from I2CSlave to EEPROMState.
> 
> Signed-off-by: Patrick Venture <venture@google.com>
> ---
>   hw/nvram/eeprom_at24c.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH] hw/nvram: use at24 macro

Posted by Patrick Venture 4 years ago

On Wed, Jan 19, 2022 at 1:43 PM Patrick Venture <venture@google.com> wrote:

> Use the macro for going from I2CSlave to EEPROMState.
>
> Signed-off-by: Patrick Venture <venture@google.com>
> ---
>  hw/nvram/eeprom_at24c.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
> index af6f5dbb99..da435500ba 100644
> --- a/hw/nvram/eeprom_at24c.c
> +++ b/hw/nvram/eeprom_at24c.c
> @@ -54,7 +54,7 @@ struct EEPROMState {
>  static
>  int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
>  {
> -    EEPROMState *ee = container_of(s, EEPROMState, parent_obj);
> +    EEPROMState *ee = AT24C_EE(s);
>
>      switch (event) {
>      case I2C_START_SEND:
> --
> 2.34.1.703.g22d0c6ccf7-goog
>

+Corey - thanks!

Re: [PATCH] hw/nvram: use at24 macro

Posted by Paolo Bonzini 4 years ago

On 1/19/22 22:43, Patrick Venture wrote:
> Use the macro for going from I2CSlave to EEPROMState.
> 
> Signed-off-by: Patrick Venture <venture@google.com>
> ---
>   hw/nvram/eeprom_at24c.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
> index af6f5dbb99..da435500ba 100644
> --- a/hw/nvram/eeprom_at24c.c
> +++ b/hw/nvram/eeprom_at24c.c
> @@ -54,7 +54,7 @@ struct EEPROMState {
>   static
>   int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
>   {
> -    EEPROMState *ee = container_of(s, EEPROMState, parent_obj);
> +    EEPROMState *ee = AT24C_EE(s);
>   
>       switch (event) {
>       case I2C_START_SEND:

Cc: qemu-trivial@nongnu.org

Re: [PATCH] hw/nvram: use at24 macro

Posted by Laurent Vivier 3 years, 11 months ago

Le 25/01/2022 à 10:20, Paolo Bonzini a écrit :
> On 1/19/22 22:43, Patrick Venture wrote:
>> Use the macro for going from I2CSlave to EEPROMState.
>>
>> Signed-off-by: Patrick Venture <venture@google.com>
>> ---
>>   hw/nvram/eeprom_at24c.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
>> index af6f5dbb99..da435500ba 100644
>> --- a/hw/nvram/eeprom_at24c.c
>> +++ b/hw/nvram/eeprom_at24c.c
>> @@ -54,7 +54,7 @@ struct EEPROMState {
>>   static
>>   int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
>>   {
>> -    EEPROMState *ee = container_of(s, EEPROMState, parent_obj);
>> +    EEPROMState *ee = AT24C_EE(s);
>>       switch (event) {
>>       case I2C_START_SEND:
> 
> Cc: qemu-trivial@nongnu.org
> 

Applied to my trivial-patches branch.

Thanks,
Laurent