ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/nvram/fw_cfg: Simplify fw_cfg_add_from_generator() error propagation 

Document FWCfgDataGeneratorClass::get_data() return NULL
on error, and non-NULL on success. This allow us to simplify
fw_cfg_add_from_generator(). Since we don't need a local
variable to propagate the error, we can remove the ERRP_GUARD()
macro.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200721131911.27380-2-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-07-21 15:05:51 +02:00
parent 90218a9a39
commit a3ad58342a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/nvram/fw_cfg.c
View File

@ -1035,7 +1035,6 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
void fw_cfg_add_from_generator(FWCfgState *s, const char *filename, void fw_cfg_add_from_generator(FWCfgState *s, const char *filename,
const char *gen_id, Error **errp) const char *gen_id, Error **errp)
{ {
ERRP_GUARD();
FWCfgDataGeneratorClass *klass; FWCfgDataGeneratorClass *klass;
GByteArray *array; GByteArray *array;
Object *obj; Object *obj;
@ -1053,7 +1052,7 @@ void fw_cfg_add_from_generator(FWCfgState *s, const char *filename,
} }
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 (*errp) { if (!array) {
return; return;
} }
size = array->len; size = array->len;

4
include/hw/nvram/fw_cfg.h
View File

@ -32,7 +32,9 @@ typedef 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. * Returns: reference to a byte array containing the data on success,
* or NULL on error.
*
* The caller should release the reference when no longer * The caller should release the reference when no longer
* required. * required.
*/ */