[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/7] tests/libqos: Add io_fw_cfg_uninit() and mm_
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 1/7] tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit() |
Date: |
Mon, 20 May 2019 23:36:54 +0200 |
The mm_fw_cfg_init() allocates a QFWCFG object,
add mm_fw_cfg_uninit() to deallocate it.
Similarly with io_fw_cfg_init(), add io_fw_cfg_uninit().
Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Split patch, filled commit description]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/libqos/fw_cfg.c | 10 ++++++++++
tests/libqos/fw_cfg.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c
index d0889d1e22a..c6839c53c80 100644
--- a/tests/libqos/fw_cfg.c
+++ b/tests/libqos/fw_cfg.c
@@ -81,6 +81,11 @@ 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);
@@ -107,3 +112,8 @@ 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 0353416af07..391669031a3 100644
--- a/tests/libqos/fw_cfg.h
+++ b/tests/libqos/fw_cfg.h
@@ -33,7 +33,9 @@ uint32_t qfw_cfg_get_u32(QFWCFG *fw_cfg, uint16_t key);
uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key);
QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base);
+void mm_fw_cfg_uninit(QFWCFG *fw_cfg);
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)
{
--
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é <=
- [Qemu-devel] [PATCH v3 2/7] tests/libqos: Add pc_fw_cfg_uninit() and use it, Philippe Mathieu-Daudé, 2019/05/20
- [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