Re: [PATCH 12/18] hw/nvram/fw_cfg: Inline fw_cfg_file_slots()

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

Hi Igor,

On 6/6/25 15:29, Igor Mammedov wrote:
> On Thu,  1 May 2025 23:04:50 +0200
> Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> 
>> Now than fw_cfg_file_slots() only returns
>> FW_CFG_FILE_SLOTS_DFLT, we can inline it.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> does this even compile?
> I see more usages of fw_cfg_file_slots(), then being removed here.
> 
> git grep "fw_cfg_file_slots("
> hw/nvram/fw_cfg.c:static inline uint16_t fw_cfg_file_slots(const FWCfgState *s)
> hw/nvram/fw_cfg.c:    return FW_CFG_FILE_FIRST + fw_cfg_file_slots(s);
> hw/nvram/fw_cfg.c:        dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * fw_cfg_file_slots(s);
> hw/nvram/fw_cfg.c:    assert(count < fw_cfg_file_slots(s));
> hw/nvram/fw_cfg.c:    assert(index < fw_cfg_file_slots(s));
> hw/nvram/fw_cfg.c:    if (fw_cfg_file_slots(s) < FW_CFG_FILE_SLOTS_MIN) {
> hw/nvram/fw_cfg.c:     * configuration is (FW_CFG_FILE_FIRST + fw_cfg_file_slots(s)). */
> hw/nvram/fw_cfg.c:    if (fw_cfg_file_slots(s) > file_slots_max) {

No problem in the branch I posted, commit from April (and yes,
it does compile fine):

$ git grep "fw_cfg_file_slots(" 09deca844303fde6761
$

I'm OK to rebase/respin once the prerequisite series are merged.

Regards,

Phil.

> 
> if we decide to remove x-file-slots, this patch probably needs some fixing
>> ---
>>   hw/nvram/fw_cfg.c | 13 ++++---------
>>   1 file changed, 4 insertions(+), 9 deletions(-)