| Message ID | 20191007151905.32766-2-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/7] tests/libqos/fw_cfg: Document io_fw_cfg_init to drop io_fw_cfg_uninit | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年10月7日周一 下午11:19写道： > Document io_fw_cfg_init() return value must be released > with g_free(). Directly calling g_free() we don't really > need io_fw_cfg_uninit(): remove it. > > This partly reverts commit 0729d833d6d6: > "tests/libqos: Add io_fw_cfg_uninit()" > > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > tests/libqos/fw_cfg.c | 5 ----- > tests/libqos/fw_cfg.h | 11 +++++++++-- > 2 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c > index 1f46258f96..37c3f2cf4d 100644 > --- a/tests/libqos/fw_cfg.c > +++ b/tests/libqos/fw_cfg.c > @@ -157,8 +157,3 @@ QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base) > > return fw_cfg; > } > - > -void io_fw_cfg_uninit(QFWCFG *fw_cfg) > -{ > - g_free(fw_cfg); > -} > diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h > index 13325cc4ff..15604040bd 100644 > --- a/tests/libqos/fw_cfg.h > +++ b/tests/libqos/fw_cfg.h > @@ -36,8 +36,15 @@ size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char > *filename, > > 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. > + * @base: The I/O 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 *io_fw_cfg_init(QTestState *qts, uint16_t base); > -void io_fw_cfg_uninit(QFWCFG *fw_cfg); > > static inline QFWCFG *pc_fw_cfg_init(QTestState *qts) > { > @@ -46,7 +53,7 @@ static inline QFWCFG *pc_fw_cfg_init(QTestState *qts) > > static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg) > { > - io_fw_cfg_uninit(fw_cfg); > + g_free(fw_cfg); > } > > #endif > -- > 2.21.0 > >
diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index 1f46258f96..37c3f2cf4d 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -157,8 +157,3 @@ QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base) return fw_cfg; } - -void io_fw_cfg_uninit(QFWCFG *fw_cfg) -{ - g_free(fw_cfg); -} diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 13325cc4ff..15604040bd 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -36,8 +36,15 @@ size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename, 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. + * @base: The I/O 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 *io_fw_cfg_init(QTestState *qts, uint16_t base); -void io_fw_cfg_uninit(QFWCFG *fw_cfg); static inline QFWCFG *pc_fw_cfg_init(QTestState *qts) { @@ -46,7 +53,7 @@ static inline QFWCFG *pc_fw_cfg_init(QTestState *qts) static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg) { - io_fw_cfg_uninit(fw_cfg); + g_free(fw_cfg); } #endif