From patchwork Fri Apr 5 06:36:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 234054 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 7B1042C00AB for ; Fri, 5 Apr 2013 17:39:35 +1100 (EST) Received: from localhost ([::1]:57941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO0JB-0003kZ-Lf for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 02:39:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO0Gv-0000Bk-Lk for qemu-devel@nongnu.org; Fri, 05 Apr 2013 02:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO0Gn-00078R-L5 for qemu-devel@nongnu.org; Fri, 05 Apr 2013 02:37:13 -0400 Received: from [222.73.24.84] (port=7952 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO0Gn-00076o-2H for qemu-devel@nongnu.org; Fri, 05 Apr 2013 02:37:05 -0400 X-IronPort-AV: E=Sophos;i="4.87,413,1363104000"; d="scan'208";a="7001395" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 05 Apr 2013 14:34:18 +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 r356aqPh020005; Fri, 5 Apr 2013 14:36:53 +0800 Received: from localhost.localdomain ([10.167.233.156]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013040514355009-319508 ; Fri, 5 Apr 2013 14:35:50 +0800 From: Hu Tao 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, 5 Apr 2013 14:36:21 +0800 Message-Id: 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/05 14:35:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/05 14:35:52, Serialize complete at 2013/04/05 14:35:52 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 v17 5/6] pvpanic: create pvpanic device by default 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 Also parse command line options for ioport and set it accordingly. Signed-off-by: Hu Tao --- hw/i386/pc_piix.c | 2 ++ hw/i386/pc_q35.c | 1 + hw/pc.h | 4 ++++ hw/pvpanic.c | 42 ++++++++++++++++++++++++++++++++++++++++++ vl.c | 2 ++ 5 files changed, 51 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0abc9f1..897254a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -217,6 +217,8 @@ static void pc_init1(MemoryRegion *system_memory, if (pci_enabled) { pc_pci_device_init(pci_bus); } + + pvpanic_init(isa_bus); } static void pc_init_pci(QEMUMachineInitArgs *args) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4f5f347..fd9ab01 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -204,6 +204,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_vga_init(isa_bus, host_bus); audio_init(isa_bus, host_bus); pc_nic_init(isa_bus, host_bus); + pvpanic_init(isa_bus); if (pci_enabled) { pc_pci_device_init(host_bus); } diff --git a/hw/pc.h b/hw/pc.h index 8e1dd4c..1311037 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -178,6 +178,10 @@ 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 */ +int pvpanic_init(ISABus *bus); +int pvpanic_ioport(QemuOpts *opts, void *opaque); + /* e820 types */ #define E820_RAM 1 #define E820_RESERVED 2 diff --git a/hw/pvpanic.c b/hw/pvpanic.c index b3d10e2..2e237a4 100644 --- a/hw/pvpanic.c +++ b/hw/pvpanic.c @@ -19,6 +19,8 @@ #include #include "hw/fw_cfg.h" +#include "hw/pc.h" +#include "qapi/string-input-visitor.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -57,6 +59,36 @@ typedef struct PVPanicState { uint16_t ioport; } PVPanicState; +static uint16_t ioport; + +static int set_ioport(const char *name, const char *value, void *opaque) +{ + StringInputVisitor *mi; + + if (strcmp(name, "ioport") == 0) { + mi = string_input_visitor_new(value); + visit_type_uint16(string_input_get_visitor(mi), &ioport, "ioport", + NULL); + string_input_visitor_cleanup(mi); + } + + return 0; +} + +int pvpanic_ioport(QemuOpts *opts, void *opaque) +{ + const char *driver; + + driver = qemu_opt_get(opts, "driver"); + if (!driver || strcmp(driver, "pvpanic")) { + return 0; + } + + qemu_opt_foreach(opts, set_ioport, NULL, 0); + + return 0; +} + /* return supported events on read */ static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size) { @@ -84,6 +116,10 @@ static int pvpanic_isa_initfn(ISADevice *dev) static bool port_configured; void *fw_cfg; + if (ioport) { + s->ioport = ioport; + } + memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1); isa_register_ioport(dev, &s->io, s->ioport); @@ -115,6 +151,12 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data) dc->props = pvpanic_isa_properties; } +int pvpanic_init(ISABus *bus) +{ + isa_create_simple(bus, TYPE_ISA_PVPANIC_DEVICE); + return 0; +} + static TypeInfo pvpanic_isa_info = { .name = TYPE_ISA_PVPANIC_DEVICE, .parent = TYPE_ISA_DEVICE, diff --git a/vl.c b/vl.c index c91fd4e..1a3ffa2 100644 --- a/vl.c +++ b/vl.c @@ -4302,6 +4302,8 @@ int main(int argc, char **argv, char **envp) exit (i == 1 ? 1 : 0); } + qemu_opts_foreach(qemu_find_opts("device"), pvpanic_ioport, NULL, 0); + if (machine->compat_props) { qdev_prop_register_global_list(machine->compat_props); }