From nobody Fri Oct 18 09:19:06 2024 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=1707560797; cv=none; d=zohomail.com; s=zohoarc; b=P4tmtH9n7xsF3fic3garb27ryLnWMmS6lucsVOXhcOSZ9NIt+dx8EfKekSxYH0D6aUskxjdkgrUJWV0VdF123lKlWsEfPTOirBGc1xg0FJ143TG3ALXYH0YyD5uuzWyDRobKmIg9LIwEeXY63PkH9NeRrzRVLZuj/SnDheB8YvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707560797; 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=EtHvqx0pYo51UarG6u8auC68i9+0d57qDsSmnOr8C/4=; b=ExuWhWU1s0qsv/393lQ2UJ6x6daCPtnaJNH9PNzO4ZKZrOrhWs7riC8CakFrwKTqE4yn8I6oTyb+HEaUq6reRWCJus7us/+SvCREUw/qlqSncxTyAeLLHu6lOHIvfgMyEjTypxdAMgLimaqdCURv0AIlftWxYQTxGA/+Fxdit6Y= 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 1707560797480415.2857344081965; Sat, 10 Feb 2024 02:26:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYkXi-00074c-0y; Sat, 10 Feb 2024 05:25:06 -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 1rYkXh-000745-4a for qemu-devel@nongnu.org; Sat, 10 Feb 2024 05:25:05 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rYkXc-0002eI-Qd for qemu-devel@nongnu.org; Sat, 10 Feb 2024 05:25:04 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1d7881b1843so16280525ad.3 for ; Sat, 10 Feb 2024 02:24:58 -0800 (PST) Received: from localhost ([157.82.200.138]) by smtp.gmail.com with UTF8SMTPSA id la11-20020a170902fa0b00b001d9daf742ccsm2782712plb.233.2024.02.10.02.24.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Feb 2024 02:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1707560697; x=1708165497; 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=EtHvqx0pYo51UarG6u8auC68i9+0d57qDsSmnOr8C/4=; b=JyWA9tL0PL4EYbLsWPH1jaPdZF1kZ8CgteDrG9cSbOL6U1zwrBpKzrBKn2BnbRge9O 9f33BmcUWka75RFCGsB4Qw0Vx+k7QIJ338qmRa60f7W/tQBB9yvR7IEHIyGp1BlJroAW CaRYHg3sSCQv7uYXL7xv9gr+3MjlZKz7IukfC7cthjZoKAYD0cAdROdvym2O2NfYlv0w 3ew8OlV+8ZiS94kMM6dCgjRkfQn6WVJpx2SA1lTsm+FmsBtdCjc2SxAu7/hpg0Soetmn kGJUjxaLC1LGV4z657JYr2AVQTbCLZu9ITsxhK0wk0U2VUOyZ76az09mdLLgR+Abg7n0 GpfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707560697; x=1708165497; 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=EtHvqx0pYo51UarG6u8auC68i9+0d57qDsSmnOr8C/4=; b=UY/+Ofx89S14AdzlRi5yqUgJyCUy2XqHxvn01GX14qL+1RxBH9+IBbUKgOv96JHS4P QLpUO7MfA7+dG8pR+Dlh4gQQcdmg85554aDqnmR96TtD/0slT6vybqmqohAFfpyAaWBd glUX2WgGw8pfI0Jjh7YZam28a8xxkbufWO4RGi+Ukaz8+aSa2vNM2yBezI3nM0a62ptn tdsPI/Kq36p3KmS8KjOdNjQitIEFGGMap4M7NlWtm1h0LDx3ds+75aQXp+Cs/Jw18QQj WMmudWHtUQt4PwQ6+0kLBGgFcr+S55wBu7pqma9pQyTZhDLja7vIZEVTTuL5M8+8OWe2 F2nw== X-Gm-Message-State: AOJu0Yy1wO6YzjnxpJrEzf3APmgwlJ1vJypQgAyStZFec3H7JLcP++1f YW1LVuOCWI5xbpE4BQequ8S0rRfVCOf7x8w22EzdWA4W/1km8nPuGPtAo3W7ZKc= X-Google-Smtp-Source: AGHT+IGYE4PNSJjBF+CoByHfCaHkIA1VNxP61Kk3nOm0dMgbKj7wbi9/hpMc7ogtADbEXnT1/Pahlw== X-Received: by 2002:a17:902:e892:b0:1d8:f07f:7592 with SMTP id w18-20020a170902e89200b001d8f07f7592mr2732126plg.55.1707560697214; Sat, 10 Feb 2024 02:24:57 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVRHrnhxgd2YqiGxRE2OhT4DvwSt9cngi6gIXemefyRFJqZ3MuqroESeqTHi19e35cJibHIjGkbCiEM8TG3PPkrrcFhR7qGZbET6//JWRVWn+ACbawuCn+wPU+ZJ2gp21dsGFz3XyBN2Kj3RaDKM3h/xGGU+3ZtGR96CNmUasVbTea7ImEPQGzfVXE/NzqYY8p1xI4tLJzh5JUderokBkvX2jzZ/qm2Gcrzl38mMepjp2zCc5Lr3Bqdu83WMsilDlQtit2TBkRFVbAwDiKyvVR3XUSPHeGYmUQpu0KsW2W10ANLj1w90isOfhvRqAlhSACSEh6lMaDK8QtJyfx0CrCdxeA1VnuWVjQo75wLO9WNvu7VkrQBk+AnHLdb4lmV6/SvEs5wc01R0nfRZpg92hW5Du626w5FBrJ/wwu3Mg== From: Akihiko Odaki Date: Sat, 10 Feb 2024 19:24:38 +0900 Subject: [PATCH v2 3/6] hw/qdev: Remove opts member MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240210-reuse-v2-3-24ba2a502692@daynix.com> References: <20240210-reuse-v2-0-24ba2a502692@daynix.com> In-Reply-To: <20240210-reuse-v2-0-24ba2a502692@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 , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.3 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::630; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x630.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: 1707560800894100013 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 151d9682380d..6befbca31117 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 43d863b0c5b0..c98691a90d48 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 a13db763e5dd..71c00f62ee38 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