From patchwork Mon Apr 1 08:47:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 232682 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 CFCA12C010A for ; Mon, 1 Apr 2013 20:01:25 +1100 (EST) Received: from localhost ([::1]:39588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMacF-00079J-Pl for incoming@patchwork.ozlabs.org; Mon, 01 Apr 2013 05:01:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMabH-0006re-IT for qemu-devel@nongnu.org; Mon, 01 Apr 2013 05:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMabE-0006pW-Ux for qemu-devel@nongnu.org; Mon, 01 Apr 2013 05:00:23 -0400 Received: from [222.73.24.84] (port=50641 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMabE-0006nU-9n for qemu-devel@nongnu.org; Mon, 01 Apr 2013 05:00:20 -0400 X-IronPort-AV: E=Sophos;i="4.87,386,1363104000"; d="scan'208";a="6982897" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 01 Apr 2013 16:57:35 +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 r318ljvh011493; Mon, 1 Apr 2013 16:48:26 +0800 Received: from localhost ([10.167.233.156]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013040116465012-198923 ; Mon, 1 Apr 2013 16:46:50 +0800 Date: Mon, 1 Apr 2013 16:47:15 +0800 From: Hu Tao To: Paolo Bonzini Message-ID: <20130401084715.GI3060@localhost.localdomain> References: <6cafd3eee5c1897db770a9d51c8c1de5e20a1c74.1364541739.git.hutao@cn.fujitsu.com> <51555EA7.7080308@redhat.com> MIME-Version: 1.0 In-Reply-To: <51555EA7.7080308@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/01 16:46:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/01 16:47:48, Serialize complete at 2013/04/01 16:47:48 Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Peter Maydell , Gleb Natapov , "Michael S. Tsirkin" , Jan Kiszka , qemu-devel , Markus Armbruster , Blue Swirl , Orit Wasserman , Juan Quintela , Alexander Graf , Christian Borntraeger , Andrew Jones , Alex Williamson , Sasha Levin , Stefan Hajnoczi , Luiz Capitulino , KAMEZAWA Hiroyuki , Anthony Liguori , Marcelo Tosatti Subject: Re: [Qemu-devel] [PATCH v16 5/6] pc_piix, pc_q35: export fw_cfg 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 On Fri, Mar 29, 2013 at 10:28:07AM +0100, Paolo Bonzini wrote: > Il 29/03/2013 09:16, Hu Tao ha scritto: > > diff --git a/hw/pc.h b/hw/pc.h > > index 8e1dd4c..d42b76b 100644 > > --- a/hw/pc.h > > +++ b/hw/pc.h > > @@ -145,6 +145,12 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, > > extern PCIDevice *piix4_dev; > > int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); > > > > +/* pc_piix.c */ > > +extern void *fw_cfg_piix; > > + > > +/* pc_q35.c */ > > +extern void *fw_cfg_q35; > > + > > /* vga.c */ > > enum vga_retrace_method { > > VGA_RETRACE_DUMB, > > > > Hu, this is not what I suggested in the review... > > Please do not ignore comments without answer, otherwise we'll just run > in circles. Sorry about that. I have to float up object_property_add_child() because fw_cfg has path '/machine/unattached/device[4]' (in my test) by default, the path seems to vary so we can use it. Please review, if no problem I'll post v17 shortly: From 5071f4bc6ff640637826d8ed7af9668d7bc1a642 Mon Sep 17 00:00:00 2001 From: Hu Tao Date: Mon, 1 Apr 2013 15:51:59 +0800 Subject: [PATCH v16.1 5/5] pvpanic: pass configurable ioport to seabios This lets seabios patch the corresponding SSDT entry. Signed-off-by: Hu Tao --- hw/fw_cfg.c | 6 +++++- hw/fw_cfg.h | 2 ++ hw/pvpanic.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 63a1998..712856c 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -489,11 +489,15 @@ 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/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..4384831 100644 --- a/hw/pvpanic.c +++ b/hw/pvpanic.c @@ -18,6 +18,8 @@ #include #include +#include "hw/fw_cfg.h" + /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -79,10 +81,22 @@ static const MemoryRegionOps pvpanic_ops = { static int pvpanic_isa_initfn(ISADevice *dev) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); + static bool port_configured = false; + 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; }