From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 30 May 2013 13:21:24 +0000 (+0300)
Subject: fw_cfg: fw_cfg is a singleton
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cac122103abac633d7b39aac87273bf6d5a37588;p=qemu.git

fw_cfg: fw_cfg is a singleton

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

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index df3f089fd4..3c255cec01 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -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);