diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-18 16:34:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-18 16:34:26 +0100 |
| commit | 053a4177817db307ec854356e95b5b350800a216 (patch) | |
| tree | 562f543ea47f121c5ab608405d7b66475a58e8fd | |
| parent | e883b492c221241d28aaa322c61536436090538a (diff) | |
| parent | 4318432ccd3f7fb69b7169f39dcae3d4ee04f5ea (diff) | |
| download | qemu-053a4177817db307ec854356e95b5b350800a216.zip qemu-053a4177817db307ec854356e95b5b350800a216.tar.gz qemu-053a4177817db307ec854356e95b5b350800a216.tar.bz2 | |
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging
fw_cfg patches
Fixes a bug in the recently introduced fw_cfg_add_from_generator().
CI jobs results:
. https://gitlab.com/philmd/qemu/-/pipelines/191714875
. https://travis-ci.org/github/philmd/qemu/builds/728288784
. https://app.shippable.com/github/philmd/qemu/runs/869/1/console
# gpg: Signature made Fri 18 Sep 2020 16:20:56 BST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd-gitlab/tags/fw_cfg-20200918:
hw/nvram/fw_cfg: fix FWCfgDataGeneratorClass::get_data() consumption
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/nvram/fw_cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index f3a4728..0e95d05 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1056,7 +1056,7 @@ bool fw_cfg_add_from_generator(FWCfgState *s, const char *filename, return false; } size = array->len; - fw_cfg_add_file(s, filename, g_byte_array_free(array, TRUE), size); + fw_cfg_add_file(s, filename, g_byte_array_free(array, FALSE), size); return true; } |