From nobody Mon Feb 9 15:09:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551357805699876.0692718237208; Thu, 28 Feb 2019 04:43:25 -0800 (PST) Received: from localhost ([127.0.0.1]:37445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzL1z-0004hN-NT for importer@patchew.org; Thu, 28 Feb 2019 07:43:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzKoc-0002Vq-O8 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 07:29:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzKob-00086V-R6 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 07:29:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gzKob-00085W-7g; Thu, 28 Feb 2019 07:29:29 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4BD5D7E33; Thu, 28 Feb 2019 12:29:26 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-115.ams2.redhat.com [10.36.116.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 899A41001DCC; Thu, 28 Feb 2019 12:29:15 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 13:28:49 +0100 Message-Id: <20190228122849.4296-4-david@redhat.com> In-Reply-To: <20190228122849.4296-1-david@redhat.com> References: <20190228122849.4296-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 28 Feb 2019 12:29:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] qdev: Provide qdev_get_bus_hotplug_handler() 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: , Cc: Laurent Vivier , Pankaj Gupta , Collin Walling , Eduardo Habkost , Pierre Morel , "Michael S . Tsirkin" , Cornelia Huck , David Hildenbrand , Michael Roth , Greg Kurz , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson , Eric Auger , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let's use a wrapper instead of looking it up manually. This function can than be reused when we explicitly want to have the bus hotplug handler (e.g. when the bus hotplug handler was overwritten by the machine hotplug handler). Reviewed-by: Igor Mammedov Signed-off-by: David Hildenbrand --- hw/core/qdev.c | 10 +++++++++- include/hw/qdev-core.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7ad45c0bd6..e2207d77a4 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -233,12 +233,20 @@ HotplugHandler *qdev_get_machine_hotplug_handler(Devi= ceState *dev) return NULL; } =20 +HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev) +{ + if (dev->parent_bus) { + return dev->parent_bus->hotplug_handler; + } + return NULL; +} + HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) { HotplugHandler *hotplug_ctrl =3D qdev_get_machine_hotplug_handler(dev); =20 if (hotplug_ctrl =3D=3D NULL && dev->parent_bus) { - hotplug_ctrl =3D dev->parent_bus->hotplug_handler; + hotplug_ctrl =3D qdev_get_bus_hotplug_handler(dev); } return hotplug_ctrl; } diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 52562555cd..8e0938248b 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -280,6 +280,7 @@ DeviceState *qdev_try_create(BusState *bus, const char = *name); void qdev_init_nofail(DeviceState *dev); void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); +HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev); HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev); /** * qdev_get_hotplug_handler: Get handler responsible for device wiring --=20 2.17.2