diff options
| author | Juan Quintela | 2020-11-18 09:37:36 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-12-08 19:48:57 +0100 |
| commit | 89631fed27bd76b0292d8b2a78291ea96185c87d (patch) | |
| tree | 9b45a28421b9b05feb26482f5e7796bd892011e5 /hw/core/qdev.c | |
| parent | failover: simplify virtio_net_find_primary() (diff) | |
| download | qemu-89631fed27bd76b0292d8b2a78291ea96185c87d.tar.gz qemu-89631fed27bd76b0292d8b2a78291ea96185c87d.tar.xz qemu-89631fed27bd76b0292d8b2a78291ea96185c87d.zip | |
failover: should_be_hidden() should take a bool
We didn't use at all the -1 value, and we don't really care. It was
only used for the cases when this is not the device that we are
searching for. And in that case we should not hide the device.
Once there, simplify virtio-Snet_primary_should_be_hidden.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-16-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/core/qdev.c')
| -rw-r--r-- | hw/core/qdev.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 262bca716f..8f4b8f3cc1 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -214,26 +214,17 @@ void device_listener_unregister(DeviceListener *listener) bool qdev_should_hide_device(QemuOpts *opts) { - int rc = -1; DeviceListener *listener; QTAILQ_FOREACH(listener, &device_listeners, link) { - if (listener->should_be_hidden) { - /* - * should_be_hidden_will return - * 1 if device matches opts and it should be hidden - * 0 if device matches opts and should not be hidden - * -1 if device doesn't match ops - */ - rc = listener->should_be_hidden(listener, opts); - } - - if (rc > 0) { - break; + if (listener->should_be_hidden) { + if (listener->should_be_hidden(listener, opts)) { + return true; + } } } - return rc > 0; + return false; } void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, |