[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/7] tests/libqos: Add pc_fw_cfg_uninit() and use
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 2/7] tests/libqos: Add pc_fw_cfg_uninit() and use it |
Date: |
Mon, 20 May 2019 23:36:55 +0200 |
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 <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Split patch, fill commit description, call uninit in malloc-pc.c]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/fw_cfg-test.c | 1 +
tests/libqos/fw_cfg.h | 5 +++++
tests/libqos/malloc-pc.c | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
index 1c5103fe1c5..a370ad56678 100644
--- a/tests/fw_cfg-test.c
+++ b/tests/fw_cfg-test.c
@@ -128,6 +128,7 @@ int main(int argc, char **argv)
ret = g_test_run();
+ pc_fw_cfg_uninit(fw_cfg);
qtest_quit(s);
return ret;
diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h
index 391669031a3..60de81e8633 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 949a99361d1..6f92ce41350 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);
}
--
2.20.1
- [Qemu-devel] [PATCH v3 0/7] fw_cfg_test refactor and add two test cases, Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 1/7] tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit(), Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 2/7] tests/libqos: Add pc_fw_cfg_uninit() and use it,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 3/7] tests: refactor fw_cfg_test, Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 4/7] tests: fw_cfg: add a function to get the fw_cfg file, Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 5/7] hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian, Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 6/7] tests: fw_cfg: add 'reboot-timeout' test case, Philippe Mathieu-Daudé, 2019/05/20
- [Qemu-devel] [PATCH v3 7/7] tests: fw_cfg: add 'splash-time' test case, Philippe Mathieu-Daudé, 2019/05/20
- Re: [Qemu-devel] [PATCH v3 0/7] fw_cfg_test refactor and add two test cases, Philippe Mathieu-Daudé, 2019/05/22