Drop one more client of global_qtest by teaching all fw_cfg test functionality (invoked through alloc-pc) to pass in an explicit QTestState, adjusting all callers. In particular, fw_cfg-test had to reorder things to create the test state prior to creating the fw_cfg (and drop a pointless strdup in the meantime), but that test now no longer depends on global_qtest. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> [thuth: Fixed conflict wrt pc_alloc_init() in vhost-user-test.c] Signed-off-by: Thomas Huth <thuth@redhat.com>
44 lines
1.1 KiB
C
44 lines
1.1 KiB
C
/*
|
|
* libqos fw_cfg support
|
|
*
|
|
* Copyright IBM, Corp. 2012-2013
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef LIBQOS_FW_CFG_H
|
|
#define LIBQOS_FW_CFG_H
|
|
|
|
#include "libqtest.h"
|
|
|
|
typedef struct QFWCFG QFWCFG;
|
|
|
|
struct QFWCFG
|
|
{
|
|
uint64_t base;
|
|
QTestState *qts;
|
|
void (*select)(QFWCFG *fw_cfg, uint16_t key);
|
|
void (*read)(QFWCFG *fw_cfg, void *data, size_t len);
|
|
};
|
|
|
|
void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key);
|
|
void qfw_cfg_read_data(QFWCFG *fw_cfg, void *data, size_t len);
|
|
void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len);
|
|
uint16_t qfw_cfg_get_u16(QFWCFG *fw_cfg, uint16_t key);
|
|
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);
|
|
QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base);
|
|
|
|
static inline QFWCFG *pc_fw_cfg_init(QTestState *qts)
|
|
{
|
|
return io_fw_cfg_init(qts, 0x510);
|
|
}
|
|
|
|
#endif
|