From patchwork Fri Apr 26 03:24:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 239639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6675F2C01AB for ; Fri, 26 Apr 2013 13:26:33 +1000 (EST) Received: from localhost ([::1]:42899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVZIt-00079g-Jd for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2013 23:26:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVZHz-00072F-PO for qemu-devel@nongnu.org; Thu, 25 Apr 2013 23:25:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVZHu-00039f-12 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 23:25:35 -0400 Received: from [222.73.24.84] (port=39760 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVZHt-00036r-M5 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 23:25:29 -0400 X-IronPort-AV: E=Sophos;i="4.87,555,1363104000"; d="scan'208";a="7142960" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 26 Apr 2013 11:22:36 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r3Q3PIPF016207; Fri, 26 Apr 2013 11:25:19 +0800 Received: from localhost.localdomain ([10.167.233.156]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013042611234256-844254 ; Fri, 26 Apr 2013 11:23:42 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2013 11:24:44 +0800 Message-Id: <60c65d95fe2b23b12bea67099126566010a11a1a.1366945969.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/26 11:23:42, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/26 11:23:43, Serialize complete at 2013/04/26 11:23:43 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Paolo Bonzini , Markus Armbruster Subject: [Qemu-devel] [PATCH v21 5/8] pvpanic: pass configurable ioport to seabios X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This lets seabios patch the corresponding SSDT entry. Also add fw_cfg object to /machine/fw_cfg so we can reference it elsewhere. Signed-off-by: Hu Tao Reviewed-by: Markus Armbruster --- hw/misc/pvpanic.c | 14 ++++++++++++++ hw/nvram/fw_cfg.c | 8 +++++++- 2 files changed, 21 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); }