diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-04-22 11:58:00 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-05-23 14:10:31 +0200 |
| commit | 65461d124363d97b387337db9b970df60c31819d (patch) | |
| tree | 58b032405c2a4941b375ac808a8ccd812bc607c2 | |
| parent | 0729d833d6d6f9ec7a865b3f1c2bb727bb9e604b (diff) | |
| download | focaccia-qemu-65461d124363d97b387337db9b970df60c31819d.tar.gz focaccia-qemu-65461d124363d97b387337db9b970df60c31819d.zip | |
tests/libqos: Add pc_fw_cfg_uninit() and use it
The pc_fw_cfg_init() function allocates an IO QFWCFG object. Add the pc_fw_cfg_uninit() function to deallocate it (and use it). Signed-off-by: Li Qiang <liq3ea@163.com> Tested-by: Thomas Huth <thuth@redhat.com> Message-Id: <20190424140643.62457-2-liq3ea@163.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> [PMD: Split patch, fill commit description, call uninit in malloc-pc.c] Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | tests/libqos/fw_cfg.h | 5 | ||||
| -rw-r--r-- | tests/libqos/malloc-pc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 391669031a..60de81e863 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -42,4 +42,9 @@ static inline QFWCFG *pc_fw_cfg_init(QTestState *qts) return io_fw_cfg_init(qts, 0x510); } +static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg) +{ + io_fw_cfg_uninit(fw_cfg); +} + #endif diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c index 949a99361d..6f92ce4135 100644 --- a/tests/libqos/malloc-pc.c +++ b/tests/libqos/malloc-pc.c @@ -29,5 +29,5 @@ void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags) alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), PAGE_SIZE); /* clean-up */ - g_free(fw_cfg); + pc_fw_cfg_uninit(fw_cfg); } |