From mboxrd@z Thu Jan 1 00:00:00 1970 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 Date: Sun, 16 Jun 2013 23:46:16 +0300 From: "Michael S. Tsirkin" Message-ID: <20130616204615.GA20636@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pvpanic: initialization cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao , Anthony Liguori , Markus Armbruster 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; } -- MST