fw_cfg: fw_cfg is a singleton
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 30 May 2013 13:21:24 +0000 (16:21 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Sun, 2 Jun 2013 15:14:14 +0000 (18:14 +0300)
Make sure we only have a single instance ever:
because if it isn't we can't find it so it's
useless anyway.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/nvram/fw_cfg.c

index df3f089..3c255ce 100644 (file)
@@ -496,10 +496,9 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
 
     s = DO_UPCAST(FWCfgState, busdev.qdev, dev);
 
-    if (!object_resolve_path(FW_CFG_PATH, NULL)) {
-        object_property_add_child(qdev_get_machine(), FW_CFG_NAME, OBJECT(s),
-                                  NULL);
-    }
+    assert(!object_resolve_path(FW_CFG_PATH, NULL));
+
+    object_property_add_child(qdev_get_machine(), FW_CFG_NAME, OBJECT(s), NULL);
 
     qdev_init_nofail(dev);