From nobody Tue Feb 10 12:59:21 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575199413; cv=none; d=zohomail.com; s=zohoarc; b=Q+NJWNbM6GEaPVHhWwWWqGxL2BJOjKGxdLNAbHBZTgJyFOfPhZlRY7ikfCP/shN4vI3FPfQ9cxJ/qbo1a4KbH/tLQ9kKGVaRIwHztHqGZQfbuzu2sH8MnMJHtdzB+2IW4a1v+wAmCNbX6HOnqlCu12jbNZmocAaQBGAYN/INJXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575199413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qy4UGDnZUZbRfVnfGhS9Fo6/uz5dbjMLbxon+QIkKhk=; b=Px7rcyjpxgnNIGqo+ThAQr8X+0+TiD9ODe1327aorDIoF0o3oZV+/6leK6v2RBhBw0GKBvKe1vhbQK1cdqMs5hVFCVPDvLZsPaqFS9gT+h+3eXsXpmithklHBelxRLkt/GHjgOZj28gpKFjOwYk6hbVB0KMfRrkbrWLMBR4BcMM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575199413544638.8154550990356; Sun, 1 Dec 2019 03:23:33 -0800 (PST) Received: from localhost ([::1]:50244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNK7-0007a2-Nw for importer@patchew.org; Sun, 01 Dec 2019 06:23:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNDF-0001I1-V3 for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:16:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibNDE-0008GW-0a for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:16:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43569 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibNDD-0008G9-T6 for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:16:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-loMi-6YLPgWMKCFdyxjoaA-1; Sun, 01 Dec 2019 06:16:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6D8B107ACC4 for ; Sun, 1 Dec 2019 11:16:17 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5FCE5D9E1; Sun, 1 Dec 2019 11:16:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575198981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qy4UGDnZUZbRfVnfGhS9Fo6/uz5dbjMLbxon+QIkKhk=; b=Of4ss9UTmeH1UONTOQqvfgJNX/MRvCUuq8O6O8oBXxZcPKPx2zPIWO7433MhMAu9UUtVKP Z/74vZCoePe8Xa+r2KK+3jjdpqdP7UTMRxXx/WiCSkl97dEHfD8CmKiVr0gY0nMRn44VDB AKGOs7LO3VEZ62umwScSYEDeJl0gMcE= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 04/26] qdev: move helper function to monitor/misc Date: Sun, 1 Dec 2019 15:15:09 +0400 Message-Id: <20191201111531.1136947-5-marcandre.lureau@redhat.com> In-Reply-To: <20191201111531.1136947-1-marcandre.lureau@redhat.com> References: <20191201111531.1136947-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: loMi-6YLPgWMKCFdyxjoaA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move the one-user function to the place it is being used. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/qdev.c | 26 -------------------------- include/hw/qdev-core.h | 2 -- monitor/misc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c1a338bbe4..90eb01bc8e 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -760,32 +760,6 @@ void qdev_alias_all_properties(DeviceState *target, Ob= ject *source) } while (class !=3D object_class_by_name(TYPE_DEVICE)); } =20 -static int qdev_add_hotpluggable_device(Object *obj, void *opaque) -{ - GSList **list =3D opaque; - DeviceState *dev =3D (DeviceState *)object_dynamic_cast(OBJECT(obj), - TYPE_DEVICE); - - if (dev =3D=3D NULL) { - return 0; - } - - if (dev->realized && object_property_get_bool(obj, "hotpluggable", NUL= L)) { - *list =3D g_slist_append(*list, dev); - } - - return 0; -} - -GSList *qdev_build_hotpluggable_device_list(Object *peripheral) -{ - GSList *list =3D NULL; - - object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list); - - return list; -} - static bool device_get_realized(Object *obj, Error **errp) { DeviceState *dev =3D DEVICE(obj); diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1518495b1e..6b0e7b265d 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -457,8 +457,6 @@ extern bool qdev_hot_removed; =20 char *qdev_get_dev_path(DeviceState *dev); =20 -GSList *qdev_build_hotpluggable_device_list(Object *peripheral); - void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp= ); =20 void qbus_set_bus_hotplug_handler(BusState *bus, Error **errp); diff --git a/monitor/misc.c b/monitor/misc.c index 3baa15f3bf..36c85cecf3 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1956,6 +1956,32 @@ void object_add_completion(ReadLineState *rs, int nb= _args, const char *str) g_slist_free(list); } =20 +static int qdev_add_hotpluggable_device(Object *obj, void *opaque) +{ + GSList **list =3D opaque; + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(OBJECT(obj), + TYPE_DEVICE); + + if (dev =3D=3D NULL) { + return 0; + } + + if (dev->realized && object_property_get_bool(obj, "hotpluggable", NUL= L)) { + *list =3D g_slist_append(*list, dev); + } + + return 0; +} + +static GSList *qdev_build_hotpluggable_device_list(Object *peripheral) +{ + GSList *list =3D NULL; + + object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list); + + return list; +} + static void peripheral_device_del_completion(ReadLineState *rs, const char *str, size_t len) { --=20 2.24.0