From nobody Mon Feb 9 16:19:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635792204; cv=none; d=zohomail.com; s=zohoarc; b=Cv4z6iZjdq+i9yTAsj9naTuFjBXg1Pr6GTjR+3eyarfqmE7ziPgTT55xw+D6I8CA/JPjWz4TzPCdcfCB02odbl0NGmmQkf1icWSVg60svHQU0Kk6hgbQ1IoEPBldIBLTrVG7S19GwfLr63OoISXz6mpbSUbNJo8YO9J/lk8rHg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635792204; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=zP0Zzar9NcpirKydIFsBcmX/ZgtzRAXafWTr0rzZA9Y=; b=XjWk2QAgcNlUg1xR7uTSqOqTSej6Z6flScUxzUDwzE5oSmcOazGb6cmfttIW4efs70F5NdpNcWc8h6NwxcMcdfRcNK983tgq+5CEz58nO9T5SfsnrrGwUuUswUPaYTdmjKG+OzbTqVVu8ntI8njDHsrv6kPPwDYd4uI2kIv//xw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635792204289653.353470086683; Mon, 1 Nov 2021 11:43:24 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-gnsfIvJBNbmpmp8AcuAbCg-1; Mon, 01 Nov 2021 14:43:22 -0400 Received: by mail-wm1-f69.google.com with SMTP id k5-20020a7bc3050000b02901e081f69d80so6324878wmj.8 for ; Mon, 01 Nov 2021 11:43:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id u20sm338753wmq.3.2021.11.01.11.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 11:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635792203; 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=zP0Zzar9NcpirKydIFsBcmX/ZgtzRAXafWTr0rzZA9Y=; b=P6OpwXt3c79ScGH5qWd8G6ZHRGJ7WJqIWkkjx9OYXMskW3TvTuh6ALBxy29kcRG7cyc/UB hnz3rHPtZbqdfnRug5fDmpJM4OZvvvtiiDrr5qPXPK7Or0yDdOad65J1bVRk3LqcgLAY+9 i/TpNO5WSz/Sn/igHEp73FLKDNTXFYY= X-MC-Unique: gnsfIvJBNbmpmp8AcuAbCg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zP0Zzar9NcpirKydIFsBcmX/ZgtzRAXafWTr0rzZA9Y=; b=yhpDVjRFwHn/wea2Em6MvMPkrsovm+bRincUm8GdHsc1hMUk+1fYUDadPHYqtPLDux 59S/1ahl4YKYxHkmdgMTL6H4F3M4I50legs7Zok6xTBAbtRtx6/g0ZGl+Iv//Rdb6EG1 ybC9FcY4l7om1s0xJfwQCoSKhMC719at2t6y819gPOALcSd89KOB5x8I8tRODgtVLYNT +UwC+qf0gTCnyl7kPHOuSdtceRe7HE/bLGIbsRgOurxnCaqhLrwxNvBEnpEoalEwN685 Qb8PXvocrtV+iRgL8s3eWwbUNy6PQ8DqcmOooWyTRrW3KWjAaqgN0OFYaMVpSgHsEUpM KXCg== X-Gm-Message-State: AOAM532GwLd+U3o9Z+T5GTwgDyNsOeOPI56rlVLop/5G56uaA1MRGs9d iraf7579G679O9kBBm1cfDa/yDYbifYC4R9y5MdqfTbvggSSRLU48nquZOaljZdaI7Z7ddZDCA3 1ctvF2hf2abYzEQ== X-Received: by 2002:a05:600c:2f01:: with SMTP id r1mr740622wmn.153.1635792200952; Mon, 01 Nov 2021 11:43:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysnc/rIs757lBgpRlW4l367oMuNqH+BKNG0J3j46i7dg3+kfgCTM3Q/LXgHkwQFSCs2dCtPA== X-Received: by 2002:a05:600c:2f01:: with SMTP id r1mr740601wmn.153.1635792200765; Mon, 01 Nov 2021 11:43:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PULL 04/10] hw/core: Extract hotplug-related functions to qdev-hotplug.c Date: Mon, 1 Nov 2021 19:42:53 +0100 Message-Id: <20211101184259.2859090-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211101184259.2859090-1-philmd@redhat.com> References: <20211101184259.2859090-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635792205806100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang Acked-by: Eduardo Habkost Message-Id: <20211028150521.1973821-4-philmd@redhat.com> --- hw/core/qdev-hotplug.c | 73 ++++++++++++++++++++++++++++++++++++++++++ hw/core/qdev.c | 60 ---------------------------------- hw/core/meson.build | 1 + 3 files changed, 74 insertions(+), 60 deletions(-) create mode 100644 hw/core/qdev-hotplug.c diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c new file mode 100644 index 00000000000..d495d0e9c70 --- /dev/null +++ b/hw/core/qdev-hotplug.c @@ -0,0 +1,73 @@ +/* + * QDev Hotplug handlers + * + * Copyright (c) Red Hat + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/qdev-core.h" +#include "hw/boards.h" + +HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) +{ + MachineState *machine; + MachineClass *mc; + Object *m_obj =3D qdev_get_machine(); + + if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { + machine =3D MACHINE(m_obj); + mc =3D MACHINE_GET_CLASS(machine); + if (mc->get_hotplug_handler) { + return mc->get_hotplug_handler(machine, dev); + } + } + + return NULL; +} + +bool qdev_hotplug_allowed(DeviceState *dev, Error **errp) +{ + MachineState *machine; + MachineClass *mc; + Object *m_obj =3D qdev_get_machine(); + + if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { + machine =3D MACHINE(m_obj); + mc =3D MACHINE_GET_CLASS(machine); + if (mc->hotplug_allowed) { + return mc->hotplug_allowed(machine, dev, errp); + } + } + + return true; +} + +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); + + if (hotplug_ctrl =3D=3D NULL && dev->parent_bus) { + hotplug_ctrl =3D qdev_get_bus_hotplug_handler(dev); + } + return hotplug_ctrl; +} + +/* can be used as ->unplug() callback for the simple cases */ +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + qdev_unrealize(dev); +} diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 1e38f997245..84f3019440f 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -33,7 +33,6 @@ #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/option.h" -#include "hw/hotplug.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/boards.h" @@ -238,58 +237,6 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int= alias_id, dev->alias_required_for_version =3D required_for_version; } =20 -HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) -{ - MachineState *machine; - MachineClass *mc; - Object *m_obj =3D qdev_get_machine(); - - if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { - machine =3D MACHINE(m_obj); - mc =3D MACHINE_GET_CLASS(machine); - if (mc->get_hotplug_handler) { - return mc->get_hotplug_handler(machine, dev); - } - } - - return NULL; -} - -bool qdev_hotplug_allowed(DeviceState *dev, Error **errp) -{ - MachineState *machine; - MachineClass *mc; - Object *m_obj =3D qdev_get_machine(); - - if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { - machine =3D MACHINE(m_obj); - mc =3D MACHINE_GET_CLASS(machine); - if (mc->hotplug_allowed) { - return mc->hotplug_allowed(machine, dev, errp); - } - } - - return true; -} - -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); - - if (hotplug_ctrl =3D=3D NULL && dev->parent_bus) { - hotplug_ctrl =3D qdev_get_bus_hotplug_handler(dev); - } - return hotplug_ctrl; -} - static int qdev_prereset(DeviceState *dev, void *opaque) { trace_qdev_reset_tree(dev, object_get_typename(OBJECT(dev))); @@ -371,13 +318,6 @@ static void device_reset_child_foreach(Object *obj, Re= settableChildCallback cb, } } =20 -/* can be used as ->unplug() callback for the simple cases */ -void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) -{ - qdev_unrealize(dev); -} - bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp) { assert(!dev->realized && !dev->parent_bus); diff --git a/hw/core/meson.build b/hw/core/meson.build index cc1ebb8e0f4..c9fe6441d92 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -11,6 +11,7 @@ 'irq.c', 'clock.c', 'qdev-clock.c', + 'qdev-hotplug.c', )) =20 common_ss.add(files('cpu-common.c')) --=20 2.31.1