| Message ID | 20191003225437.16651-3-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | fw_cfg: Run tests on big-endian | expand |
On 10/04/19 00:54, Philippe Mathieu-Daudé wrote: > Document mm_fw_cfg_init() return value must be released > with g_free(). mm_fw_cfg_uninit() was never used, remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/libqos/fw_cfg.c | 5 ----- > tests/libqos/fw_cfg.h | 10 +++++++++- > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c > index 37c3f2cf4d..ddeec821db 100644 > --- a/tests/libqos/fw_cfg.c > +++ b/tests/libqos/fw_cfg.c > @@ -126,11 +126,6 @@ QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base) > return fw_cfg; > } > > -void mm_fw_cfg_uninit(QFWCFG *fw_cfg) > -{ > - g_free(fw_cfg); > -} > - > static void io_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) > { > qtest_outw(fw_cfg->qts, fw_cfg->base, key); > diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h > index 15604040bd..3247fd4000 100644 > --- a/tests/libqos/fw_cfg.h > +++ b/tests/libqos/fw_cfg.h > @@ -34,8 +34,16 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key); > size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename, > void *data, size_t buflen); > > +/** > + * mm_fw_cfg_init(): > + * @qts: The #QTestState that will be referred to by the QFWCFG object. > + * @base: The MMIO base address of the fw_cfg device in the guest. > + * > + * Returns a newly allocated QFWCFG object which must be released > + * with a call to g_free() when no longer required. > + */ > QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base); > -void mm_fw_cfg_uninit(QFWCFG *fw_cfg); > + > /** > * io_fw_cfg_init(): > * @qts: The #QTestState that will be referred to by the QFWCFG object. > Sigh, we've never even called this function :/ Reviewed-by: Laszlo Ersek <lersek@redhat.com>
diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index 37c3f2cf4d..ddeec821db 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -126,11 +126,6 @@ QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base) return fw_cfg; } -void mm_fw_cfg_uninit(QFWCFG *fw_cfg) -{ - g_free(fw_cfg); -} - static void io_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) { qtest_outw(fw_cfg->qts, fw_cfg->base, key); diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 15604040bd..3247fd4000 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -34,8 +34,16 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key); size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename, void *data, size_t buflen); +/** + * mm_fw_cfg_init(): + * @qts: The #QTestState that will be referred to by the QFWCFG object. + * @base: The MMIO base address of the fw_cfg device in the guest. + * + * Returns a newly allocated QFWCFG object which must be released + * with a call to g_free() when no longer required. + */ QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base); -void mm_fw_cfg_uninit(QFWCFG *fw_cfg); + /** * io_fw_cfg_init(): * @qts: The #QTestState that will be referred to by the QFWCFG object.
Document mm_fw_cfg_init() return value must be released with g_free(). mm_fw_cfg_uninit() was never used, remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/libqos/fw_cfg.c | 5 ----- tests/libqos/fw_cfg.h | 10 +++++++++- 2 files changed, 9 insertions(+), 6 deletions(-)