From patchwork Fri Aug 2 07:04:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 264197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5DF9C2C007E for ; Fri, 2 Aug 2013 17:06:46 +1000 (EST) Received: from localhost ([::1]:51635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V59Rk-0007i5-79 for incoming@patchwork.ozlabs.org; Fri, 02 Aug 2013 03:06:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V59RG-0007YN-5B for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V59R9-0007Ib-BZ for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:06:14 -0400 Received: from [222.73.24.84] (port=49640 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V59R8-0007Fu-Ug for qemu-devel@nongnu.org; Fri, 02 Aug 2013 03:06:07 -0400 X-IronPort-AV: E=Sophos;i="4.89,799,1367942400"; d="scan'208";a="8096662" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 02 Aug 2013 15:02:52 +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 r7275qLL019496 for ; Fri, 2 Aug 2013 15:05:53 +0800 Received: from localhost.localdomain ([10.167.226.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013080215043696-358615 ; Fri, 2 Aug 2013 15:04:36 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Fri, 2 Aug 2013 15:04:39 +0800 Message-Id: <1375427079-16822-2-git-send-email-hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 References: <1375427079-16822-1-git-send-email-hutao@cn.fujitsu.com> In-Reply-To: <1375362537.4891.28.camel@localhost.localdomain> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/02 15:04:36, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/02 15:04:38, Serialize complete at 2013/08/02 15:04:38 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH for-1.6 2/2] pvpanic: make pvpanic known to user 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 Thus user can create pvpanic by -device. Signed-off-by: Hu Tao --- hw/misc/pvpanic.c | 23 ++++++++--------------- include/hw/i386/pc.h | 3 --- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 7bb49a5..6e4c53e 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -93,14 +93,6 @@ static void pvpanic_isa_initfn(Object *obj) memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1); } -static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) -{ - ISADevice *d = ISA_DEVICE(dev); - PVPanicState *s = ISA_PVPANIC_DEVICE(dev); - - isa_register_ioport(d, &s->io, s->ioport); -} - static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); @@ -111,15 +103,16 @@ static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg) sizeof(*pvpanic_port)); } -void pvpanic_init(ISABus *bus) +static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) { - ISADevice *dev; + ISADevice *d = ISA_DEVICE(dev); + PVPanicState *s = ISA_PVPANIC_DEVICE(dev); FWCfgState *fw_cfg = fw_cfg_find(); - if (!fw_cfg) { - return; + + isa_register_ioport(d, &s->io, s->ioport); + if (fw_cfg) { + pvpanic_fw_cfg(d, fw_cfg); } - dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE); - pvpanic_fw_cfg(dev, fw_cfg); } static Property pvpanic_isa_properties[] = { @@ -132,8 +125,8 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = pvpanic_isa_realizefn; - dc->no_user = 1; dc->props = pvpanic_isa_properties; + dc->bus_type = TYPE_ISA_BUS; } static TypeInfo pvpanic_isa_info = { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3a0c4e3..e54751c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -202,9 +202,6 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) /* pc_sysfw.c */ void pc_system_firmware_init(MemoryRegion *rom_memory); -/* pvpanic.c */ -void pvpanic_init(ISABus *bus); - /* e820 types */ #define E820_RAM 1 #define E820_RESERVED 2