mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libqos: Generalize I/O-mapped fw_cfg

Browse Source 
Provide a constructor that takes the base address in addition to the
PC-specific one.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1372254743-15808-12-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2013-06-26 15:52:22 +02:00 committed by Anthony Liguori
parent f88dc7dd4d
commit 26491a388c
7 changed files with 35 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@ -128,7 +128,7 @@ tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a
libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o
libqos-obj-y += tests/libqos/i2c.o
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o tests/libqos/fw_cfg-pc.o
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
libqos-pc-obj-y += tests/libqos/malloc-pc.o
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o

2
tests/fw_cfg-test.c
View File

@ -14,7 +14,7 @@
#include "libqtest.h"
#include "hw/nvram/fw_cfg.h"
#include "libqos/fw_cfg-pc.h"
#include "libqos/fw_cfg.h"
#include <string.h>
#include <glib.h>

40
tests/libqos/fw_cfg-pc.c
View File

@ -1,40 +0,0 @@
/*
* libqos fw_cfg support for PC
*
* 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.
*/
#include "libqos/fw_cfg-pc.h"
#include "libqtest.h"
#include <glib.h>
static void pc_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key)
{
outw(0x510, key);
}
static void pc_fw_cfg_read(QFWCFG *fw_cfg, void *data, size_t len)
{
uint8_t *ptr = data;
int i;
for (i = 0; i < len; i++) {
ptr[i] = inb(0x511);
}
}
QFWCFG *pc_fw_cfg_init(void)
{
QFWCFG *fw_cfg = g_malloc0(sizeof(*fw_cfg));
fw_cfg->select = pc_fw_cfg_select;
fw_cfg->read = pc_fw_cfg_read;
return fw_cfg;
}

20
tests/libqos/fw_cfg-pc.h
View File

@ -1,20 +0,0 @@
/*
* libqos fw_cfg support for PC
*
* 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_PC_H
#define LIBQOS_FW_CFG_PC_H
#include "libqos/fw_cfg.h"
QFWCFG *pc_fw_cfg_init(void);
#endif

26
tests/libqos/fw_cfg.c
View File

@ -79,3 +79,29 @@ QFWCFG *mm_fw_cfg_init(uint64_t base)
return fw_cfg;
}
static void io_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key)
{
outw(fw_cfg->base, key);
}
static void io_fw_cfg_read(QFWCFG *fw_cfg, void *data, size_t len)
{
uint8_t *ptr = data;
int i;
for (i = 0; i < len; i++) {
ptr[i] = inb(fw_cfg->base + 1);
}
}
QFWCFG *io_fw_cfg_init(uint16_t base)
{
QFWCFG *fw_cfg = g_malloc0(sizeof(*fw_cfg));
fw_cfg->base = base;
fw_cfg->select = io_fw_cfg_select;
fw_cfg->read = io_fw_cfg_read;
return fw_cfg;
}

6
tests/libqos/fw_cfg.h
View File

@ -33,5 +33,11 @@ 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(uint64_t base);
QFWCFG *io_fw_cfg_init(uint16_t base);
static inline QFWCFG *pc_fw_cfg_init(void)
{
return io_fw_cfg_init(0x510);
}
#endif

2
tests/libqos/malloc-pc.c
View File

@ -11,7 +11,7 @@
*/
#include "libqos/malloc-pc.h"
#include "libqos/fw_cfg-pc.h"
#include "libqos/fw_cfg.h"
#define NO_QEMU_PROTOS
#include "hw/nvram/fw_cfg.h"