From nobody Tue Feb 10 06:57:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498745378458910.326476671992; Thu, 29 Jun 2017 07:09:38 -0700 (PDT) Received: from localhost ([::1]:39601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQa8S-0008Ad-42 for importer@patchew.org; Thu, 29 Jun 2017 10:09:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQa6d-0006CN-Sb for qemu-devel@nongnu.org; Thu, 29 Jun 2017 10:07:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQa6c-00070l-Ul for qemu-devel@nongnu.org; Thu, 29 Jun 2017 10:07:39 -0400 Received: from chuckie.co.uk ([82.165.15.123]:60705 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dQa6c-00070G-O8 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 10:07:38 -0400 Received: from host109-148-71-180.range109-148.btcentralplus.com ([109.148.71.180] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dQa6a-000103-Kw; Thu, 29 Jun 2017 15:07:37 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, lersek@redhat.com, somlo@cmu.edu, ehabkost@redhat.com, mst@redhat.com, pbonzini@redhat.com, rjones@redhat.com, imammedo@redhat.com, peter.maydell@linaro.org Date: Thu, 29 Jun 2017 15:07:18 +0100 Message-Id: <1498745240-30658-5-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1498745240-30658-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1498745240-30658-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.148.71.180 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCHv7 4/6] fw_cfg: add assert() to ensure the fw_cfg device has been added as a child property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This will currently always succeed until the check is moved from init to re= alize. Signed-off-by: Mark Cave-Ayland --- hw/nvram/fw_cfg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0fe7404..2291121 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -907,6 +907,17 @@ static void fw_cfg_machine_ready(struct Notifier *n, v= oid *data) qemu_register_reset(fw_cfg_machine_reset, s); } =20 +static int fw_cfg_unattached_foreach(Object *obj, void *opaque) +{ + return (object_dynamic_cast(obj, TYPE_FW_CFG) !=3D NULL); +} + +static int fw_cfg_unattached_at_realize(void) +{ + Object *obj =3D container_get(qdev_get_machine(), "/unattached"); + + return object_child_foreach(obj, fw_cfg_unattached_foreach, NULL); +} =20 =20 static void fw_cfg_init1(DeviceState *dev) @@ -921,6 +932,8 @@ static void fw_cfg_init1(DeviceState *dev) =20 qdev_init_nofail(dev); =20 + assert(!fw_cfg_unattached_at_realize()); + fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (char *)"QEMU", 4); fw_cfg_add_bytes(s, FW_CFG_UUID, &qemu_uuid, 16); fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)!machine->enable_graphic= s); --=20 1.7.10.4