[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] fw_cfg: fw_cfg is a singleton
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 3/3] fw_cfg: fw_cfg is a singleton |
Date: |
Thu, 30 May 2013 16:28:03 +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 <address@hidden>
---
hw/nvram/fw_cfg.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index df3f089..3c255ce 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);
--
MST
[Qemu-devel] [PATCH 3/3] fw_cfg: fw_cfg is a singleton,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH 2/3] fw_cfg: add API to find FW cfg object, Michael S. Tsirkin, 2013/05/30
Re: [Qemu-devel] [PATCH 0/3] fw_cfg: misc fixes, Laszlo Ersek, 2013/05/30
Re: [Qemu-devel] [PATCH 0/3] fw_cfg: misc fixes, Hu Tao, 2013/05/30