On Fri, Dec 13, 2024 at 02:33:48PM +0100, Philippe Mathieu-Daudé wrote:
> Allow the FW_CFG_DATA_GENERATOR interface get_data() handler to
> return NULL when there is nothing to generate. In that case
> fw_cfg_add_file_from_generator() will not add any item and
> return %true.
>
> Reported-by: Daniel P. Berrangé <[email protected]>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> include/hw/nvram/fw_cfg.h | 13 ++++++++-----
> hw/nvram/fw_cfg.c | 10 ++++++----
> 2 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index fcb06f18cc3..5211018fd8f 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -30,8 +30,9 @@ struct FWCfgDataGeneratorClass {
> * @obj: the object implementing this interface
> * @errp: pointer to a NULL-initialized error object
> *
> - * Returns: reference to a byte array containing the data on success,
> - * or NULL on error.
> + * Returns: NULL on failure (errp set if not NULL).
> + * A byte array containing the data (if any,
> + * otherwise NULL) on success.
Bit confusing wording, lets say
Returns: A byte array containing data to add, or NULL without
@errp set if no data is required, or NULL with @errp
set on failure.
With that change:
Reviewed-by: Daniel P. Berrangé <[email protected]>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
