motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 01:21:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/nvram/fw_cfg: Skip FW_CFG_DATA_GENERATOR when no data to generate

Browse source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-13 14:22:02 +01:00
parent 51680269fe
commit 4016adc74a
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/nvram/fw_cfg.c
View file

@ -1031,6 +1031,7 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s,
Object *parent, const char *part, Object *parent, const char *part,
const char *filename, Error **errp) const char *filename, Error **errp)
{ {
ERRP_GUARD();
FWCfgDataGeneratorClass *klass; FWCfgDataGeneratorClass *klass;
GByteArray *array; GByteArray *array;
Object *obj; Object *obj;
@ -1048,7 +1049,7 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s,
} }
klass = FW_CFG_DATA_GENERATOR_GET_CLASS(obj); klass = FW_CFG_DATA_GENERATOR_GET_CLASS(obj);
array = klass->get_data(obj, errp); array = klass->get_data(obj, errp);
if (!array) { if (*errp || !array) {
return false; return false;
} }
size = array->len; size = array->len;

13
include/hw/nvram/fw_cfg.h
View file

@ -30,8 +30,9 @@ struct FWCfgDataGeneratorClass {
* @obj: the object implementing this interface * @obj: the object implementing this interface
* @errp: pointer to a NULL-initialized error object * @errp: pointer to a NULL-initialized error object
* *
* Returns: reference to a byte array containing the data on success, * Returns: A byte array containing data to add, or NULL without
* or NULL on error. * @errp set if no data is required, or NULL with @errp
* set on failure.
* *
* The caller should release the reference when no longer * The caller should release the reference when no longer
* required. * required.
@ -298,14 +299,16 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,
* @parent: the object in which to resolve the @part * @parent: the object in which to resolve the @part
* @errp: pointer to a NULL initialized error object * @errp: pointer to a NULL initialized error object
* *
* Add a new NAMED fw_cfg item with the content generated from the * If the @part object generates content, add a new NAMED fw_cfg item with it.
* @part object. The data generated by the @part object is copied * The data generated by the @part object is copied into the data structure of
* into the data structure of the fw_cfg device. * the fw_cfg device.
* The next available (unused) selector key starting at FW_CFG_FILE_FIRST * The next available (unused) selector key starting at FW_CFG_FILE_FIRST
* will be used; also, a new entry will be added to the file directory * will be used; also, a new entry will be added to the file directory
* structure residing at key value FW_CFG_FILE_DIR, containing the item name, * structure residing at key value FW_CFG_FILE_DIR, containing the item name,
* data size, and assigned selector key value. * data size, and assigned selector key value.
* *
* If the @part object does not generate content, no fw_cfg item is added.
*
* Returns: %true on success, %false on error. * Returns: %true on success, %false on error.
*/ */
bool fw_cfg_add_file_from_generator(FWCfgState *s, bool fw_cfg_add_file_from_generator(FWCfgState *s,