From patchwork Sun Jun 16 20:46:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 251740 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 D8ED72C009F for ; Mon, 17 Jun 2013 06:45:59 +1000 (EST) Received: from localhost ([::1]:41217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoJpl-00019f-Qs for incoming@patchwork.ozlabs.org; Sun, 16 Jun 2013 16:45:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoJpT-00019T-4x for qemu-devel@nongnu.org; Sun, 16 Jun 2013 16:45:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoJpP-0002A7-72 for qemu-devel@nongnu.org; Sun, 16 Jun 2013 16:45:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoJpO-00029v-VM for qemu-devel@nongnu.org; Sun, 16 Jun 2013 16:45:35 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5GKjUOC015877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 16 Jun 2013 16:45:30 -0400 Received: from redhat.com (vpn-203-68.tlv.redhat.com [10.35.203.68]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r5GKjRHU011976; Sun, 16 Jun 2013 16:45:28 -0400 Date: Sun, 16 Jun 2013 23:46:16 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20130616204615.GA20636@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hu Tao , Anthony Liguori , Markus Armbruster Subject: [Qemu-devel] [PATCH] pvpanic: initialization cleanup 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 Avoid use of static variables: PC systems initialize pvpanic device through pvpanic_init, so we can simply create the fw_cfg file at that point. This also makes it possible to assert if fw_cfg is not there rather than skipping the device silently. Signed-off-by: Michael S. Tsirkin --- hw/misc/pvpanic.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 060099b..3494033 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -97,25 +97,22 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) { ISADevice *d = ISA_DEVICE(dev); PVPanicState *s = ISA_PVPANIC_DEVICE(dev); - static bool port_configured; - FWCfgState *fw_cfg; isa_register_ioport(d, &s->io, s->ioport); - - if (!port_configured) { - fw_cfg = fw_cfg_find(); - 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; - } - } } int pvpanic_init(ISABus *bus) { - isa_create_simple(bus, TYPE_ISA_PVPANIC_DEVICE); + ISADevice *dev = isa_create_simple(bus, TYPE_ISA_PVPANIC_DEVICE); + PVPanicState *s = ISA_PVPANIC_DEVICE(dev); + FWCfgState *fw_cfg = object_resolve_path("/machine/fw_cfg", NULL); + + assert(fw_cfg); + + fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", + g_memdup(&s->ioport, sizeof(s->ioport)), + sizeof(s->ioport)); + return 0; }