Revision 10a584b2
b/hw/misc/pvpanic.c | ||
---|---|---|
18 | 18 |
#include "sysemu/sysemu.h" |
19 | 19 |
#include "qemu/log.h" |
20 | 20 |
|
21 |
#include "hw/nvram/fw_cfg.h" |
|
22 |
|
|
21 | 23 |
/* The bit of supported pv event */ |
22 | 24 |
#define PVPANIC_F_PANICKED 0 |
23 | 25 |
|
... | ... | |
86 | 88 |
static int pvpanic_isa_initfn(ISADevice *dev) |
87 | 89 |
{ |
88 | 90 |
PVPanicState *s = ISA_PVPANIC_DEVICE(dev); |
91 |
static bool port_configured; |
|
92 |
void *fw_cfg; |
|
89 | 93 |
|
90 | 94 |
memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); |
91 | 95 |
isa_register_ioport(dev, &s->io, s->ioport); |
92 | 96 |
|
97 |
if (!port_configured) { |
|
98 |
fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); |
|
99 |
if (fw_cfg) { |
|
100 |
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", |
|
101 |
g_memdup(&s->ioport, sizeof(s->ioport)), |
|
102 |
sizeof(s->ioport)); |
|
103 |
port_configured = true; |
|
104 |
} |
|
105 |
} |
|
106 |
|
|
93 | 107 |
return 0; |
94 | 108 |
} |
95 | 109 |
|
b/hw/nvram/fw_cfg.c | ||
---|---|---|
489 | 489 |
dev = qdev_create(NULL, "fw_cfg"); |
490 | 490 |
qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); |
491 | 491 |
qdev_prop_set_uint32(dev, "data_iobase", data_port); |
492 |
qdev_init_nofail(dev); |
|
493 | 492 |
d = SYS_BUS_DEVICE(dev); |
494 | 493 |
|
495 | 494 |
s = DO_UPCAST(FWCfgState, busdev.qdev, dev); |
496 | 495 |
|
496 |
if (!object_resolve_path("/machine/fw_cfg", NULL)) { |
|
497 |
object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), |
|
498 |
NULL); |
|
499 |
} |
|
500 |
|
|
501 |
qdev_init_nofail(dev); |
|
502 |
|
|
497 | 503 |
if (ctl_addr) { |
498 | 504 |
sysbus_mmio_map(d, 0, ctl_addr); |
499 | 505 |
} |
Also available in: Unified diff