[PATCH 06/14] qdev: Remove DeviceListener::hide_device()

[Akihiko Odaki]

It is no longer used.

Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
---
 include/hw/qdev-core.h | 24 ------------------------
 hw/core/qdev.c         | 18 ------------------
 system/qdev-monitor.c  |  9 ---------
 3 files changed, 51 deletions(-)

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index de221b6f02..9acf6f79c4 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -306,17 +306,6 @@ struct DeviceState {
 struct DeviceListener {
     void (*realize)(DeviceListener *listener, DeviceState *dev);
     void (*unrealize)(DeviceListener *listener, DeviceState *dev);
-    /*
-     * This callback is called upon init of the DeviceState and
-     * informs qdev if a device should be visible or hidden.  We can
-     * hide a failover device depending for example on the device
-     * opts.
-     *
-     * On errors, it returns false and errp is set. Device creation
-     * should fail in this case.
-     */
-    bool (*hide_device)(DeviceListener *listener, const QDict *device_opts,
-                        bool from_json, Error **errp);
     QTAILQ_ENTRY(DeviceListener) link;
 };
 
@@ -1054,19 +1043,6 @@ static inline void qbus_mark_full(BusState *bus)
 void device_listener_register(DeviceListener *listener);
 void device_listener_unregister(DeviceListener *listener);
 
-/**
- * qdev_should_hide_device() - check if device should be hidden
- *
- * @opts: options QDict
- * @from_json: true if @opts entries are typed, false for all strings
- * @errp: pointer to error object
- *
- * When a device is added via qdev_device_add() this will be called.
- *
- * Return: if the device should be added now or not.
- */
-bool qdev_should_hide_device(const QDict *opts, bool from_json, Error **errp);
-
 typedef enum MachineInitPhase {
     /* current_machine is NULL.  */
     PHASE_NO_MACHINE,
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index c98691a90d..e61a147016 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -224,24 +224,6 @@ void device_listener_unregister(DeviceListener *listener)
     QTAILQ_REMOVE(&device_listeners, listener, link);
 }
 
-bool qdev_should_hide_device(const QDict *opts, bool from_json, Error **errp)
-{
-    ERRP_GUARD();
-    DeviceListener *listener;
-
-    QTAILQ_FOREACH(listener, &device_listeners, link) {
-        if (listener->hide_device) {
-            if (listener->hide_device(listener, opts, from_json, errp)) {
-                return true;
-            } else if (*errp) {
-                return false;
-            }
-        }
-    }
-
-    return false;
-}
-
 void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
                                  int required_for_version)
 {
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index 639beabc5f..42aac94b8c 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -660,15 +660,6 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
         }
     }
 
-    if (qdev_should_hide_device(opts, from_json, errp)) {
-        if (bus && !qbus_is_hotpluggable(bus)) {
-            error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name);
-        }
-        return NULL;
-    } else if (*errp) {
-        return NULL;
-    }
-
     if (dc->hide) {
         if (dc->hide(dc, opts, from_json, errp)) {
             if (bus && !qbus_is_hotpluggable(bus)) {

-- 
2.43.0