From nobody Mon Apr 7 15:48:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1702181305; cv=none; d=zohomail.com; s=zohoarc; b=iwfcKBtA3wAUedFsUPw3IDZbQQViNJOTuLJ6MpRAH8YV0uGSdBm2r5Oxx5gydLCeI7flKKpUv68i7rOeIVtvZMJANKgO+VlNLNbWByYRWLrCGqCAekpIuBqB++ehyRXAi6XP1LYYI+rKmBztggQNUpVO2lbJ2gKCAHC5CuG9dkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702181305; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GziVlMjvsZ2sl/wXrFvNG0jm8Ze2df5208TL7Jvr540=; b=O6kMUyrwe2AbGC5TydNLff4TugAkgI3NkkBtfOzOZp9PNqGoc8st5ZRyHT6mW+G0O1Tj8aZSWf/3O43gQzRMDQJWTH6LEe0hssP2pNdTD7jF62kpUUXZWVIg8Q61p3Vul0nlgGcQfzwWrch9a3Z2wlpC4QcsSoom4Q0AMiK12yg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702181305629405.68647840922256; Sat, 9 Dec 2023 20:08:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCB5U-0005Sw-EL; Sat, 09 Dec 2023 23:06:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCB5R-0005S9-O9 for qemu-devel@nongnu.org; Sat, 09 Dec 2023 23:06:37 -0500 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCB5Q-0005C4-2J for qemu-devel@nongnu.org; Sat, 09 Dec 2023 23:06:37 -0500 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5c66e7eafabso2821249a12.0 for ; Sat, 09 Dec 2023 20:06:35 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id e21-20020a170902d39500b001cfb93fa4fasm4109411pld.150.2023.12.09.20.06.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 09 Dec 2023 20:06:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702181194; x=1702785994; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GziVlMjvsZ2sl/wXrFvNG0jm8Ze2df5208TL7Jvr540=; b=Q4s3HOERzqC/DO5GX4RIZE9zuyG3Kdn1u48pHrwwwD3Fjo0NEqcAr1nExcat1Z0KuV hGkB67ZXdh/eLUKvpDG78D5YXZwx3vFF9q+HACYGvaOP6lS20kDq15JNMDasOY/SoEgG QyrCqS568BAmapxIzDtywoiJjDvpQkHUgSPNHvzNbQBArWXNLg+SeSHZjgkFtVN99ZgX ODlfgxw5mjtcry2xRbjlpKPipWcn5tjeaX0hSi6756TxF7E0NNk3rA/NFR5z+8CJmhfb 95lzdsltHhlmL1psnXs1CMuFv5KP2Fa9F9ZOyQjVtoGjoZsCKfiQduaUSQ3RlI8qwrwB weWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702181194; x=1702785994; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GziVlMjvsZ2sl/wXrFvNG0jm8Ze2df5208TL7Jvr540=; b=aKiYk2iqWEX0Pd49IPtbSaHWT/GLP4Gau/0ytGXOjWcY0H43POCOMmARo2XMvUGZO5 lIW98CSzmXDNyyVK48PpRoPrSHAohREGMfyYiW42Mbl18i9b0nyPgefKhjeK2Q4okajB fmYvaQ8qF9w3ELC7qi/fJ26Nw6XNZlauhXtApvdSLYM1OcnJasbPVAi+dbtXlAvn/WgL Da0xak8SN5MbOwoUGtA7+hFwlWYFh9N2ObdQPnoJZB+JSfMmNOaI/7TXVCj/dG+e4Xus glgKromI2EOZD0SoGAfTPacYuTFpkewRgxEh5KWzRamaGIn5Y8m87lC6Tr7irGNVfb24 HRuw== X-Gm-Message-State: AOJu0YwQRi3VDKsUFjLKyVIRG0axsfaVVEQXwqJTydopdxTpID8wkXBd wAC0fu+lKuFs1V2hErJEBFwp9Q== X-Google-Smtp-Source: AGHT+IF0wyaWpgOspPIZP8yzkpQnNgWzfQxlrwqX1rC+Lilu3Xe1dZjo+vTJWk+1qZBRgtu3Fchcpg== X-Received: by 2002:a17:902:e5ce:b0:1d2:fa04:7cb2 with SMTP id u14-20020a170902e5ce00b001d2fa047cb2mr2472358plf.18.1702181194528; Sat, 09 Dec 2023 20:06:34 -0800 (PST) From: Akihiko Odaki Date: Sun, 10 Dec 2023 13:05:48 +0900 Subject: [PATCH RFC v2 05/12] hw/qdev: Remove opts member MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231210-sriov-v2-5-b959e8a6dfaf@daynix.com> References: <20231210-sriov-v2-0-b959e8a6dfaf@daynix.com> In-Reply-To: <20231210-sriov-v2-0-b959e8a6dfaf@daynix.com> To: "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Jason Wang , Sriram Yagnaraman , Keith Busch , Klaus Jensen Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Yui Washizu , Akihiko Odaki X-Mailer: b4 0.12.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::533; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x533.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1702181306313100003 It is no longer used. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/qdev-core.h | 4 ---- hw/core/qdev.c | 1 - system/qdev-monitor.c | 12 +++++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 151d968238..6befbca311 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -237,10 +237,6 @@ struct DeviceState { * @pending_deleted_expires_ms: optional timeout for deletion events */ int64_t pending_deleted_expires_ms; - /** - * @opts: QDict of options for the device - */ - QDict *opts; /** * @hotplugged: was device added after PHASE_MACHINE_READY? */ diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 43d863b0c5..c98691a90d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -706,7 +706,6 @@ static void device_finalize(Object *obj) dev->canonical_path =3D NULL; } =20 - qobject_unref(dev->opts); g_free(dev->id); } =20 diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index a13db763e5..71c00f62ee 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -625,6 +625,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *op= ts, char *id; DeviceState *dev =3D NULL; BusState *bus =3D NULL; + QDict *properties; =20 driver =3D qdict_get_try_str(opts, "driver"); if (!driver) { @@ -705,13 +706,14 @@ DeviceState *qdev_device_add_from_qdict(const QDict *= opts, } =20 /* set properties */ - dev->opts =3D qdict_clone_shallow(opts); - qdict_del(dev->opts, "driver"); - qdict_del(dev->opts, "bus"); - qdict_del(dev->opts, "id"); + properties =3D qdict_clone_shallow(opts); + qdict_del(properties, "driver"); + qdict_del(properties, "bus"); + qdict_del(properties, "id"); =20 - object_set_properties_from_keyval(&dev->parent_obj, dev->opts, from_js= on, + object_set_properties_from_keyval(&dev->parent_obj, properties, from_j= son, errp); + qobject_unref(properties); if (*errp) { goto err_del_dev; } --=20 2.43.0