| Message ID | bb9c4c2cf631cf9a1561261a83f4340828da6525.1366354934.git.hutao@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
Hu Tao <hutao@cn.fujitsu.com> writes: > This lets seabios patch the corresponding SSDT entry. > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > --- > hw/misc/pvpanic.c | 14 ++++++++++++++ > hw/nvram/fw_cfg.c | 8 +++++++- > include/hw/nvram/fw_cfg.h | 2 ++ > 3 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c > index 01cfe0b..a80fae5 100644 > --- a/hw/misc/pvpanic.c > +++ b/hw/misc/pvpanic.c > @@ -18,6 +18,8 @@ > #include "sysemu/sysemu.h" > #include "qemu/log.h" > > +#include "hw/nvram/fw_cfg.h" > + > /* The bit of supported pv event */ > #define PVPANIC_F_PANICKED 0 > > @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { > static int pvpanic_isa_initfn(ISADevice *dev) > { > PVPanicState *s = ISA_PVPANIC_DEVICE(dev); > + static bool port_configured; > + void *fw_cfg; > > memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); > isa_register_ioport(dev, &s->io, s->ioport); > > + if (!port_configured) { > + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); > + if (fw_cfg) { > + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", > + g_memdup(&s->ioport, sizeof(s->ioport)), > + sizeof(s->ioport)); > + port_configured = true; > + } > + } > + > return 0; > } > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 97bba87..1a7e49c 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > dev = qdev_create(NULL, "fw_cfg"); > qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); > qdev_prop_set_uint32(dev, "data_iobase", data_port); > - qdev_init_nofail(dev); > d = SYS_BUS_DEVICE(dev); > > s = DO_UPCAST(FWCfgState, busdev.qdev, dev); > > + if (!object_resolve_path("/machine/fw_cfg", NULL)) { > + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), > + NULL); > + } > + > + qdev_init_nofail(dev); > + > if (ctl_addr) { > sysbus_mmio_map(d, 0, ctl_addr); > } > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > index 05c8df1..07cc941 100644 > --- a/include/hw/nvram/fw_cfg.h > +++ b/include/hw/nvram/fw_cfg.h > @@ -1,6 +1,8 @@ > #ifndef FW_CFG_H > #define FW_CFG_H > > +#include "exec/hwaddr.h" > + > #define FW_CFG_SIGNATURE 0x00 > #define FW_CFG_ID 0x01 > #define FW_CFG_UUID 0x02 Since you have to respin anyway, to correct suppression of the new device for pc-0.13 and older, please consider splitting off this last patch hunk into its own bug-fix patch.
Hu Tao <hutao@cn.fujitsu.com> writes: > This lets seabios patch the corresponding SSDT entry. > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > --- > hw/misc/pvpanic.c | 14 ++++++++++++++ > hw/nvram/fw_cfg.c | 8 +++++++- > include/hw/nvram/fw_cfg.h | 2 ++ > 3 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c > index 01cfe0b..a80fae5 100644 > --- a/hw/misc/pvpanic.c > +++ b/hw/misc/pvpanic.c > @@ -18,6 +18,8 @@ > #include "sysemu/sysemu.h" > #include "qemu/log.h" > > +#include "hw/nvram/fw_cfg.h" > + > /* The bit of supported pv event */ > #define PVPANIC_F_PANICKED 0 > > @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { > static int pvpanic_isa_initfn(ISADevice *dev) > { > PVPanicState *s = ISA_PVPANIC_DEVICE(dev); > + static bool port_configured; > + void *fw_cfg; > > memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); > isa_register_ioport(dev, &s->io, s->ioport); > > + if (!port_configured) { > + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); > + if (fw_cfg) { > + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", > + g_memdup(&s->ioport, sizeof(s->ioport)), > + sizeof(s->ioport)); > + port_configured = true; > + } > + } > + > return 0; > } > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 97bba87..1a7e49c 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > dev = qdev_create(NULL, "fw_cfg"); > qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); > qdev_prop_set_uint32(dev, "data_iobase", data_port); > - qdev_init_nofail(dev); > d = SYS_BUS_DEVICE(dev); > > s = DO_UPCAST(FWCfgState, busdev.qdev, dev); > > + if (!object_resolve_path("/machine/fw_cfg", NULL)) { > + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), > + NULL); > + } > + > + qdev_init_nofail(dev); > + > if (ctl_addr) { > sysbus_mmio_map(d, 0, ctl_addr); > } Oh, and while you're at it: mention the new QOM object in the commit message? > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > index 05c8df1..07cc941 100644 > --- a/include/hw/nvram/fw_cfg.h > +++ b/include/hw/nvram/fw_cfg.h > @@ -1,6 +1,8 @@ > #ifndef FW_CFG_H > #define FW_CFG_H > > +#include "exec/hwaddr.h" > + > #define FW_CFG_SIGNATURE 0x00 > #define FW_CFG_ID 0x01 > #define FW_CFG_UUID 0x02
On Wed, Apr 24, 2013 at 06:34:22PM +0200, Markus Armbruster wrote: > Hu Tao <hutao@cn.fujitsu.com> writes: > > > This lets seabios patch the corresponding SSDT entry. > > > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > > --- > > hw/misc/pvpanic.c | 14 ++++++++++++++ > > hw/nvram/fw_cfg.c | 8 +++++++- > > include/hw/nvram/fw_cfg.h | 2 ++ > > 3 files changed, 23 insertions(+), 1 deletion(-) > > > > diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c > > index 01cfe0b..a80fae5 100644 > > --- a/hw/misc/pvpanic.c > > +++ b/hw/misc/pvpanic.c > > @@ -18,6 +18,8 @@ > > #include "sysemu/sysemu.h" > > #include "qemu/log.h" > > > > +#include "hw/nvram/fw_cfg.h" > > + > > /* The bit of supported pv event */ > > #define PVPANIC_F_PANICKED 0 > > > > @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { > > static int pvpanic_isa_initfn(ISADevice *dev) > > { > > PVPanicState *s = ISA_PVPANIC_DEVICE(dev); > > + static bool port_configured; > > + void *fw_cfg; > > > > memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); > > isa_register_ioport(dev, &s->io, s->ioport); > > > > + if (!port_configured) { > > + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); > > + if (fw_cfg) { > > + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", > > + g_memdup(&s->ioport, sizeof(s->ioport)), > > + sizeof(s->ioport)); > > + port_configured = true; > > + } > > + } > > + > > return 0; > > } > > > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > > index 97bba87..1a7e49c 100644 > > --- a/hw/nvram/fw_cfg.c > > +++ b/hw/nvram/fw_cfg.c > > @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > > dev = qdev_create(NULL, "fw_cfg"); > > qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); > > qdev_prop_set_uint32(dev, "data_iobase", data_port); > > - qdev_init_nofail(dev); > > d = SYS_BUS_DEVICE(dev); > > > > s = DO_UPCAST(FWCfgState, busdev.qdev, dev); > > > > + if (!object_resolve_path("/machine/fw_cfg", NULL)) { > > + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), > > + NULL); > > + } > > + > > + qdev_init_nofail(dev); > > + > > if (ctl_addr) { > > sysbus_mmio_map(d, 0, ctl_addr); > > } > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > > index 05c8df1..07cc941 100644 > > --- a/include/hw/nvram/fw_cfg.h > > +++ b/include/hw/nvram/fw_cfg.h > > @@ -1,6 +1,8 @@ > > #ifndef FW_CFG_H > > #define FW_CFG_H > > > > +#include "exec/hwaddr.h" > > + > > #define FW_CFG_SIGNATURE 0x00 > > #define FW_CFG_ID 0x01 > > #define FW_CFG_UUID 0x02 > > Since you have to respin anyway, to correct suppression of the new > device for pc-0.13 and older, please consider splitting off this last > patch hunk into its own bug-fix patch. OK.
On Wed, Apr 24, 2013 at 06:35:49PM +0200, Markus Armbruster wrote: > Hu Tao <hutao@cn.fujitsu.com> writes: > > > This lets seabios patch the corresponding SSDT entry. > > > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > > --- > > hw/misc/pvpanic.c | 14 ++++++++++++++ > > hw/nvram/fw_cfg.c | 8 +++++++- > > include/hw/nvram/fw_cfg.h | 2 ++ > > 3 files changed, 23 insertions(+), 1 deletion(-) > > > > diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c > > index 01cfe0b..a80fae5 100644 > > --- a/hw/misc/pvpanic.c > > +++ b/hw/misc/pvpanic.c > > @@ -18,6 +18,8 @@ > > #include "sysemu/sysemu.h" > > #include "qemu/log.h" > > > > +#include "hw/nvram/fw_cfg.h" > > + > > /* The bit of supported pv event */ > > #define PVPANIC_F_PANICKED 0 > > > > @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { > > static int pvpanic_isa_initfn(ISADevice *dev) > > { > > PVPanicState *s = ISA_PVPANIC_DEVICE(dev); > > + static bool port_configured; > > + void *fw_cfg; > > > > memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); > > isa_register_ioport(dev, &s->io, s->ioport); > > > > + if (!port_configured) { > > + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); > > + if (fw_cfg) { > > + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", > > + g_memdup(&s->ioport, sizeof(s->ioport)), > > + sizeof(s->ioport)); > > + port_configured = true; > > + } > > + } > > + > > return 0; > > } > > > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > > index 97bba87..1a7e49c 100644 > > --- a/hw/nvram/fw_cfg.c > > +++ b/hw/nvram/fw_cfg.c > > @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > > dev = qdev_create(NULL, "fw_cfg"); > > qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); > > qdev_prop_set_uint32(dev, "data_iobase", data_port); > > - qdev_init_nofail(dev); > > d = SYS_BUS_DEVICE(dev); > > > > s = DO_UPCAST(FWCfgState, busdev.qdev, dev); > > > > + if (!object_resolve_path("/machine/fw_cfg", NULL)) { > > + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), > > + NULL); > > + } > > + > > + qdev_init_nofail(dev); > > + > > if (ctl_addr) { > > sysbus_mmio_map(d, 0, ctl_addr); > > } > > Oh, and while you're at it: mention the new QOM object in the commit > message? You mean fw_cfg is added to /machine/fw_cfg?
Hu Tao <hutao@cn.fujitsu.com> writes: > On Wed, Apr 24, 2013 at 06:35:49PM +0200, Markus Armbruster wrote: >> Hu Tao <hutao@cn.fujitsu.com> writes: >> >> > This lets seabios patch the corresponding SSDT entry. >> > >> > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> >> > --- >> > hw/misc/pvpanic.c | 14 ++++++++++++++ >> > hw/nvram/fw_cfg.c | 8 +++++++- >> > include/hw/nvram/fw_cfg.h | 2 ++ >> > 3 files changed, 23 insertions(+), 1 deletion(-) >> > >> > diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c >> > index 01cfe0b..a80fae5 100644 >> > --- a/hw/misc/pvpanic.c >> > +++ b/hw/misc/pvpanic.c >> > @@ -18,6 +18,8 @@ >> > #include "sysemu/sysemu.h" >> > #include "qemu/log.h" >> > >> > +#include "hw/nvram/fw_cfg.h" >> > + >> > /* The bit of supported pv event */ >> > #define PVPANIC_F_PANICKED 0 >> > >> > @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { >> > static int pvpanic_isa_initfn(ISADevice *dev) >> > { >> > PVPanicState *s = ISA_PVPANIC_DEVICE(dev); >> > + static bool port_configured; >> > + void *fw_cfg; >> > >> > memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); >> > isa_register_ioport(dev, &s->io, s->ioport); >> > >> > + if (!port_configured) { >> > + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); >> > + if (fw_cfg) { >> > + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", >> > + g_memdup(&s->ioport, sizeof(s->ioport)), >> > + sizeof(s->ioport)); >> > + port_configured = true; >> > + } >> > + } >> > + >> > return 0; >> > } >> > >> > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c >> > index 97bba87..1a7e49c 100644 >> > --- a/hw/nvram/fw_cfg.c >> > +++ b/hw/nvram/fw_cfg.c >> > @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, >> > dev = qdev_create(NULL, "fw_cfg"); >> > qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); >> > qdev_prop_set_uint32(dev, "data_iobase", data_port); >> > - qdev_init_nofail(dev); >> > d = SYS_BUS_DEVICE(dev); >> > >> > s = DO_UPCAST(FWCfgState, busdev.qdev, dev); >> > >> > + if (!object_resolve_path("/machine/fw_cfg", NULL)) { >> > + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), >> > + NULL); >> > + } >> > + >> > + qdev_init_nofail(dev); >> > + >> > if (ctl_addr) { >> > sysbus_mmio_map(d, 0, ctl_addr); >> > } >> >> Oh, and while you're at it: mention the new QOM object in the commit >> message? > > You mean fw_cfg is added to /machine/fw_cfg? Yes.
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 01cfe0b..a80fae5 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -18,6 +18,8 @@ #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "hw/nvram/fw_cfg.h" + /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -86,10 +88,22 @@ static const MemoryRegionOps pvpanic_ops = { static int pvpanic_isa_initfn(ISADevice *dev) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); + static bool port_configured; + void *fw_cfg; memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); isa_register_ioport(dev, &s->io, s->ioport); + if (!port_configured) { + fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); + if (fw_cfg) { + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", + g_memdup(&s->ioport, sizeof(s->ioport)), + sizeof(s->ioport)); + port_configured = true; + } + } + return 0; } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 97bba87..1a7e49c 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, dev = qdev_create(NULL, "fw_cfg"); qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); qdev_prop_set_uint32(dev, "data_iobase", data_port); - qdev_init_nofail(dev); d = SYS_BUS_DEVICE(dev); s = DO_UPCAST(FWCfgState, busdev.qdev, dev); + if (!object_resolve_path("/machine/fw_cfg", NULL)) { + object_property_add_child(qdev_get_machine(), "fw_cfg", OBJECT(s), + NULL); + } + + qdev_init_nofail(dev); + if (ctl_addr) { sysbus_mmio_map(d, 0, ctl_addr); } diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 05c8df1..07cc941 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -1,6 +1,8 @@ #ifndef FW_CFG_H #define FW_CFG_H +#include "exec/hwaddr.h" + #define FW_CFG_SIGNATURE 0x00 #define FW_CFG_ID 0x01 #define FW_CFG_UUID 0x02
This lets seabios patch the corresponding SSDT entry. Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- hw/misc/pvpanic.c | 14 ++++++++++++++ hw/nvram/fw_cfg.c | 8 +++++++- include/hw/nvram/fw_cfg.h | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-)