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

hw/nvram/fw_cfg: Rename fw_cfg_add_[file]_from_generator()

Browse source 
fw_cfg_add_from_generator() is adding a 'file' entry,
so rename as fw_cfg_add_file_from_generator() for
clarity. Besides, we might introduce generators for
other entry types.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20241206181352.6836-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-06 18:48:21 +01:00
parent 37bae93ce5
commit e20a4425ca
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/nvram/fw_cfg.c
View file

@ -1027,7 +1027,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
return NULL; return NULL;
} }
bool fw_cfg_add_from_generator(FWCfgState *s, const char *filename, bool fw_cfg_add_file_from_generator(FWCfgState *s, const char *filename,
const char *gen_id, Error **errp) const char *gen_id, Error **errp)
{ {
FWCfgDataGeneratorClass *klass; FWCfgDataGeneratorClass *klass;

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

@ -291,7 +291,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,
size_t len); size_t len);
/** /**
* fw_cfg_add_from_generator: * fw_cfg_add_file_from_generator:
* @s: fw_cfg device being modified * @s: fw_cfg device being modified
* @filename: name of new fw_cfg file item * @filename: name of new fw_cfg file item
* @gen_id: name of object implementing FW_CFG_DATA_GENERATOR interface * @gen_id: name of object implementing FW_CFG_DATA_GENERATOR interface
@ -307,7 +307,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,
* *
* Returns: %true on success, %false on error. * Returns: %true on success, %false on error.
*/ */
bool fw_cfg_add_from_generator(FWCfgState *s, const char *filename, bool fw_cfg_add_file_from_generator(FWCfgState *s, const char *filename,
const char *gen_id, Error **errp); const char *gen_id, Error **errp);
/** /**

2
system/vl.c
View file

@ -1184,7 +1184,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */ size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
buf = g_memdup(str, size); buf = g_memdup(str, size);
} else if (nonempty_str(gen_id)) { } else if (nonempty_str(gen_id)) {
if (!fw_cfg_add_from_generator(fw_cfg, name, gen_id, errp)) { if (!fw_cfg_add_file_from_generator(fw_cfg, name, gen_id, errp)) {
return -1; return -1;
} }
return 0; return 0;