diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-12-13 14:22:02 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-12-14 00:16:18 +0100 |
| commit | 4016adc74aee696bca025e546edfd2ae8f57863b (patch) | |
| tree | cc48ed19931b90056d63a85b34efd92e55aa6720 /hw | |
| parent | 51680269fe08a739ac95dd651a11430b318b5bdf (diff) | |
| download | qemu-4016adc74aee696bca025e546edfd2ae8f57863b.zip qemu-4016adc74aee696bca025e546edfd2ae8f57863b.tar.gz qemu-4016adc74aee696bca025e546edfd2ae8f57863b.tar.bz2 | |
hw/nvram/fw_cfg: Skip FW_CFG_DATA_GENERATOR when no data to generate
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é <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20241213133352.10915-4-philmd@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/nvram/fw_cfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index b94cd27..46c62c8 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1031,6 +1031,7 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, Object *parent, const char *part, const char *filename, Error **errp) { + ERRP_GUARD(); FWCfgDataGeneratorClass *klass; GByteArray *array; Object *obj; @@ -1048,7 +1049,7 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, } klass = FW_CFG_DATA_GENERATOR_GET_CLASS(obj); array = klass->get_data(obj, errp); - if (!array) { + if (*errp || !array) { return false; } size = array->len; |