Make prototypes correspond to their origins. Also drop
address_space_rw_cached() which doesn't exist anywhere in the code.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
 scripts/coverity-scan/model.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/coverity-scan/model.c b/scripts/coverity-scan/model.c
index 686d1a3008..b40d0fcbf3 100644
--- a/scripts/coverity-scan/model.c
+++ b/scripts/coverity-scan/model.c
@@ -69,7 +69,6 @@ static void __bufread(uint8_t *buf, ssize_t len)
 }
 
 MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
-                                      MemTxAttrs attrs,
                                       void *buf, int len)
 {
     MemTxResult result;
@@ -80,25 +79,13 @@ MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
 }
 
 MemTxResult address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
-                                MemTxAttrs attrs,
-                                const void *buf, int len)
+                                       const void *buf, int len)
 {
     MemTxResult result;
     __bufread(buf, len);
     return result;
 }
 
-MemTxResult address_space_rw_cached(MemoryRegionCache *cache, hwaddr addr,
-                                    MemTxAttrs attrs,
-                                    void *buf, int len, bool is_write)
-{
-    if (is_write) {
-        return address_space_write_cached(cache, addr, attrs, buf, len);
-    } else {
-        return address_space_read_cached(cache, addr, attrs, buf, len);
-    }
-}
-
 MemTxResult address_space_read(AddressSpace *as, hwaddr addr,
                                MemTxAttrs attrs,
                                void *buf, int len)
-- 
2.34.1

On 23/12/22 21:43, Vladimir Sementsov-Ogievskiy wrote:
> Make prototypes correspond to their origins. Also drop
> address_space_rw_cached() which doesn't exist anywhere in the code.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> ---
>   scripts/coverity-scan/model.c | 15 +--------------
>   1 file changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/scripts/coverity-scan/model.c b/scripts/coverity-scan/model.c
> index 686d1a3008..b40d0fcbf3 100644
> --- a/scripts/coverity-scan/model.c
> +++ b/scripts/coverity-scan/model.c
> @@ -69,7 +69,6 @@ static void __bufread(uint8_t *buf, ssize_t len)
>   }
>   
>   MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
> -                                      MemTxAttrs attrs,
>                                         void *buf, int len)
>   {
>       MemTxResult result;
> @@ -80,25 +79,13 @@ MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
>   }
>   
>   MemTxResult address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
> -                                MemTxAttrs attrs,
> -                                const void *buf, int len)
> +                                       const void *buf, int len)
>   {

Oops, missed in commit daa3dda43a ("exec: Let the address_space API use
void pointer arguments").

> -MemTxResult address_space_rw_cached(MemoryRegionCache *cache, hwaddr addr,
> -                                    MemTxAttrs attrs,
> -                                    void *buf, int len, bool is_write)
> -{
> -    if (is_write) {
> -        return address_space_write_cached(cache, addr, attrs, buf, len);
> -    } else {
> -        return address_space_read_cached(cache, addr, attrs, buf, len);
> -    }
> -}

Apparently never required?

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Thanks!

On 12/24/22 14:22, Philippe Mathieu-Daudé wrote:
> On 23/12/22 21:43, Vladimir Sementsov-Ogievskiy wrote:
>> Make prototypes correspond to their origins. Also drop
>> address_space_rw_cached() which doesn't exist anywhere in the code.
>>
>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
>> ---
>>   scripts/coverity-scan/model.c | 15 +--------------
>>   1 file changed, 1 insertion(+), 14 deletions(-)
>>
>> diff --git a/scripts/coverity-scan/model.c b/scripts/coverity-scan/model.c
>> index 686d1a3008..b40d0fcbf3 100644
>> --- a/scripts/coverity-scan/model.c
>> +++ b/scripts/coverity-scan/model.c
>> @@ -69,7 +69,6 @@ static void __bufread(uint8_t *buf, ssize_t len)
>>   }
>>   MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
>> -                                      MemTxAttrs attrs,
>>                                         void *buf, int len)
>>   {
>>       MemTxResult result;
>> @@ -80,25 +79,13 @@ MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
>>   }
>>   MemTxResult address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
>> -                                MemTxAttrs attrs,
>> -                                const void *buf, int len)
>> +                                       const void *buf, int len)
>>   {
> 
> Oops, missed in commit daa3dda43a ("exec: Let the address_space API use
> void pointer arguments").
> 
>> -MemTxResult address_space_rw_cached(MemoryRegionCache *cache, hwaddr addr,
>> -                                    MemTxAttrs attrs,
>> -                                    void *buf, int len, bool is_write)
>> -{
>> -    if (is_write) {
>> -        return address_space_write_cached(cache, addr, attrs, buf, len);
>> -    } else {
>> -        return address_space_read_cached(cache, addr, attrs, buf, len);
>> -    }
>> -}
> 
> Apparently never required?
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 

Thanks for reviewing!

Seems, even better patch is possible, we can get rid of the whole physmem-related modelling, look at "[PATCH] coverity: physmem: use simple assertions instead of modelling".


-- 
Best regards,
Vladimir