Patchwork pvpanic: initialization cleanup

login
register
mail settings
Submitter Michael S. Tsirkin
Date June 16, 2013, 8:46 p.m.
Message ID <20130616204615.GA20636@redhat.com>
Download mbox | patch
Permalink /patch/251740/
State New
Headers show

Comments

Michael S. Tsirkin - June 16, 2013, 8:46 p.m.
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 <mst@redhat.com>
---
 hw/misc/pvpanic.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Patch

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;
 }