ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fw_cfg: add API to find FW cfg object 

Remove some code duplication by adding a
function to look up the fw cfg file.
This way, we don't need to duplicate same strings everywhere.
Use by both fw cfg and pvpanic device.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-05-30 16:07:58 +03:00
parent 45936c8b79
commit 600c60b76d
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/misc/pvpanic.c
View File

@ -96,7 +96,7 @@ static int pvpanic_isa_initfn(ISADevice *dev)
isa_register_ioport(dev, &s->io, s->ioport); isa_register_ioport(dev, &s->io, s->ioport);
if (!port_configured) { if (!port_configured) {
fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); fw_cfg = fw_cfg_find();
if (fw_cfg) { if (fw_cfg) {
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", fw_cfg_add_file(fw_cfg, "etc/pvpanic-port",
g_memdup(&s->ioport, sizeof(s->ioport)), g_memdup(&s->ioport, sizeof(s->ioport)),

15
hw/nvram/fw_cfg.c
View File

@ -32,6 +32,9 @@
#define FW_CFG_SIZE 2 #define FW_CFG_SIZE 2
#define FW_CFG_DATA_SIZE 1 #define FW_CFG_DATA_SIZE 1
#define TYPE_FW_CFG "fw_cfg"
#define FW_CFG_NAME "fw_cfg"
#define FW_CFG_PATH "/machine/" FW_CFG_NAME
typedef struct FWCfgEntry { typedef struct FWCfgEntry {
uint32_t len; uint32_t len;
@ -493,8 +496,8 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
s = DO_UPCAST(FWCfgState, busdev.qdev, dev); s = DO_UPCAST(FWCfgState, busdev.qdev, dev);
if (!object_resolve_path("/machine/fw_cfg", NULL)) { if (!object_resolve_path(FW_CFG_PATH, NULL)) {
object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), object_property_add_child(qdev_get_machine(), FW_CFG_NAME, OBJECT(s),
NULL); NULL);
} }
@ -553,6 +556,12 @@ static Property fw_cfg_properties[] = {
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
FWCfgState *fw_cfg_find(void)
{
return OBJECT_CHECK(FWCfgState, object_resolve_path(FW_CFG_PATH, NULL),
TYPE_FW_CFG);
}
static void fw_cfg_class_init(ObjectClass *klass, void *data) static void fw_cfg_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
@ -566,7 +575,7 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo fw_cfg_info = { static const TypeInfo fw_cfg_info = {
.name = "fw_cfg", .name = TYPE_FW_CFG,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(FWCfgState), .instance_size = sizeof(FWCfgState),
.class_init = fw_cfg_class_init, .class_init = fw_cfg_class_init,

2
include/hw/nvram/fw_cfg.h
View File

@ -73,6 +73,8 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data,
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
hwaddr crl_addr, hwaddr data_addr); hwaddr crl_addr, hwaddr data_addr);
FWCfgState *fw_cfg_find(void);
#endif /* NO_QEMU_PROTOS */ #endif /* NO_QEMU_PROTOS */
#endif #endif