From patchwork Fri Mar 29 08:16:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v16,6/6] pvpanic: pass configurable ioport to seabios X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 232307 Message-Id: <22dff554d59724df819010322df91d40196b595f.1364541739.git.hutao@cn.fujitsu.com> To: qemu-devel , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti , Sasha Levin , Luiz Capitulino , Anthony Liguori , Markus Armbruster , Paolo Bonzini , Stefan Hajnoczi , Juan Quintela , Orit Wasserman , Wen Congyang , "Michael S. Tsirkin" , Alexander Graf , Alex Williamson , Peter Maydell , Christian Borntraeger Date: Fri, 29 Mar 2013 16:16:47 +0800 From: Hu Tao List-Id: This lets seabios patch the corresponding SSDT entry. Signed-off-by: Hu Tao --- hw/fw_cfg.h | 2 ++ hw/pvpanic.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h index 05c8df1..07cc941 100644 --- a/hw/fw_cfg.h +++ b/hw/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 diff --git a/hw/pvpanic.c b/hw/pvpanic.c index ff0a116..94c3b25 100644 --- a/hw/pvpanic.c +++ b/hw/pvpanic.c @@ -17,6 +17,8 @@ #include #include #include +#include "hw/fw_cfg.h" +#include "hw/pc.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -83,6 +85,18 @@ static int pvpanic_isa_initfn(ISADevice *dev) memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); isa_register_ioport(dev, &s->io, s->ioport); + if (fw_cfg_piix) { + fw_cfg_add_file(fw_cfg_piix, "etc/pvpanic-port", + g_memdup(&s->ioport, sizeof(s->ioport)), + sizeof(s->ioport)); + } + + if (fw_cfg_q35) { + fw_cfg_add_file(fw_cfg_q35, "etc/pvpanic-port", + g_memdup(&s->ioport, sizeof(s->ioport)), + sizeof(s->ioport)); + } + return 0; }