aboutsummaryrefslogtreecommitdiff
path: root/hw/core
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2021-10-08 15:34:38 +0200
committerKevin Wolf <kwolf@redhat.com>2021-10-15 16:11:22 +0200
commit7d61808206cc651ae42024ab6def827afa2f807b (patch)
tree6bda3369e69cecff243d1113602fc5d2b6ed73b0 /hw/core
parent30648dd5d609d111e635112d7e6014ca63f7ba13 (diff)
downloadqemu-7d61808206cc651ae42024ab6def827afa2f807b.zip
qemu-7d61808206cc651ae42024ab6def827afa2f807b.tar.gz
qemu-7d61808206cc651ae42024ab6def827afa2f807b.tar.bz2
qdev: Add Error parameter to hide_device() callbacks
hide_device() is used for virtio-net failover, where the standby virtio device delays creation of the primary device. It only makes sense to have a single primary device for each standby device. Adding a second one should result in an error instead of hiding it and never using it afterwards. Prepare for this by adding an Error parameter to the hide_device() callback where virtio-net is informed about adding a primary device. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20211008133442.141332-12-kwolf@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/core')
-rw-r--r--hw/core/qdev.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index d918b50..c3a021c 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -211,14 +211,17 @@ void device_listener_unregister(DeviceListener *listener)
QTAILQ_REMOVE(&device_listeners, listener, link);
}
-bool qdev_should_hide_device(QemuOpts *opts)
+bool qdev_should_hide_device(QemuOpts *opts, Error **errp)
{
+ ERRP_GUARD();
DeviceListener *listener;
QTAILQ_FOREACH(listener, &device_listeners, link) {
if (listener->hide_device) {
- if (listener->hide_device(listener, opts)) {
+ if (listener->hide_device(listener, opts, errp)) {
return true;
+ } else if (*errp) {
+ return false;
}
}
}